mirror of
https://github.com/netzbegruenung/circles.git
synced 2024-04-26 08:54:52 +02:00
Cs fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
parent
9179c1f426
commit
adca9135ad
|
@ -72,7 +72,7 @@ return [
|
|||
],
|
||||
[
|
||||
'name' => 'Admin#memberLevel',
|
||||
'url' => '/admin/{emulated}/circles/{circleId}/members/{memberId}/level',
|
||||
'url' => '/admin/{emulated}/circles/{circleId}/members/{memberId}/level',
|
||||
'verb' => 'PUT'
|
||||
],
|
||||
|
||||
|
@ -113,4 +113,3 @@ return [
|
|||
['name' => 'Remote#member', 'url' => '/member/{type}/{userId}/', 'verb' => 'GET']
|
||||
]
|
||||
];
|
||||
|
||||
|
|
|
@ -73,4 +73,3 @@ class Filter implements IFilter {
|
|||
return [Application::APP_ID];
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -41,7 +41,6 @@ use OCP\Activity\IEvent;
|
|||
use OCP\Activity\IManager;
|
||||
use OCP\Activity\IProvider;
|
||||
|
||||
|
||||
/**
|
||||
* Class Provider
|
||||
*
|
||||
|
@ -88,7 +87,6 @@ class Provider implements IProvider {
|
|||
* {@inheritdoc}
|
||||
*/
|
||||
public function parse($lang, IEvent $event, IEvent $previousEvent = null) {
|
||||
|
||||
try {
|
||||
$params = $event->getSubjectParameters();
|
||||
$this->initActivityParser($event, $params);
|
||||
|
@ -99,7 +97,6 @@ class Provider implements IProvider {
|
|||
$this->parseAsNonMember($event, $circle, $params);
|
||||
$this->parseAsMember($event, $circle, $params);
|
||||
$this->parseAsModerator($event, $circle, $params);
|
||||
|
||||
} catch (FakeException $e) {
|
||||
/** clean exit */
|
||||
}
|
||||
|
@ -259,7 +256,6 @@ class Provider implements IProvider {
|
|||
* @throws FakeException
|
||||
*/
|
||||
private function parseLinkAsModerator(IEvent $event, DeprecatedCircle $circle, $params) {
|
||||
|
||||
if (!key_exists('link', $params)) {
|
||||
return;
|
||||
}
|
||||
|
@ -278,6 +274,4 @@ class Provider implements IProvider {
|
|||
$this->parserLink->parseLinkDown($event, $circle, $remote);
|
||||
$this->parserLink->parseLinkRemove($event, $circle, $remote);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -206,11 +206,11 @@ class ProviderParser {
|
|||
IEvent $event, DeprecatedCircle $circle, DeprecatedMember $member, $ownEvent, $othersEvent
|
||||
) {
|
||||
$data = [
|
||||
'author' => $this->generateViewerParameter($circle),
|
||||
'circle' => $this->generateCircleParameter($circle),
|
||||
'member' => $this->generateUserParameter($member),
|
||||
'author' => $this->generateViewerParameter($circle),
|
||||
'circle' => $this->generateCircleParameter($circle),
|
||||
'member' => $this->generateUserParameter($member),
|
||||
'external' => $this->generateExternalMemberParameter($member),
|
||||
'group' => $this->generateGroupParameter($member),
|
||||
'group' => $this->generateGroupParameter($member),
|
||||
];
|
||||
|
||||
if ($this->isViewerTheAuthor($circle, $this->activityManager->getCurrentUserId())) {
|
||||
|
@ -299,9 +299,9 @@ class ProviderParser {
|
|||
*/
|
||||
protected function generateExternalMemberParameter(DeprecatedMember $member) {
|
||||
return [
|
||||
'type' => $member->getTypeName(),
|
||||
'id' => $member->getUserId(),
|
||||
'name' => $member->getCachedName() . ' (' . $member->getTypeString() . ')',
|
||||
'type' => $member->getTypeName(),
|
||||
'id' => $member->getUserId(),
|
||||
'name' => $member->getCachedName() . ' (' . $member->getTypeString() . ')',
|
||||
'_parsed' => $member->getCachedName()
|
||||
];
|
||||
}
|
||||
|
@ -314,11 +314,11 @@ class ProviderParser {
|
|||
*/
|
||||
protected function generateCircleParameter(DeprecatedCircle $circle) {
|
||||
return [
|
||||
'type' => 'circle',
|
||||
'id' => $circle->getId(),
|
||||
'name' => $circle->getName(),
|
||||
'type' => 'circle',
|
||||
'id' => $circle->getId(),
|
||||
'name' => $circle->getName(),
|
||||
'_parsed' => $circle->getName(),
|
||||
'link' => Circles::generateAbsoluteLink($circle->getUniqueId())
|
||||
'link' => Circles::generateAbsoluteLink($circle->getUniqueId())
|
||||
];
|
||||
}
|
||||
|
||||
|
@ -329,15 +329,14 @@ class ProviderParser {
|
|||
* @return array<string,string|integer>
|
||||
*/
|
||||
protected function generateRemoteCircleParameter($link) {
|
||||
|
||||
if ($link === null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return [
|
||||
'type' => 'circle',
|
||||
'id' => $link->getUniqueId(),
|
||||
'name' => $link->getToken() . '@' . $link->getAddress(),
|
||||
'type' => 'circle',
|
||||
'id' => $link->getUniqueId(),
|
||||
'name' => $link->getToken() . '@' . $link->getAddress(),
|
||||
'_parsed' => $link->getToken() . '@' . $link->getAddress()
|
||||
];
|
||||
}
|
||||
|
@ -355,9 +354,9 @@ class ProviderParser {
|
|||
}
|
||||
|
||||
return [
|
||||
'type' => 'user',
|
||||
'id' => $member->getUserId(),
|
||||
'name' => $display,
|
||||
'type' => 'user',
|
||||
'id' => $member->getUserId(),
|
||||
'name' => $display,
|
||||
'_parsed' => $display
|
||||
];
|
||||
}
|
||||
|
@ -370,11 +369,10 @@ class ProviderParser {
|
|||
*/
|
||||
protected function generateGroupParameter($group) {
|
||||
return [
|
||||
'type' => 'user-group',
|
||||
'id' => $group->getUserId(),
|
||||
'name' => $group->getUserId(),
|
||||
'type' => 'user-group',
|
||||
'id' => $group->getUserId(),
|
||||
'name' => $group->getUserId(),
|
||||
'_parsed' => $group->getUserId()
|
||||
];
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -27,11 +27,8 @@
|
|||
|
||||
namespace OCA\Circles\Activity;
|
||||
|
||||
|
||||
use OCA\Circles\Exceptions\FakeException;
|
||||
use OCA\Circles\Model\DeprecatedCircle;
|
||||
use OCA\Circles\Model\FederatedLink;
|
||||
use OCA\Circles\Model\DeprecatedMember;
|
||||
use OCP\Activity\IEvent;
|
||||
|
||||
class ProviderSubjectCircle extends ProviderParser {
|
||||
|
@ -77,6 +74,4 @@ class ProviderSubjectCircle extends ProviderParser {
|
|||
|
||||
throw new FakeException();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -27,10 +27,8 @@
|
|||
|
||||
namespace OCA\Circles\Activity;
|
||||
|
||||
|
||||
use OCA\Circles\Exceptions\FakeException;
|
||||
use OCA\Circles\Model\DeprecatedCircle;
|
||||
use OCA\Circles\Model\FederatedLink;
|
||||
use OCA\Circles\Model\DeprecatedMember;
|
||||
use OCP\Activity\IEvent;
|
||||
|
||||
|
@ -102,6 +100,4 @@ class ProviderSubjectGroup extends ProviderParser {
|
|||
|
||||
throw new FakeException();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -27,11 +27,9 @@
|
|||
|
||||
namespace OCA\Circles\Activity;
|
||||
|
||||
|
||||
use OCA\Circles\Exceptions\FakeException;
|
||||
use OCA\Circles\Model\DeprecatedCircle;
|
||||
use OCA\Circles\Model\FederatedLink;
|
||||
use OCA\Circles\Model\DeprecatedMember;
|
||||
use OCP\Activity\IEvent;
|
||||
|
||||
class ProviderSubjectLink extends ProviderParser {
|
||||
|
@ -274,5 +272,4 @@ class ProviderSubjectLink extends ProviderParser {
|
|||
|
||||
throw new FakeException();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
|
||||
namespace OCA\Circles\Activity;
|
||||
|
||||
|
||||
use OCA\Circles\Exceptions\FakeException;
|
||||
use OCA\Circles\Model\DeprecatedCircle;
|
||||
use OCA\Circles\Model\DeprecatedMember;
|
||||
|
@ -168,7 +167,6 @@ class ProviderSubjectMember extends ProviderParser {
|
|||
* @throws FakeException
|
||||
*/
|
||||
public function parseSubjectMemberLeft(IEvent $event, DeprecatedCircle $circle, DeprecatedMember $member) {
|
||||
|
||||
if ($event->getSubject() !== 'member_left') {
|
||||
return;
|
||||
}
|
||||
|
@ -232,7 +230,6 @@ class ProviderSubjectMember extends ProviderParser {
|
|||
* @throws FakeException
|
||||
*/
|
||||
public function parseSubjectMemberRemove(IEvent $event, DeprecatedCircle $circle, DeprecatedMember $member) {
|
||||
|
||||
if ($event->getSubject() !== 'member_remove') {
|
||||
return;
|
||||
}
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
namespace OCA\Circles\Activity;
|
||||
|
||||
|
||||
use OCP\Activity\ISetting;
|
||||
use OCP\IL10N;
|
||||
|
||||
|
@ -84,4 +83,3 @@ class SettingAsMember implements ISetting {
|
|||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
namespace OCA\Circles\Activity;
|
||||
|
||||
|
||||
use OCP\Activity\ISetting;
|
||||
use OCP\IL10N;
|
||||
|
||||
|
@ -76,4 +75,3 @@ class SettingAsModerator implements ISetting {
|
|||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -2,11 +2,9 @@
|
|||
|
||||
namespace OCA\Circles\Activity;
|
||||
|
||||
|
||||
use OCP\Activity\ISetting;
|
||||
use OCP\IL10N;
|
||||
|
||||
|
||||
/**
|
||||
* Class SettingAsNonMember
|
||||
*
|
||||
|
@ -91,4 +89,3 @@ class SettingAsNonMember implements ISetting {
|
|||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -29,7 +29,6 @@
|
|||
|
||||
namespace OCA\Circles\Api\v1;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore;
|
||||
use OCA\Circles\Exceptions\CircleNotFoundException;
|
||||
use OCA\Circles\Exceptions\FederatedUserException;
|
||||
|
@ -44,26 +43,25 @@ use OCA\Circles\Service\CircleService;
|
|||
use OCA\Circles\Service\FederatedUserService;
|
||||
|
||||
class Circles {
|
||||
|
||||
const API_VERSION = [0, 10, 0];
|
||||
public const API_VERSION = [0, 10, 0];
|
||||
|
||||
// Expose circle and member constants via API
|
||||
const CIRCLES_PERSONAL = 1;
|
||||
const CIRCLES_SECRET = 2;
|
||||
const CIRCLES_CLOSED = 4;
|
||||
const CIRCLES_PUBLIC = 8;
|
||||
const CIRCLES_ALL = 15;
|
||||
public const CIRCLES_PERSONAL = 1;
|
||||
public const CIRCLES_SECRET = 2;
|
||||
public const CIRCLES_CLOSED = 4;
|
||||
public const CIRCLES_PUBLIC = 8;
|
||||
public const CIRCLES_ALL = 15;
|
||||
|
||||
const TYPE_USER = Member::TYPE_USER;
|
||||
const TYPE_GROUP = Member::TYPE_GROUP;
|
||||
const TYPE_MAIL = Member::TYPE_MAIL;
|
||||
const TYPE_CONTACT = Member::TYPE_CONTACT;
|
||||
public const TYPE_USER = Member::TYPE_USER;
|
||||
public const TYPE_GROUP = Member::TYPE_GROUP;
|
||||
public const TYPE_MAIL = Member::TYPE_MAIL;
|
||||
public const TYPE_CONTACT = Member::TYPE_CONTACT;
|
||||
|
||||
const LEVEL_NONE = Member::LEVEL_NONE;
|
||||
const LEVEL_MEMBER = Member::LEVEL_MEMBER;
|
||||
const LEVEL_MODERATOR = Member::LEVEL_MODERATOR;
|
||||
const LEVEL_ADMIN = Member::LEVEL_ADMIN;
|
||||
const LEVEL_OWNER = Member::LEVEL_OWNER;
|
||||
public const LEVEL_NONE = Member::LEVEL_NONE;
|
||||
public const LEVEL_MEMBER = Member::LEVEL_MEMBER;
|
||||
public const LEVEL_MODERATOR = Member::LEVEL_MODERATOR;
|
||||
public const LEVEL_ADMIN = Member::LEVEL_ADMIN;
|
||||
public const LEVEL_OWNER = Member::LEVEL_OWNER;
|
||||
|
||||
|
||||
/**
|
||||
|
@ -152,7 +150,7 @@ class Circles {
|
|||
null,
|
||||
new SimpleDataStore(
|
||||
[
|
||||
'mustBeMember' => true,
|
||||
'mustBeMember' => true,
|
||||
'includePersonalCircles' => $personalCircle
|
||||
]
|
||||
)
|
||||
|
@ -244,6 +242,4 @@ class Circles {
|
|||
// return $c->query(CirclesService::class)
|
||||
// ->getFilesForCircles($circleUniqueIds);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -34,7 +34,6 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\AppInfo;
|
||||
|
||||
|
||||
use Closure;
|
||||
use OC;
|
||||
use OCA\Circles\Events\AddingCircleMemberEvent;
|
||||
|
@ -92,17 +91,15 @@ require_once __DIR__ . '/../../vendor/autoload.php';
|
|||
* @package OCA\Circles\AppInfo
|
||||
*/
|
||||
class Application extends App implements IBootstrap {
|
||||
public const APP_ID = 'circles';
|
||||
public const APP_NAME = 'Circles';
|
||||
public const APP_TOKEN = 'dvG7laa0_UU';
|
||||
|
||||
public const APP_SUBJECT = 'http://nextcloud.com/';
|
||||
public const APP_REL = 'https://apps.nextcloud.com/apps/circles';
|
||||
public const APP_API = 1;
|
||||
|
||||
const APP_ID = 'circles';
|
||||
const APP_NAME = 'Circles';
|
||||
const APP_TOKEN = 'dvG7laa0_UU';
|
||||
|
||||
const APP_SUBJECT = 'http://nextcloud.com/';
|
||||
const APP_REL = 'https://apps.nextcloud.com/apps/circles';
|
||||
const APP_API = 1;
|
||||
|
||||
const CLIENT_TIMEOUT = 3;
|
||||
public const CLIENT_TIMEOUT = 3;
|
||||
|
||||
|
||||
/** @var ConfigService */
|
||||
|
@ -114,7 +111,7 @@ class Application extends App implements IBootstrap {
|
|||
*
|
||||
* @param array $params
|
||||
*/
|
||||
public function __construct(array $params = array()) {
|
||||
public function __construct(array $params = []) {
|
||||
parent::__construct(self::APP_ID, $params);
|
||||
}
|
||||
|
||||
|
@ -149,13 +146,13 @@ class Application extends App implements IBootstrap {
|
|||
// It seems that AccountManager use deprecated dispatcher, let's use a deprecated listener
|
||||
$dispatcher = OC::$server->getEventDispatcher();
|
||||
$dispatcher->addListener(
|
||||
'OC\AccountManager::userUpdated', function(GenericEvent $event) {
|
||||
/** @var IUser $user */
|
||||
$user = $event->getSubject();
|
||||
/** @var DeprecatedListener $deprecatedListener */
|
||||
$deprecatedListener = OC::$server->get(DeprecatedListener::class);
|
||||
$deprecatedListener->userAccountUpdated($user);
|
||||
}
|
||||
'OC\AccountManager::userUpdated', function (GenericEvent $event) {
|
||||
/** @var IUser $user */
|
||||
$user = $event->getSubject();
|
||||
/** @var DeprecatedListener $deprecatedListener */
|
||||
$deprecatedListener = OC::$server->get(DeprecatedListener::class);
|
||||
$deprecatedListener->userAccountUpdated($user);
|
||||
}
|
||||
);
|
||||
|
||||
$context->registerWellKnownHandler(WebfingerHandler::class);
|
||||
|
@ -270,6 +267,4 @@ class Application extends App implements IBootstrap {
|
|||
// }
|
||||
// );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -32,7 +32,6 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\AppInfo;
|
||||
|
||||
|
||||
use OCA\Circles\Model\Circle;
|
||||
use OCA\Circles\Model\Member;
|
||||
use OCA\Circles\Service\ConfigService;
|
||||
|
@ -41,7 +40,6 @@ use OCP\App\IAppManager;
|
|||
use OCP\Capabilities\ICapability;
|
||||
use OCP\IL10N;
|
||||
|
||||
|
||||
/**
|
||||
* Class Capabilities
|
||||
*
|
||||
|
@ -92,11 +90,11 @@ class Capabilities implements ICapability {
|
|||
public function getCapabilities(bool $complete = false): array {
|
||||
return [
|
||||
Application::APP_ID => [
|
||||
'version' => $this->appManager->getAppVersion(Application::APP_ID),
|
||||
'status' => $this->getCapabilitiesStatus($complete),
|
||||
'version' => $this->appManager->getAppVersion(Application::APP_ID),
|
||||
'status' => $this->getCapabilitiesStatus($complete),
|
||||
'settings' => $this->configService->getSettings(),
|
||||
'circle' => $this->getCapabilitiesCircle(),
|
||||
'member' => $this->getCapabilitiesMember()
|
||||
'circle' => $this->getCapabilitiesCircle(),
|
||||
'member' => $this->getCapabilitiesMember()
|
||||
],
|
||||
];
|
||||
}
|
||||
|
@ -114,7 +112,7 @@ class Capabilities implements ICapability {
|
|||
|
||||
if ($complete) {
|
||||
$status['interfaces'] = [
|
||||
'all' => $this->interfaceService->getInterfaces(true),
|
||||
'all' => $this->interfaceService->getInterfaces(true),
|
||||
'internal' => $this->interfaceService->getInternalInterfaces(true)
|
||||
];
|
||||
}
|
||||
|
@ -129,7 +127,7 @@ class Capabilities implements ICapability {
|
|||
private function getCapabilitiesCircle(): array {
|
||||
return [
|
||||
'constants' => $this->getCapabilitiesCircleConstants(),
|
||||
'config' => $this->getCapabilitiesCircleConfig()
|
||||
'config' => $this->getCapabilitiesCircleConfig()
|
||||
];
|
||||
}
|
||||
|
||||
|
@ -140,7 +138,7 @@ class Capabilities implements ICapability {
|
|||
private function getCapabilitiesMember(): array {
|
||||
return [
|
||||
'constants' => $this->getCapabilitiesMemberConstants(),
|
||||
'type' => Member::$TYPE
|
||||
'type' => Member::$TYPE
|
||||
];
|
||||
}
|
||||
|
||||
|
@ -150,38 +148,38 @@ class Capabilities implements ICapability {
|
|||
*/
|
||||
private function getCapabilitiesCircleConstants(): array {
|
||||
return [
|
||||
'flags' => [
|
||||
Circle::CFG_SINGLE => $this->l10n->t('Single'),
|
||||
Circle::CFG_PERSONAL => $this->l10n->t('Personal'),
|
||||
Circle::CFG_SYSTEM => $this->l10n->t('System'),
|
||||
Circle::CFG_VISIBLE => $this->l10n->t('Visible'),
|
||||
Circle::CFG_OPEN => $this->l10n->t('Open'),
|
||||
Circle::CFG_INVITE => $this->l10n->t('Invite'),
|
||||
Circle::CFG_REQUEST => $this->l10n->t('Join Request'),
|
||||
Circle::CFG_FRIEND => $this->l10n->t('Friends'),
|
||||
Circle::CFG_PROTECTED => $this->l10n->t('Password Protected'),
|
||||
Circle::CFG_NO_OWNER => $this->l10n->t('No Owner'),
|
||||
Circle::CFG_HIDDEN => $this->l10n->t('Hidden'),
|
||||
Circle::CFG_BACKEND => $this->l10n->t('Backend'),
|
||||
Circle::CFG_LOCAL => $this->l10n->t('Local'),
|
||||
Circle::CFG_ROOT => $this->l10n->t('Root'),
|
||||
'flags' => [
|
||||
Circle::CFG_SINGLE => $this->l10n->t('Single'),
|
||||
Circle::CFG_PERSONAL => $this->l10n->t('Personal'),
|
||||
Circle::CFG_SYSTEM => $this->l10n->t('System'),
|
||||
Circle::CFG_VISIBLE => $this->l10n->t('Visible'),
|
||||
Circle::CFG_OPEN => $this->l10n->t('Open'),
|
||||
Circle::CFG_INVITE => $this->l10n->t('Invite'),
|
||||
Circle::CFG_REQUEST => $this->l10n->t('Join Request'),
|
||||
Circle::CFG_FRIEND => $this->l10n->t('Friends'),
|
||||
Circle::CFG_PROTECTED => $this->l10n->t('Password Protected'),
|
||||
Circle::CFG_NO_OWNER => $this->l10n->t('No Owner'),
|
||||
Circle::CFG_HIDDEN => $this->l10n->t('Hidden'),
|
||||
Circle::CFG_BACKEND => $this->l10n->t('Backend'),
|
||||
Circle::CFG_LOCAL => $this->l10n->t('Local'),
|
||||
Circle::CFG_ROOT => $this->l10n->t('Root'),
|
||||
Circle::CFG_CIRCLE_INVITE => $this->l10n->t('Circle Invite'),
|
||||
Circle::CFG_FEDERATED => $this->l10n->t('Federated'),
|
||||
Circle::CFG_MOUNTPOINT => $this->l10n->t('Mount point')
|
||||
Circle::CFG_FEDERATED => $this->l10n->t('Federated'),
|
||||
Circle::CFG_MOUNTPOINT => $this->l10n->t('Mount point')
|
||||
],
|
||||
'source' =>
|
||||
[
|
||||
'core' => [
|
||||
Member::TYPE_USER => $this->l10n->t('Nextcloud User'),
|
||||
Member::TYPE_GROUP => $this->l10n->t('Nextcloud Group'),
|
||||
Member::TYPE_MAIL => $this->l10n->t('Email Address'),
|
||||
'core' => [
|
||||
Member::TYPE_USER => $this->l10n->t('Nextcloud User'),
|
||||
Member::TYPE_GROUP => $this->l10n->t('Nextcloud Group'),
|
||||
Member::TYPE_MAIL => $this->l10n->t('Email Address'),
|
||||
Member::TYPE_CONTACT => $this->l10n->t('Contact'),
|
||||
Member::TYPE_CIRCLE => $this->l10n->t('Circle'),
|
||||
Member::TYPE_APP => $this->l10n->t('Nextcloud App')
|
||||
Member::TYPE_CIRCLE => $this->l10n->t('Circle'),
|
||||
Member::TYPE_APP => $this->l10n->t('Nextcloud App')
|
||||
],
|
||||
'extra' => [
|
||||
Member::APP_CIRCLES => 'Circles App',
|
||||
Member::APP_OCC => 'Admin Command Line'
|
||||
Member::APP_OCC => 'Admin Command Line'
|
||||
]
|
||||
]
|
||||
];
|
||||
|
@ -193,7 +191,7 @@ class Capabilities implements ICapability {
|
|||
*/
|
||||
private function getCapabilitiesCircleConfig(): array {
|
||||
return [
|
||||
'coreFlags' => Circle::$DEF_CFG_CORE_FILTER,
|
||||
'coreFlags' => Circle::$DEF_CFG_CORE_FILTER,
|
||||
'systemFlags' => Circle::$DEF_CFG_SYSTEM_FILTER
|
||||
];
|
||||
}
|
||||
|
@ -205,13 +203,11 @@ class Capabilities implements ICapability {
|
|||
private function getCapabilitiesMemberConstants(): array {
|
||||
return [
|
||||
'level' => [
|
||||
Member::LEVEL_MEMBER => $this->l10n->t('Member'),
|
||||
Member::LEVEL_MEMBER => $this->l10n->t('Member'),
|
||||
Member::LEVEL_MODERATOR => $this->l10n->t('Moderator'),
|
||||
Member::LEVEL_ADMIN => $this->l10n->t('Admin'),
|
||||
Member::LEVEL_OWNER => $this->l10n->t('Owner')
|
||||
Member::LEVEL_ADMIN => $this->l10n->t('Admin'),
|
||||
Member::LEVEL_OWNER => $this->l10n->t('Owner')
|
||||
]
|
||||
];
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -58,7 +58,6 @@ use OCP\Share\Exceptions\IllegalIDChangeException;
|
|||
use OCP\Share\IShare;
|
||||
use OCP\Util;
|
||||
|
||||
|
||||
/**
|
||||
* Class FileSharingBroadcaster
|
||||
* @deprecated
|
||||
|
@ -146,7 +145,6 @@ class FileSharingBroadcaster implements IBroadcaster {
|
|||
$this->federatedEnabled = true;
|
||||
} catch (QueryException $e) {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -283,7 +281,7 @@ class FileSharingBroadcaster implements IBroadcaster {
|
|||
|
||||
$allShares = $this->fileSharesRequest->getSharesForCircle($member->getCircleId());
|
||||
$knownShares = array_map(
|
||||
function(SharesToken $shareToken) {
|
||||
function (SharesToken $shareToken) {
|
||||
return $shareToken->getShareId();
|
||||
},
|
||||
$this->tokensRequest->getTokensFromMember($member)
|
||||
|
@ -382,10 +380,10 @@ class FileSharingBroadcaster implements IBroadcaster {
|
|||
} catch (\Exception $e) {
|
||||
$this->logger->logException(
|
||||
$e, [
|
||||
'message' => 'Failed to notify remote server of circles-federated share',
|
||||
'level' => ILogger::ERROR,
|
||||
'app' => 'circles',
|
||||
]
|
||||
'message' => 'Failed to notify remote server of circles-federated share',
|
||||
'level' => ILogger::ERROR,
|
||||
'app' => 'circles',
|
||||
]
|
||||
);
|
||||
}
|
||||
|
||||
|
@ -505,12 +503,12 @@ class FileSharingBroadcaster implements IBroadcaster {
|
|||
|
||||
$emailTemplate = $this->mailer->createEMailTemplate(
|
||||
'sharebymail.RecipientPasswordNotification', [
|
||||
'filename' => $filename,
|
||||
'password' => $password,
|
||||
'initiator' => $initiatorDisplayName,
|
||||
'initiatorEmail' => $initiatorEmailAddress,
|
||||
'shareWith' => $shareWith,
|
||||
]
|
||||
'filename' => $filename,
|
||||
'password' => $password,
|
||||
'initiator' => $initiatorDisplayName,
|
||||
'initiatorEmail' => $initiatorEmailAddress,
|
||||
'shareWith' => $shareWith,
|
||||
]
|
||||
);
|
||||
|
||||
$emailTemplate->setSubject(
|
||||
|
@ -561,11 +559,11 @@ class FileSharingBroadcaster implements IBroadcaster {
|
|||
) {
|
||||
$emailTemplate = $this->mailer->createEMailTemplate(
|
||||
'circles.ShareNotification', [
|
||||
'fileName' => $fileName,
|
||||
'fileLink' => $link,
|
||||
'author' => $author,
|
||||
'circleName' => $circleName,
|
||||
]
|
||||
'fileName' => $fileName,
|
||||
'fileLink' => $link,
|
||||
'author' => $author,
|
||||
'circleName' => $circleName,
|
||||
]
|
||||
);
|
||||
|
||||
$emailTemplate->addHeader();
|
||||
|
@ -653,9 +651,9 @@ class FileSharingBroadcaster implements IBroadcaster {
|
|||
|
||||
$emailTemplate = $this->mailer->createEMailTemplate(
|
||||
'sharebymail.RecipientPasswordNotification', [
|
||||
'password' => $password,
|
||||
'author' => $author
|
||||
]
|
||||
'password' => $password,
|
||||
'author' => $author
|
||||
]
|
||||
);
|
||||
|
||||
$emailTemplate->setSubject(
|
||||
|
@ -711,8 +709,8 @@ class FileSharingBroadcaster implements IBroadcaster {
|
|||
$filename = basename($share['file_target']);
|
||||
|
||||
return [
|
||||
'author' => $author,
|
||||
'link' => $link,
|
||||
'author' => $author,
|
||||
'link' => $link,
|
||||
'filename' => $filename
|
||||
];
|
||||
}
|
||||
|
@ -813,5 +811,4 @@ class FileSharingBroadcaster implements IBroadcaster {
|
|||
|
||||
return $contact['EMAIL'];
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -31,7 +31,6 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException;
|
||||
use OCA\Circles\Exceptions\CircleNotFoundException;
|
||||
use OCA\Circles\Exceptions\FederatedEventException;
|
||||
|
@ -58,7 +57,6 @@ use OCA\Circles\Service\FederatedUserService;
|
|||
use OCA\Circles\Service\MemberService;
|
||||
use OCP\IUserSession;
|
||||
|
||||
|
||||
/**
|
||||
* Class CirclesManager
|
||||
*
|
||||
|
@ -326,7 +324,4 @@ class CirclesManager {
|
|||
* @return Member
|
||||
*/
|
||||
// public function getMemberById(string $memberId): Member {
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles;
|
||||
|
||||
|
||||
use OCA\Circles\Db\CoreQueryBuilder;
|
||||
use OCA\Circles\Db\CoreRequestBuilder;
|
||||
use OCA\Circles\Exceptions\CircleNotFoundException;
|
||||
|
@ -42,7 +41,6 @@ use OCA\Circles\Service\FederatedUserService;
|
|||
use OCP\DB\QueryBuilder\ICompositeExpression;
|
||||
use OCP\DB\QueryBuilder\IQueryBuilder;
|
||||
|
||||
|
||||
/**
|
||||
* Class CirclesQueryHelper
|
||||
*
|
||||
|
@ -109,7 +107,7 @@ class CirclesQueryHelper {
|
|||
$this->queryBuilder->setOptions(
|
||||
[CoreQueryBuilder::HELPER],
|
||||
[
|
||||
'getData' => $fullDetails,
|
||||
'getData' => $fullDetails,
|
||||
'mustBeMember' => true
|
||||
]
|
||||
);
|
||||
|
@ -142,7 +140,7 @@ class CirclesQueryHelper {
|
|||
$this->queryBuilder->setOptions(
|
||||
[CoreQueryBuilder::HELPER],
|
||||
[
|
||||
'getData' => $fullDetails,
|
||||
'getData' => $fullDetails,
|
||||
'mustBeMember' => true
|
||||
]
|
||||
);
|
||||
|
@ -193,6 +191,4 @@ class CirclesQueryHelper {
|
|||
|
||||
return $circle;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Collaboration\v2;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore;
|
||||
use Exception;
|
||||
use OC\Share20\Share;
|
||||
|
@ -42,7 +41,6 @@ use OCP\Collaboration\Collaborators\ISearchPlugin;
|
|||
use OCP\Collaboration\Collaborators\ISearchResult;
|
||||
use OCP\Collaboration\Collaborators\SearchResultType;
|
||||
|
||||
|
||||
/**
|
||||
* Class CollaboratorSearchPlugin
|
||||
*
|
||||
|
@ -91,7 +89,7 @@ class CollaboratorSearchPlugin implements ISearchPlugin {
|
|||
$filterCircle, null,
|
||||
new SimpleDataStore(
|
||||
[
|
||||
'limit' => $limit,
|
||||
'limit' => $limit,
|
||||
'offset' => $offset
|
||||
]
|
||||
)
|
||||
|
@ -123,15 +121,13 @@ class CollaboratorSearchPlugin implements ISearchPlugin {
|
|||
*/
|
||||
private function addResultEntry(Circle $circle): array {
|
||||
return [
|
||||
'label' => $circle->getDisplayName(),
|
||||
'label' => $circle->getDisplayName(),
|
||||
'shareWithDescription' => $circle->getOwner()->getDisplayName(),
|
||||
'value' => [
|
||||
'value' => [
|
||||
'shareType' => Share::TYPE_CIRCLE,
|
||||
'shareWith' => $circle->getSingleId(),
|
||||
'circle' => $circle
|
||||
'circle' => $circle
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
<?php declare(strict_types=1);
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
/**
|
||||
|
@ -61,21 +63,18 @@ use Symfony\Component\Console\Output\OutputInterface;
|
|||
use Symfony\Component\Console\Question\ConfirmationQuestion;
|
||||
use Symfony\Component\Console\Question\Question;
|
||||
|
||||
|
||||
/**
|
||||
* Class CirclesCheck
|
||||
*
|
||||
* @package OCA\Circles\Command
|
||||
*/
|
||||
class CirclesCheck extends Base {
|
||||
|
||||
|
||||
use TStringTools;
|
||||
use TArrayTools;
|
||||
use TNC22Request;
|
||||
|
||||
|
||||
static $checks = [
|
||||
public static $checks = [
|
||||
'internal',
|
||||
'frontal',
|
||||
'loopback'
|
||||
|
@ -449,7 +448,6 @@ class CirclesCheck extends Base {
|
|||
$output->writeln(
|
||||
'- Address <info>' . $loopback . '</info> is now used as <info>loopback</info>'
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -464,8 +462,6 @@ class CirclesCheck extends Base {
|
|||
$output->writeln(
|
||||
'. The address you need to define here is the local address of your Nextcloud, reachable by all other instances of our GlobalScale.'
|
||||
);
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -499,7 +495,6 @@ class CirclesCheck extends Base {
|
|||
|
||||
|
||||
while (true) {
|
||||
|
||||
$question = new Question(
|
||||
'<info>Please write down a new frontal address to test</info>: ', ''
|
||||
);
|
||||
|
@ -740,6 +735,4 @@ class CirclesCheck extends Base {
|
|||
|
||||
return [$scheme, $cloudId];
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,9 +31,6 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Command;
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException;
|
||||
use ArtificialOwl\MySmallPhpTools\Exceptions\RequestNetworkException;
|
||||
use ArtificialOwl\MySmallPhpTools\Exceptions\SignatoryException;
|
||||
use OC\Core\Command\Base;
|
||||
use OCA\Circles\Exceptions\CircleNotFoundException;
|
||||
use OCA\Circles\Exceptions\FederatedEventException;
|
||||
|
@ -62,7 +59,6 @@ use Symfony\Component\Console\Input\InputInterface;
|
|||
use Symfony\Component\Console\Input\InputOption;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
|
||||
/**
|
||||
* Class CirclesConfig
|
||||
*
|
||||
|
@ -223,14 +219,12 @@ class CirclesConfig extends Base {
|
|||
|
||||
array_walk(
|
||||
$listing,
|
||||
function(string &$v): void {
|
||||
list(, $long) = explode('|', $v);
|
||||
function (string &$v): void {
|
||||
[, $long] = explode('|', $v);
|
||||
$v = strtoupper(str_replace(' ', '', $long));
|
||||
}
|
||||
);
|
||||
|
||||
return $listing;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
<?php declare(strict_types=1);
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
/**
|
||||
|
@ -42,7 +44,6 @@ use Symfony\Component\Console\Input\InputInterface;
|
|||
use Symfony\Component\Console\Input\InputOption;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
|
||||
/**
|
||||
* Class CirclesCreate
|
||||
*
|
||||
|
@ -71,7 +72,6 @@ class CirclesCreate extends Base {
|
|||
parent::__construct();
|
||||
$this->federatedUserService = $federatedUserService;
|
||||
$this->circleService = $circleService;
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -133,6 +133,4 @@ class CirclesCreate extends Base {
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -54,7 +54,6 @@ use Symfony\Component\Console\Input\InputInterface;
|
|||
use Symfony\Component\Console\Input\InputOption;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
|
||||
/**
|
||||
* Class CirclesDestroy
|
||||
*
|
||||
|
@ -144,6 +143,4 @@ class CirclesDestroy extends Base {
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -59,7 +59,6 @@ use Symfony\Component\Console\Input\InputInterface;
|
|||
use Symfony\Component\Console\Input\InputOption;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
|
||||
/**
|
||||
* Class CirclesDetails
|
||||
*
|
||||
|
@ -118,7 +117,6 @@ class CirclesDetails extends Base {
|
|||
->addOption('initiator', '', InputOption::VALUE_REQUIRED, 'set an initiator to the request', '')
|
||||
->addOption('initiator-type', '', InputOption::VALUE_REQUIRED, 'set initiator type', '0')
|
||||
->addOption('status-code', '', InputOption::VALUE_NONE, 'display status code on exception');
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -154,7 +152,7 @@ class CirclesDetails extends Base {
|
|||
$circleId,
|
||||
$instance,
|
||||
[
|
||||
'initiator' => $input->getOption('initiator'),
|
||||
'initiator' => $input->getOption('initiator'),
|
||||
'initiatorType' => Member::parseTypeString($input->getOption('initiator-type'))
|
||||
]
|
||||
);
|
||||
|
@ -188,6 +186,4 @@ class CirclesDetails extends Base {
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -57,7 +57,6 @@ use Symfony\Component\Console\Input\InputInterface;
|
|||
use Symfony\Component\Console\Input\InputOption;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
|
||||
/**
|
||||
* Class CirclesEdit
|
||||
*
|
||||
|
@ -105,7 +104,6 @@ class CirclesEdit extends Base {
|
|||
->addOption('initiator', '', InputOption::VALUE_REQUIRED, 'set an initiator to the request', '')
|
||||
->addOption('initiator-type', '', InputOption::VALUE_REQUIRED, 'set initiator type', '0')
|
||||
->addOption('status-code', '', InputOption::VALUE_NONE, 'display status code on exception');
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -170,6 +168,4 @@ class CirclesEdit extends Base {
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -57,7 +57,6 @@ use Symfony\Component\Console\Input\InputInterface;
|
|||
use Symfony\Component\Console\Input\InputOption;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
|
||||
/**
|
||||
* Class CirclesJoin
|
||||
*
|
||||
|
@ -155,6 +154,4 @@ class CirclesJoin extends Base {
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -45,7 +45,6 @@ use Symfony\Component\Console\Input\InputInterface;
|
|||
use Symfony\Component\Console\Input\InputOption;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
|
||||
/**
|
||||
* Class CirclesLeave
|
||||
*
|
||||
|
@ -135,6 +134,4 @@ class CirclesLeave extends Base {
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -65,15 +65,12 @@ use Symfony\Component\Console\Input\InputOption;
|
|||
use Symfony\Component\Console\Output\ConsoleOutput;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
|
||||
/**
|
||||
* Class CirclesList
|
||||
*
|
||||
* @package OCA\Circles\Command
|
||||
*/
|
||||
class CirclesList extends Base {
|
||||
|
||||
|
||||
use TArrayTools;
|
||||
use TStringTools;
|
||||
|
||||
|
@ -233,6 +230,4 @@ class CirclesList extends Base {
|
|||
);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Command;
|
||||
|
||||
|
||||
use OC\Core\Command\Base;
|
||||
use OCA\Circles\Db\CoreRequestBuilder;
|
||||
use OCA\Circles\Exceptions\MaintenanceException;
|
||||
|
@ -43,7 +42,6 @@ use Symfony\Component\Console\Output\OutputInterface;
|
|||
use Symfony\Component\Console\Question\ConfirmationQuestion;
|
||||
use Symfony\Component\Console\Question\Question;
|
||||
|
||||
|
||||
/**
|
||||
* Class CirclesMaintenance
|
||||
*
|
||||
|
@ -169,8 +167,4 @@ class CirclesMaintenance extends Base {
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -73,15 +73,12 @@ use Symfony\Component\Console\Input\InputOption;
|
|||
use Symfony\Component\Console\Output\ConsoleOutput;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
|
||||
/**
|
||||
* Class CirclesMemberships
|
||||
*
|
||||
* @package OCA\Circles\Command
|
||||
*/
|
||||
class CirclesMemberships extends Base {
|
||||
|
||||
|
||||
use TArrayTools;
|
||||
use TNC22ConsoleTree;
|
||||
|
||||
|
@ -245,7 +242,7 @@ class CirclesMemberships extends Base {
|
|||
$this->drawTree(
|
||||
$tree, [$this, 'displayLeaf'],
|
||||
[
|
||||
'height' => 3,
|
||||
'height' => 3,
|
||||
'node-spacing' => 0,
|
||||
'item-spacing' => 1,
|
||||
]
|
||||
|
@ -276,8 +273,8 @@ class CirclesMemberships extends Base {
|
|||
$item = new NC22TreeNode(
|
||||
$tree, new SimpleDataStore(
|
||||
[
|
||||
'member' => $member,
|
||||
'cycling' => in_array($member->getCircleId(), $knownIds)
|
||||
'member' => $member,
|
||||
'cycling' => in_array($member->getCircleId(), $knownIds)
|
||||
]
|
||||
)
|
||||
);
|
||||
|
@ -400,6 +397,4 @@ class CirclesMemberships extends Base {
|
|||
|
||||
$output->writeln($count . ' memberships updated');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -57,15 +57,12 @@ use Symfony\Component\Console\Output\ConsoleOutput;
|
|||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
use Symfony\Component\Console\Question\ConfirmationQuestion;
|
||||
|
||||
|
||||
/**
|
||||
* Class CirclesRemote
|
||||
*
|
||||
* @package OCA\Circles\Command
|
||||
*/
|
||||
class CirclesRemote extends Base {
|
||||
|
||||
|
||||
use TNC22WellKnown;
|
||||
use TStringTools;
|
||||
|
||||
|
@ -249,7 +246,7 @@ class CirclesRemote extends Base {
|
|||
}
|
||||
|
||||
$payload = [
|
||||
'test' => 42,
|
||||
'test' => 42,
|
||||
'token' => $this->uuid()
|
||||
];
|
||||
$signedRequest = $this->outgoingTest($testUrl, $payload);
|
||||
|
@ -325,14 +322,12 @@ class CirclesRemote extends Base {
|
|||
);
|
||||
$this->remoteStreamService->update($remoteSignatory, RemoteStreamService::UPDATE_HREF);
|
||||
}
|
||||
|
||||
} catch (RemoteUidException $e) {
|
||||
$this->updateRemote($remoteSignatory);
|
||||
} catch (RemoteNotFoundException $e) {
|
||||
$this->saveRemote($remoteSignatory);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -435,7 +430,7 @@ class CirclesRemote extends Base {
|
|||
private function verifyGSInstances(): void {
|
||||
$instances = $this->globalScaleService->getGlobalScaleInstances();
|
||||
$known = array_map(
|
||||
function(RemoteInstance $instance): string {
|
||||
function (RemoteInstance $instance): string {
|
||||
return $instance->getInstance();
|
||||
}, $this->remoteRequest->getFromType(RemoteInstance::TYPE_GLOBALSCALE)
|
||||
);
|
||||
|
@ -531,6 +526,4 @@ class CirclesRemote extends Base {
|
|||
|
||||
throw new Exception('Unknown interface: ' . implode(', ', InterfaceService::$LIST_IFACE));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -57,15 +57,12 @@ use Symfony\Component\Console\Input\InputOption;
|
|||
use Symfony\Component\Console\Output\ConsoleOutput;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
|
||||
/**
|
||||
* Class CirclesReport
|
||||
*
|
||||
* @package OCA\Circles\Command
|
||||
*/
|
||||
class CirclesReport extends Base implements IInteractiveShellClient {
|
||||
|
||||
|
||||
use TNC22Deserialize;
|
||||
use TArrayTools;
|
||||
|
||||
|
@ -435,7 +432,4 @@ class CirclesReport extends Base implements IInteractiveShellClient {
|
|||
public function onNewCommand(NC22InteractiveShellSession $session, $command): void {
|
||||
echo $session->getPath();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Command;
|
||||
|
||||
|
||||
use OC\Core\Command\Base;
|
||||
use OCA\Circles\Exceptions\ContactAddressBookNotFoundException;
|
||||
use OCA\Circles\Exceptions\ContactFormatException;
|
||||
|
@ -49,7 +48,6 @@ use Symfony\Component\Console\Input\InputInterface;
|
|||
use Symfony\Component\Console\Input\InputOption;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
|
||||
/**
|
||||
* Class CirclesSync
|
||||
*
|
||||
|
@ -178,6 +176,4 @@ class CirclesSync extends Base {
|
|||
|
||||
return $sync;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Command;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException;
|
||||
use ArtificialOwl\MySmallPhpTools\Exceptions\ItemNotFoundException;
|
||||
use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize;
|
||||
|
@ -40,7 +39,6 @@ use ArtificialOwl\MySmallPhpTools\Traits\TStringTools;
|
|||
use Exception;
|
||||
use OC\Core\Command\Base;
|
||||
use OCA\Circles\AppInfo\Application;
|
||||
use OCA\Circles\CirclesManager;
|
||||
use OCA\Circles\Db\CoreRequestBuilder;
|
||||
use OCA\Circles\Exceptions\CircleNotFoundException;
|
||||
use OCA\Circles\Model\Circle;
|
||||
|
@ -53,21 +51,18 @@ use Symfony\Component\Console\Input\InputOption;
|
|||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
use Symfony\Component\Process\Process;
|
||||
|
||||
|
||||
/**
|
||||
* Class CirclesTest
|
||||
*
|
||||
* @package OCA\Circles\Command
|
||||
*/
|
||||
class CirclesTest extends Base {
|
||||
|
||||
|
||||
use TArrayTools;
|
||||
use TStringTools;
|
||||
use TNC22Deserialize;
|
||||
|
||||
|
||||
static $INSTANCES = [
|
||||
public static $INSTANCES = [
|
||||
'global-scale-1',
|
||||
'global-scale-2',
|
||||
'global-scale-3',
|
||||
|
@ -77,7 +72,7 @@ class CirclesTest extends Base {
|
|||
];
|
||||
|
||||
|
||||
static $TEST_CIRCLES = [
|
||||
public static $TEST_CIRCLES = [
|
||||
'test_001'
|
||||
];
|
||||
|
||||
|
@ -296,7 +291,6 @@ class CirclesTest extends Base {
|
|||
}
|
||||
$this->r();
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -575,7 +569,8 @@ class CirclesTest extends Base {
|
|||
/** @var Circle $createdCircle */
|
||||
$createdCircle = $this->deserialize($dataCreatedCircle001, Circle::class);
|
||||
$this->circles[$localInstanceId][$createdCircle->getName()] = $createdCircle;
|
||||
$this->r(true, $createdCircle->getSingleId());;
|
||||
$this->r(true, $createdCircle->getSingleId());
|
||||
;
|
||||
|
||||
$this->p('Comparing data returned at creation');
|
||||
if ($createdCircle->getSingleId() === '' || $createdCircle->getOwner()->getId() === '') {
|
||||
|
@ -647,7 +642,8 @@ class CirclesTest extends Base {
|
|||
$member = $this->getInstanceUsers($instanceId)[2];
|
||||
|
||||
$addedMember = $this->processMemberAdd($instanceId, $circleName, $member, 'user');
|
||||
$this->r(true, $addedMember->getId());;
|
||||
$this->r(true, $addedMember->getId());
|
||||
;
|
||||
|
||||
// check test2
|
||||
}
|
||||
|
@ -673,7 +669,8 @@ class CirclesTest extends Base {
|
|||
);
|
||||
/** @var Member $addedMember */
|
||||
$addedMember = $this->deserialize($dataAddedMember, Member::class);
|
||||
$this->r(true, $addedMember->getId());;
|
||||
$this->r(true, $addedMember->getId());
|
||||
;
|
||||
|
||||
// check test6
|
||||
}
|
||||
|
@ -696,7 +693,8 @@ class CirclesTest extends Base {
|
|||
);
|
||||
/** @var Member $addedMember */
|
||||
$addedMember = $this->deserialize($dataAddedMember, Member::class);
|
||||
$this->r(true, $addedMember->getId());;
|
||||
$this->r(true, $addedMember->getId());
|
||||
;
|
||||
}
|
||||
|
||||
private function levelLocalMemberToModerator() {
|
||||
|
@ -779,7 +777,6 @@ class CirclesTest extends Base {
|
|||
bool $versa = false,
|
||||
array $params = []
|
||||
) {
|
||||
|
||||
if (empty($params)) {
|
||||
$params = [
|
||||
'CIRCLEID' => $circle->getSingleId()
|
||||
|
@ -1147,6 +1144,4 @@ class CirclesTest extends Base {
|
|||
|
||||
return $addedMember;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -36,7 +36,6 @@ use OCP\IDBConnection;
|
|||
use Symfony\Component\Console\Input\InputInterface;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
|
||||
class FixUniqueId extends Base {
|
||||
|
||||
/** @var IDBConnection */
|
||||
|
@ -58,7 +57,6 @@ class FixUniqueId extends Base {
|
|||
}
|
||||
|
||||
protected function execute(InputInterface $input, OutputInterface $output) {
|
||||
|
||||
try {
|
||||
$this->swapToShortenUniqueId();
|
||||
|
||||
|
@ -70,7 +68,6 @@ class FixUniqueId extends Base {
|
|||
|
||||
|
||||
private function swapToShortenUniqueId() {
|
||||
|
||||
$qb = $this->connection->getQueryBuilder();
|
||||
|
||||
/** @noinspection PhpMethodParametersCountMismatchInspection */
|
||||
|
@ -109,7 +106,6 @@ class FixUniqueId extends Base {
|
|||
|
||||
|
||||
private function swapToShortenUniqueIdInTable($circleId, $shortenUniqueId, $table) {
|
||||
|
||||
$qb = $this->connection->getQueryBuilder();
|
||||
$qb->update($table)
|
||||
->where(
|
||||
|
@ -140,9 +136,4 @@ class FixUniqueId extends Base {
|
|||
$qb->set('share_with', $qb->createNamedParameter($shortenUniqueId));
|
||||
$qb->execute();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -71,12 +71,10 @@ class Groups extends Base {
|
|||
|
||||
|
||||
protected function execute(InputInterface $input, OutputInterface $output) {
|
||||
|
||||
try {
|
||||
$this->listLinkedGroups($input, $output);
|
||||
$this->addLinkedGroups($input, $output);
|
||||
$this->delLinkedGroups($input, $output);
|
||||
|
||||
} catch (FakeException $e) {
|
||||
$output->writeln('done');
|
||||
} catch (Exception $e) {
|
||||
|
@ -112,7 +110,7 @@ class Groups extends Base {
|
|||
return;
|
||||
}
|
||||
|
||||
list($circleId, $group) = $this->getCircleIdAndGroupFromArguments($input);
|
||||
[$circleId, $group] = $this->getCircleIdAndGroupFromArguments($input);
|
||||
|
||||
throw new FakeException();
|
||||
}
|
||||
|
@ -129,7 +127,7 @@ class Groups extends Base {
|
|||
return;
|
||||
}
|
||||
|
||||
list($circleId, $group) = $this->getCircleIdAndGroupFromArguments($input);
|
||||
[$circleId, $group] = $this->getCircleIdAndGroupFromArguments($input);
|
||||
|
||||
throw new FakeException();
|
||||
}
|
||||
|
@ -148,6 +146,4 @@ class Groups extends Base {
|
|||
|
||||
return [$input->getArgument('circle_id'), $input->getArgument('group')];
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -51,7 +51,6 @@ use Symfony\Component\Console\Input\InputInterface;
|
|||
use Symfony\Component\Console\Input\InputOption;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
|
||||
/**
|
||||
* Class MembersAdd
|
||||
*
|
||||
|
@ -186,7 +185,7 @@ class MembersAdd extends Base {
|
|||
continue;
|
||||
}
|
||||
|
||||
list(, $host) = explode('@', $user['federationId']);
|
||||
[, $host] = explode('@', $user['federationId']);
|
||||
if (strtolower($user['userid']['value']) === strtolower($search)) {
|
||||
$userId = $user['userid']['value'];
|
||||
$instance = $host;
|
||||
|
@ -203,6 +202,4 @@ class MembersAdd extends Base {
|
|||
|
||||
return $userId;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -56,7 +56,6 @@ use Symfony\Component\Console\Input\InputInterface;
|
|||
use Symfony\Component\Console\Input\InputOption;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
|
||||
/**
|
||||
* Class MembersDetails
|
||||
*
|
||||
|
@ -142,6 +141,4 @@ class MembersDetails extends Base {
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,10 +31,6 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Command;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Exceptions\InvalidItemException;
|
||||
use ArtificialOwl\MySmallPhpTools\Exceptions\RequestNetworkException;
|
||||
use ArtificialOwl\MySmallPhpTools\Exceptions\SignatoryException;
|
||||
use OC\Core\Command\Base;
|
||||
use OCA\Circles\Db\MemberRequest;
|
||||
use OCA\Circles\Exceptions\CircleNotFoundException;
|
||||
|
@ -63,7 +59,6 @@ use Symfony\Component\Console\Input\InputInterface;
|
|||
use Symfony\Component\Console\Input\InputOption;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
|
||||
/**
|
||||
* Class MembersLevel
|
||||
*
|
||||
|
@ -173,6 +168,4 @@ class MembersLevel extends Base {
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -71,15 +71,12 @@ use Symfony\Component\Console\Input\InputOption;
|
|||
use Symfony\Component\Console\Output\ConsoleOutput;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
|
||||
/**
|
||||
* Class MembersList
|
||||
*
|
||||
* @package OCA\Circles\Command
|
||||
*/
|
||||
class MembersList extends Base {
|
||||
|
||||
|
||||
use TNC22ConsoleTree;
|
||||
use TStringTools;
|
||||
|
||||
|
@ -212,7 +209,7 @@ class MembersList extends Base {
|
|||
$this->drawTree(
|
||||
$tree, [$this, 'displayLeaf'],
|
||||
[
|
||||
'height' => 3,
|
||||
'height' => 3,
|
||||
'node-spacing' => 1,
|
||||
'item-spacing' => 0,
|
||||
]
|
||||
|
@ -364,9 +361,9 @@ class MembersList extends Base {
|
|||
$node = new NC22TreeNode(
|
||||
$tree, new SimpleDataStore(
|
||||
[
|
||||
'circle' => $circle,
|
||||
'member' => $member,
|
||||
'cycling' => in_array($member->getSingleId(), $knownIds),
|
||||
'circle' => $circle,
|
||||
'member' => $member,
|
||||
'cycling' => in_array($member->getSingleId(), $knownIds),
|
||||
]
|
||||
)
|
||||
);
|
||||
|
@ -384,8 +381,8 @@ class MembersList extends Base {
|
|||
new NC22TreeNode(
|
||||
$tree, new SimpleDataStore(
|
||||
[
|
||||
'member' => $member,
|
||||
'cycling' => in_array($member->getSingleId(), $knownIds)
|
||||
'member' => $member,
|
||||
'cycling' => in_array($member->getSingleId(), $knownIds)
|
||||
]
|
||||
)
|
||||
);
|
||||
|
@ -451,7 +448,6 @@ class MembersList extends Base {
|
|||
$type = implode(", ", Circle::getCircleFlags($circle, Circle::FLAGS_LONG));
|
||||
$line .= ($type === '') ? '' : ' <info>Config</info>: ' . $type;
|
||||
}
|
||||
|
||||
} else {
|
||||
if ($lineNumber === 1 && !is_null($circle)) {
|
||||
$line .= '<info>' . $circle->getSingleId() . '</info>';
|
||||
|
@ -462,12 +458,9 @@ class MembersList extends Base {
|
|||
}
|
||||
|
||||
return $line;
|
||||
|
||||
} catch (InvalidItemException | ItemNotFoundException | UnknownTypeException $e) {
|
||||
}
|
||||
|
||||
return '';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Command;
|
||||
|
||||
use Exception;
|
||||
use OC\Core\Command\Base;
|
||||
use OCA\Circles\Db\MemberRequest;
|
||||
use OCA\Circles\Exceptions\CircleNotFoundException;
|
||||
|
@ -42,7 +41,6 @@ use OCA\Circles\Exceptions\FederatedUserNotFoundException;
|
|||
use OCA\Circles\Exceptions\InitiatorNotConfirmedException;
|
||||
use OCA\Circles\Exceptions\InitiatorNotFoundException;
|
||||
use OCA\Circles\Exceptions\InvalidIdException;
|
||||
use OCA\Circles\Exceptions\MemberDoesNotExistException;
|
||||
use OCA\Circles\Exceptions\MemberNotFoundException;
|
||||
use OCA\Circles\Exceptions\OwnerNotFoundException;
|
||||
use OCA\Circles\Exceptions\RemoteInstanceException;
|
||||
|
@ -60,7 +58,6 @@ use Symfony\Component\Console\Input\InputInterface;
|
|||
use Symfony\Component\Console\Input\InputOption;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
|
||||
/**
|
||||
* Class MembersRemove
|
||||
*
|
||||
|
@ -149,6 +146,4 @@ class MembersRemove extends Base {
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Command;
|
||||
|
||||
|
||||
use OC\Core\Command\Base;
|
||||
use OCA\Circles\Model\FederatedUser;
|
||||
use OCA\Circles\Model\Member;
|
||||
|
@ -44,7 +43,6 @@ use Symfony\Component\Console\Input\InputOption;
|
|||
use Symfony\Component\Console\Output\ConsoleOutput;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
|
||||
/**
|
||||
* Class MembersSearch
|
||||
*
|
||||
|
@ -123,6 +121,4 @@ class MembersSearch extends Base {
|
|||
);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -51,15 +51,12 @@ use Symfony\Component\Console\Input\InputOption;
|
|||
use Symfony\Component\Console\Output\ConsoleOutput;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
|
||||
/**
|
||||
* Class SharesFilesList
|
||||
*
|
||||
* @package OCA\Circles\Command
|
||||
*/
|
||||
class SharesFiles extends Base {
|
||||
|
||||
|
||||
use TArrayTools;
|
||||
|
||||
|
||||
|
@ -239,11 +236,11 @@ class SharesFiles extends Base {
|
|||
if (!$filterRecipient) {
|
||||
$row = array_merge(
|
||||
$row, [
|
||||
$sharedTo . ' (' . $recipient->getSingleId() . ', '
|
||||
. Circle::$DEF_SOURCE[$recipient->getBasedOn()->getSource()] . ')',
|
||||
(($share->getChildId() > 0) ? $share->getChildFileTarget(
|
||||
) : $share->getFileTarget()),
|
||||
]
|
||||
$sharedTo . ' (' . $recipient->getSingleId() . ', '
|
||||
. Circle::$DEF_SOURCE[$recipient->getBasedOn()->getSource()] . ')',
|
||||
(($share->getChildId() > 0) ? $share->getChildFileTarget(
|
||||
) : $share->getFileTarget()),
|
||||
]
|
||||
);
|
||||
}
|
||||
|
||||
|
@ -275,7 +272,6 @@ class SharesFiles extends Base {
|
|||
bool $all,
|
||||
?bool &$filterRecipient = false
|
||||
): array {
|
||||
|
||||
if ($fileId > 0) {
|
||||
return $this->shareWrapperService->getSharesByFileId($this->fileId, true);
|
||||
}
|
||||
|
@ -319,6 +315,4 @@ class SharesFiles extends Base {
|
|||
'Specify a FileId or an option: --with (USER), --by (USER), --to (CIRCLE)'
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -38,7 +38,6 @@ use Symfony\Component\Console\Input\InputInterface;
|
|||
use Symfony\Component\Console\Input\InputOption;
|
||||
use Symfony\Component\Console\Output\OutputInterface;
|
||||
|
||||
|
||||
/**
|
||||
* Class SyncContact
|
||||
*
|
||||
|
@ -161,6 +160,4 @@ class SyncContact extends Base {
|
|||
private function displayStatus(OutputInterface $output) {
|
||||
$output->writeln('not yet available');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Controller;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize;
|
||||
use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger;
|
||||
use Exception;
|
||||
|
@ -57,15 +56,12 @@ use OCP\AppFramework\OCSController;
|
|||
use OCP\IRequest;
|
||||
use OCP\IUserSession;
|
||||
|
||||
|
||||
/**
|
||||
* Class AdminController
|
||||
*
|
||||
* @package OCA\Circles\Controller
|
||||
*/
|
||||
class AdminController extends OcsController {
|
||||
|
||||
|
||||
use TNC22Deserialize;
|
||||
use TNC22Logger;
|
||||
|
||||
|
@ -152,11 +148,11 @@ class AdminController extends OcsController {
|
|||
} catch (Exception $e) {
|
||||
$this->e(
|
||||
$e, [
|
||||
'emulated' => $emulated,
|
||||
'name' => $name,
|
||||
'members' => $personal,
|
||||
'local' => $local
|
||||
]
|
||||
'emulated' => $emulated,
|
||||
'name' => $name,
|
||||
'members' => $personal,
|
||||
'local' => $local
|
||||
]
|
||||
);
|
||||
throw new OcsException($e->getMessage(), $e->getCode());
|
||||
}
|
||||
|
@ -213,11 +209,11 @@ class AdminController extends OcsController {
|
|||
} catch (Exception $e) {
|
||||
$this->e(
|
||||
$e, [
|
||||
'emulated' => $emulated,
|
||||
'circleId' => $circleId,
|
||||
'userId' => $userId,
|
||||
'type' => $type
|
||||
]
|
||||
'emulated' => $emulated,
|
||||
'circleId' => $circleId,
|
||||
'userId' => $userId,
|
||||
'type' => $type
|
||||
]
|
||||
);
|
||||
throw new OCSException($e->getMessage(), $e->getCode());
|
||||
}
|
||||
|
@ -253,7 +249,7 @@ class AdminController extends OcsController {
|
|||
'emulated' => $emulated,
|
||||
'circleId' => $circleId,
|
||||
'memberId' => $memberId,
|
||||
'level' => $level
|
||||
'level' => $level
|
||||
]
|
||||
);
|
||||
throw new OcsException($e->getMessage(), $e->getCode());
|
||||
|
@ -532,6 +528,4 @@ class AdminController extends OcsController {
|
|||
$this->federatedUserService->setCurrentPatron($user->getUID());
|
||||
$this->federatedUserService->setLocalCurrentUserId($emulated);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
<?php declare(strict_types=1);
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
/**
|
||||
|
@ -29,7 +31,6 @@
|
|||
|
||||
namespace OCA\Circles\Controller;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Async;
|
||||
use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Controller;
|
||||
use ArtificialOwl\MySmallPhpTools\Traits\TStringTools;
|
||||
|
@ -44,15 +45,12 @@ use OCP\AppFramework\Http;
|
|||
use OCP\AppFramework\Http\DataResponse;
|
||||
use OCP\IRequest;
|
||||
|
||||
|
||||
/**
|
||||
* Class EventWrapperController
|
||||
*
|
||||
* @package OCA\Circles\Controller
|
||||
*/
|
||||
class EventWrapperController extends Controller {
|
||||
|
||||
|
||||
use TStringTools;
|
||||
use TNC22Async;
|
||||
use TNC22Controller;
|
||||
|
@ -165,6 +163,4 @@ class EventWrapperController extends Controller {
|
|||
// return $this->fail(['data' => $data, 'error' => $e->getMessage()]);
|
||||
// }
|
||||
// }
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Controller;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Deserialize;
|
||||
use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger;
|
||||
use Exception;
|
||||
|
@ -55,15 +54,12 @@ use OCP\AppFramework\OCSController;
|
|||
use OCP\IRequest;
|
||||
use OCP\IUserSession;
|
||||
|
||||
|
||||
/**
|
||||
* Class LocalController
|
||||
*
|
||||
* @package OCA\Circles\Controller
|
||||
*/
|
||||
class LocalController extends OcsController {
|
||||
|
||||
|
||||
use TNC22Deserialize;
|
||||
use TNC22Logger;
|
||||
|
||||
|
@ -278,7 +274,6 @@ class LocalController extends OcsController {
|
|||
$this->e($e, ['circleId' => $circleId, 'members' => $members]);
|
||||
throw new OCSException($e->getMessage(), $e->getCode());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
@ -576,6 +571,4 @@ class LocalController extends OcsController {
|
|||
$user = $this->userSession->getUser();
|
||||
$this->federatedUserService->setLocalCurrentUser($user);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -67,15 +67,12 @@ use OCP\AppFramework\Http;
|
|||
use OCP\AppFramework\Http\DataResponse;
|
||||
use OCP\IRequest;
|
||||
|
||||
|
||||
/**
|
||||
* Class RemoteController
|
||||
*
|
||||
* @package OCA\Circles\Controller
|
||||
*/
|
||||
class RemoteController extends Controller {
|
||||
|
||||
|
||||
use TNC22Controller;
|
||||
use TNC22LocalSignatory;
|
||||
use TNC22Deserialize;
|
||||
|
@ -339,9 +336,9 @@ class RemoteController extends Controller {
|
|||
// FILTER CIRCLE BASED ON THE CONFIG/FEDERATED_8192 !!
|
||||
if ($type === Member::$TYPE[Member::TYPE_SINGLE]) {
|
||||
$federatedUser = $this->federatedUserService->getFederatedUser($userId, Member::TYPE_SINGLE);
|
||||
} else if ($type === Member::$TYPE[Member::TYPE_CIRCLE]) {
|
||||
} elseif ($type === Member::$TYPE[Member::TYPE_CIRCLE]) {
|
||||
$federatedUser = $this->federatedUserService->getFederatedUser($userId, Member::TYPE_CIRCLE);
|
||||
} else if ($type === Member::$TYPE[Member::TYPE_USER]) {
|
||||
} elseif ($type === Member::$TYPE[Member::TYPE_USER]) {
|
||||
$federatedUser = $this->federatedUserService->getLocalFederatedUser($userId);
|
||||
} else {
|
||||
throw new FederatedUserNotFoundException('Entity not found');
|
||||
|
@ -471,11 +468,9 @@ class RemoteController extends Controller {
|
|||
return new DataResponse(
|
||||
[
|
||||
'message' => $e->getMessage(),
|
||||
'code' => $e->getCode()
|
||||
'code' => $e->getCode()
|
||||
],
|
||||
($e->getCode() > 0) ? $e->getCode() : $httpErrorCode
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
<?php declare(strict_types=1);
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
/**
|
||||
|
@ -29,7 +31,6 @@
|
|||
|
||||
namespace OCA\Circles\Cron;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
|
||||
use OC\BackgroundJob\TimedJob;
|
||||
use OC\Share20\Share;
|
||||
|
@ -53,15 +54,12 @@ use OCP\IUserManager;
|
|||
use OCP\Share\Exceptions\IllegalIDChangeException;
|
||||
use OCP\Share\IShare;
|
||||
|
||||
|
||||
/**
|
||||
* Class GlobalSync
|
||||
*
|
||||
* @package OCA\Cicles\Cron
|
||||
*/
|
||||
class ContactsExistingShares extends TimedJob {
|
||||
|
||||
|
||||
use TArrayTools;
|
||||
|
||||
|
||||
|
@ -256,6 +254,4 @@ class ContactsExistingShares extends TimedJob {
|
|||
|
||||
return $share;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
<?php declare(strict_types=1);
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
/**
|
||||
|
@ -29,7 +31,6 @@
|
|||
|
||||
namespace OCA\Circles\Cron;
|
||||
|
||||
|
||||
use OC\BackgroundJob\TimedJob;
|
||||
use OCA\Circles\AppInfo\Application;
|
||||
use OCA\Circles\Service\CirclesService;
|
||||
|
@ -37,7 +38,6 @@ use OCA\Circles\Service\GSUpstreamService;
|
|||
use OCA\Circles\Service\MembersService;
|
||||
use OCP\AppFramework\QueryException;
|
||||
|
||||
|
||||
/**
|
||||
* Class GlobalSync
|
||||
*
|
||||
|
@ -79,6 +79,4 @@ class GlobalSync extends TimedJob {
|
|||
//
|
||||
// $gsUpstreamService->synchronize($circles);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
<?php declare(strict_types=1);
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
/**
|
||||
|
@ -29,14 +31,12 @@
|
|||
|
||||
namespace OCA\Circles\Cron;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore;
|
||||
use OC\BackgroundJob\TimedJob;
|
||||
use OCA\Circles\Exceptions\MaintenanceException;
|
||||
use OCA\Circles\Service\ConfigService;
|
||||
use OCA\Circles\Service\MaintenanceService;
|
||||
|
||||
|
||||
/**
|
||||
* Class Maintenance
|
||||
*
|
||||
|
@ -52,7 +52,7 @@ class Maintenance extends TimedJob {
|
|||
private $configService;
|
||||
|
||||
|
||||
static $DELAY =
|
||||
public static $DELAY =
|
||||
[
|
||||
1 => 60, // every minute
|
||||
2 => 300, // every 5 minutes
|
||||
|
@ -141,6 +141,4 @@ class Maintenance extends TimedJob {
|
|||
|
||||
return ($timeLastRun + self::$DELAY[$level] < $now);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -27,13 +27,10 @@
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Traits\TStringTools;
|
||||
use OCA\Circles\Exceptions\MemberDoesNotExistException;
|
||||
|
||||
class AccountsRequest extends AccountsRequestBuilder {
|
||||
|
||||
|
||||
use TStringTools;
|
||||
|
||||
|
||||
|
@ -76,5 +73,4 @@ class AccountsRequest extends AccountsRequestBuilder {
|
|||
|
||||
return $accounts;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -28,19 +28,15 @@
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
|
||||
use OCP\DB\QueryBuilder\IQueryBuilder;
|
||||
|
||||
|
||||
/**
|
||||
* Class AccountsRequestBuilder
|
||||
*
|
||||
* @package OCA\Circles\Db
|
||||
*/
|
||||
class AccountsRequestBuilder extends DeprecatedRequestBuilder {
|
||||
|
||||
|
||||
use TArrayTools;
|
||||
|
||||
|
||||
|
@ -111,10 +107,8 @@ class AccountsRequestBuilder extends DeprecatedRequestBuilder {
|
|||
}
|
||||
|
||||
return [
|
||||
'userId' => $entry['uid'],
|
||||
'userId' => $entry['uid'],
|
||||
'displayName' => $this->get('displayname.value', $data)
|
||||
];
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use OCA\Circles\Exceptions\GSStatusException;
|
||||
|
||||
/**
|
||||
|
@ -49,7 +48,6 @@ class CircleProviderRequest extends CircleProviderRequestBuilder {
|
|||
* @throws GSStatusException
|
||||
*/
|
||||
public function getFilesForCircles($userId, $circleUniqueIds, $limit, $offset) {
|
||||
|
||||
$qb = $this->getCompleteSelectSql();
|
||||
$this->linkToFileCache($qb, $userId);
|
||||
$this->limitToPage($qb, $limit, $offset);
|
||||
|
@ -102,5 +100,4 @@ class CircleProviderRequest extends CircleProviderRequestBuilder {
|
|||
$data['file_target'] = $data['parent_target'];
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -30,7 +30,6 @@
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use Doctrine\DBAL\Query\QueryBuilder;
|
||||
use OC;
|
||||
use OCA\Circles\Model\DeprecatedMember;
|
||||
|
@ -57,7 +56,6 @@ class CircleProviderRequestBuilder extends DeprecatedRequestBuilder {
|
|||
* @return IQueryBuilder
|
||||
*/
|
||||
protected function findShareParentSql($fileId, $circleId) {
|
||||
|
||||
$qb = $this->getBaseSelectSql();
|
||||
$this->limitToShareParent($qb);
|
||||
$this->limitToCircles($qb, [$circleId]);
|
||||
|
@ -74,9 +72,8 @@ class CircleProviderRequestBuilder extends DeprecatedRequestBuilder {
|
|||
* @param array $circleUniqueIds
|
||||
*/
|
||||
protected function limitToCircles(IQueryBuilder $qb, $circleUniqueIds) {
|
||||
|
||||
if (!is_array($circleUniqueIds)) {
|
||||
$circleUniqueIds = array($circleUniqueIds);
|
||||
$circleUniqueIds = [$circleUniqueIds];
|
||||
}
|
||||
|
||||
$expr = $qb->expr();
|
||||
|
@ -162,9 +159,8 @@ class CircleProviderRequestBuilder extends DeprecatedRequestBuilder {
|
|||
* @param $files
|
||||
*/
|
||||
protected function limitToFiles(IQueryBuilder $qb, $files) {
|
||||
|
||||
if (!is_array($files)) {
|
||||
$files = array($files);
|
||||
$files = [$files];
|
||||
}
|
||||
|
||||
$expr = $qb->expr();
|
||||
|
@ -327,7 +323,6 @@ class CircleProviderRequestBuilder extends DeprecatedRequestBuilder {
|
|||
private function exprLinkToMemberAsGroupMember(
|
||||
IQueryBuilder $qb, string $userId, string $aliasM, string $aliasC
|
||||
) {
|
||||
|
||||
$expr = $qb->expr();
|
||||
$qb->leftJoin(
|
||||
$aliasM, self::NC_TABLE_GROUP_USER, 'ncgu',
|
||||
|
@ -386,7 +381,6 @@ class CircleProviderRequestBuilder extends DeprecatedRequestBuilder {
|
|||
$qb->selectAlias('s2.id', 'parent_id');
|
||||
$qb->selectAlias('s2.file_target', 'parent_target');
|
||||
$qb->selectAlias('s2.permissions', 'parent_perms');
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore;
|
||||
use OCA\Circles\Exceptions\CircleNotFoundException;
|
||||
use OCA\Circles\Exceptions\FederatedUserNotFoundException;
|
||||
|
@ -45,7 +44,6 @@ use OCA\Circles\Model\Federated\RemoteInstance;
|
|||
use OCA\Circles\Model\FederatedUser;
|
||||
use OCA\Circles\Model\Member;
|
||||
|
||||
|
||||
/**
|
||||
* Class CircleRequest
|
||||
*
|
||||
|
@ -174,8 +172,8 @@ class CircleRequest extends CircleRequestBuilder {
|
|||
$qb->setOptions(
|
||||
[CoreQueryBuilder::CIRCLE],
|
||||
[
|
||||
'getData' => true,
|
||||
'mustBeMember' => $params->gBool('mustBeMember'),
|
||||
'getData' => true,
|
||||
'mustBeMember' => $params->gBool('mustBeMember'),
|
||||
'initiatorDirectMember' => true
|
||||
]
|
||||
);
|
||||
|
@ -243,8 +241,8 @@ class CircleRequest extends CircleRequestBuilder {
|
|||
$qb->setOptions(
|
||||
[CoreQueryBuilder::CIRCLE],
|
||||
[
|
||||
'getData' => true,
|
||||
'canBeVisitor' => true,
|
||||
'getData' => true,
|
||||
'canBeVisitor' => true,
|
||||
'initiatorDirectMember' => true
|
||||
]
|
||||
);
|
||||
|
@ -404,6 +402,4 @@ class CircleRequest extends CircleRequestBuilder {
|
|||
|
||||
$qb->execute();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,12 +31,10 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Exceptions\RowNotFoundException;
|
||||
use OCA\Circles\Exceptions\CircleNotFoundException;
|
||||
use OCA\Circles\Model\Circle;
|
||||
|
||||
|
||||
/**
|
||||
* Class CircleRequestBuilder
|
||||
*
|
||||
|
@ -122,5 +120,4 @@ class CircleRequestBuilder extends CoreRequestBuilder {
|
|||
/** @var Circle[] $result */
|
||||
return $qb->asItems(Circle::class);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -31,7 +31,6 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Db\Nextcloud\nc22\NC22ExtendedQueryBuilder;
|
||||
use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
|
||||
use Doctrine\DBAL\Query\QueryBuilder;
|
||||
|
@ -47,90 +46,87 @@ use OCA\Circles\Service\ConfigService;
|
|||
use OCP\DB\QueryBuilder\ICompositeExpression;
|
||||
use OCP\DB\QueryBuilder\IQueryBuilder;
|
||||
|
||||
|
||||
/**
|
||||
* Class CoreQueryBuilder
|
||||
*
|
||||
* @package OCA\Circles\Db
|
||||
*/
|
||||
class CoreQueryBuilder extends NC22ExtendedQueryBuilder {
|
||||
|
||||
|
||||
use TArrayTools;
|
||||
|
||||
|
||||
const SINGLE = 'single';
|
||||
const CIRCLE = 'circle';
|
||||
const MEMBER = 'member';
|
||||
const MEMBER_COUNT = 'membercount';
|
||||
const OWNER = 'owner';
|
||||
const FEDERATED_EVENT = 'federatedevent';
|
||||
const REMOTE = 'remote';
|
||||
const BASED_ON = 'basedon';
|
||||
const INITIATOR = 'initiator';
|
||||
const DIRECT_INITIATOR = 'initiatordirect';
|
||||
const MEMBERSHIPS = 'memberships';
|
||||
const CONFIG = 'config';
|
||||
const UPSTREAM_MEMBERSHIPS = 'upstreammemberships';
|
||||
const INHERITANCE_FROM = 'inheritancefrom';
|
||||
const INHERITED_BY = 'inheritedby';
|
||||
const INVITED_BY = 'invitedby';
|
||||
const MOUNT = 'mount';
|
||||
const MOUNTPOINT = 'mountpoint';
|
||||
const SHARE = 'share';
|
||||
const FILE_CACHE = 'filecache';
|
||||
const STORAGES = 'storages';
|
||||
const TOKEN = 'token';
|
||||
const OPTIONS = 'options';
|
||||
const HELPER = 'circleshelper';
|
||||
public const SINGLE = 'single';
|
||||
public const CIRCLE = 'circle';
|
||||
public const MEMBER = 'member';
|
||||
public const MEMBER_COUNT = 'membercount';
|
||||
public const OWNER = 'owner';
|
||||
public const FEDERATED_EVENT = 'federatedevent';
|
||||
public const REMOTE = 'remote';
|
||||
public const BASED_ON = 'basedon';
|
||||
public const INITIATOR = 'initiator';
|
||||
public const DIRECT_INITIATOR = 'initiatordirect';
|
||||
public const MEMBERSHIPS = 'memberships';
|
||||
public const CONFIG = 'config';
|
||||
public const UPSTREAM_MEMBERSHIPS = 'upstreammemberships';
|
||||
public const INHERITANCE_FROM = 'inheritancefrom';
|
||||
public const INHERITED_BY = 'inheritedby';
|
||||
public const INVITED_BY = 'invitedby';
|
||||
public const MOUNT = 'mount';
|
||||
public const MOUNTPOINT = 'mountpoint';
|
||||
public const SHARE = 'share';
|
||||
public const FILE_CACHE = 'filecache';
|
||||
public const STORAGES = 'storages';
|
||||
public const TOKEN = 'token';
|
||||
public const OPTIONS = 'options';
|
||||
public const HELPER = 'circleshelper';
|
||||
|
||||
|
||||
public static $SQL_PATH = [
|
||||
self::SINGLE => [
|
||||
self::SINGLE => [
|
||||
self::MEMBER
|
||||
],
|
||||
self::CIRCLE => [
|
||||
self::OPTIONS => [
|
||||
self::CIRCLE => [
|
||||
self::OPTIONS => [
|
||||
],
|
||||
self::MEMBER,
|
||||
self::MEMBER_COUNT,
|
||||
self::OWNER => [
|
||||
self::OWNER => [
|
||||
self::BASED_ON
|
||||
],
|
||||
self::MEMBERSHIPS => [
|
||||
self::MEMBERSHIPS => [
|
||||
self::CONFIG
|
||||
],
|
||||
self::DIRECT_INITIATOR => [
|
||||
self::BASED_ON
|
||||
],
|
||||
self::INITIATOR => [
|
||||
self::INITIATOR => [
|
||||
self::BASED_ON,
|
||||
self::INHERITED_BY => [
|
||||
self::MEMBERSHIPS
|
||||
]
|
||||
],
|
||||
self::REMOTE => [
|
||||
self::REMOTE => [
|
||||
self::MEMBER,
|
||||
self::CIRCLE => [
|
||||
self::OWNER
|
||||
]
|
||||
]
|
||||
],
|
||||
self::MEMBER => [
|
||||
self::MEMBER => [
|
||||
self::MEMBERSHIPS => [
|
||||
self::CONFIG
|
||||
],
|
||||
self::INHERITANCE_FROM,
|
||||
self::CIRCLE => [
|
||||
self::OPTIONS => [
|
||||
self::CIRCLE => [
|
||||
self::OPTIONS => [
|
||||
'getData' => true
|
||||
],
|
||||
self::OWNER,
|
||||
self::MEMBERSHIPS => [
|
||||
self::CONFIG
|
||||
],
|
||||
self::INITIATOR => [
|
||||
self::OPTIONS => [
|
||||
self::INITIATOR => [
|
||||
self::OPTIONS => [
|
||||
'mustBeMember' => true,
|
||||
'canBeVisitor' => false
|
||||
],
|
||||
|
@ -138,13 +134,13 @@ class CoreQueryBuilder extends NC22ExtendedQueryBuilder {
|
|||
self::INHERITED_BY => [
|
||||
self::MEMBERSHIPS
|
||||
],
|
||||
self::INVITED_BY => [
|
||||
self::INVITED_BY => [
|
||||
self::OWNER,
|
||||
self::BASED_ON
|
||||
]
|
||||
]
|
||||
],
|
||||
self::BASED_ON => [
|
||||
self::BASED_ON => [
|
||||
self::OWNER,
|
||||
self::MEMBERSHIPS,
|
||||
self::INITIATOR => [
|
||||
|
@ -154,13 +150,13 @@ class CoreQueryBuilder extends NC22ExtendedQueryBuilder {
|
|||
]
|
||||
]
|
||||
],
|
||||
self::REMOTE => [
|
||||
self::REMOTE => [
|
||||
self::MEMBER,
|
||||
self::CIRCLE => [
|
||||
self::OWNER
|
||||
]
|
||||
],
|
||||
self::INVITED_BY => [
|
||||
self::INVITED_BY => [
|
||||
self::OWNER,
|
||||
self::BASED_ON
|
||||
]
|
||||
|
@ -168,10 +164,10 @@ class CoreQueryBuilder extends NC22ExtendedQueryBuilder {
|
|||
self::MEMBERSHIPS => [
|
||||
self::CONFIG
|
||||
],
|
||||
self::SHARE => [
|
||||
self::SHARE => [
|
||||
self::SHARE,
|
||||
self::TOKEN,
|
||||
self::FILE_CACHE => [
|
||||
self::FILE_CACHE => [
|
||||
self::STORAGES
|
||||
],
|
||||
self::UPSTREAM_MEMBERSHIPS => [
|
||||
|
@ -181,31 +177,31 @@ class CoreQueryBuilder extends NC22ExtendedQueryBuilder {
|
|||
],
|
||||
self::SHARE,
|
||||
],
|
||||
self::MEMBERSHIPS => [
|
||||
self::MEMBERSHIPS => [
|
||||
self::CONFIG
|
||||
],
|
||||
self::INHERITANCE_FROM,
|
||||
self::INHERITED_BY => [
|
||||
self::INHERITED_BY => [
|
||||
self::BASED_ON
|
||||
],
|
||||
self::CIRCLE => [
|
||||
self::CIRCLE => [
|
||||
self::OWNER
|
||||
],
|
||||
self::INITIATOR => [
|
||||
self::INITIATOR => [
|
||||
self::BASED_ON,
|
||||
self::INHERITED_BY => [
|
||||
self::MEMBERSHIPS
|
||||
]
|
||||
]
|
||||
],
|
||||
self::REMOTE => [
|
||||
self::REMOTE => [
|
||||
self::MEMBER
|
||||
],
|
||||
self::MOUNT => [
|
||||
self::MEMBER => [
|
||||
self::MOUNT => [
|
||||
self::MEMBER => [
|
||||
self::REMOTE
|
||||
],
|
||||
self::INITIATOR => [
|
||||
self::INITIATOR => [
|
||||
self::INHERITED_BY => [
|
||||
self::MEMBERSHIPS
|
||||
]
|
||||
|
@ -215,20 +211,20 @@ class CoreQueryBuilder extends NC22ExtendedQueryBuilder {
|
|||
self::CONFIG
|
||||
]
|
||||
],
|
||||
self::HELPER => [
|
||||
self::HELPER => [
|
||||
self::MEMBERSHIPS => [
|
||||
self::CONFIG
|
||||
],
|
||||
self::INITIATOR => [
|
||||
self::INITIATOR => [
|
||||
self::INHERITED_BY => [
|
||||
self::MEMBERSHIPS
|
||||
]
|
||||
],
|
||||
self::CIRCLE => [
|
||||
self::CIRCLE => [
|
||||
self::OPTIONS => [
|
||||
],
|
||||
self::MEMBER,
|
||||
self::OWNER => [
|
||||
self::OWNER => [
|
||||
self::BASED_ON
|
||||
]
|
||||
]
|
||||
|
@ -437,7 +433,6 @@ class CoreQueryBuilder extends NC22ExtendedQueryBuilder {
|
|||
bool $filterSensitiveData = true,
|
||||
string $aliasCircle = ''
|
||||
): void {
|
||||
|
||||
if ($aliasCircle === '') {
|
||||
$aliasCircle = $alias;
|
||||
}
|
||||
|
@ -1215,11 +1210,11 @@ class CoreQueryBuilder extends NC22ExtendedQueryBuilder {
|
|||
$default = [];
|
||||
if ($this->getBool('canBeVisitor', $options, false)) {
|
||||
$default = [
|
||||
'user_id' => $initiator->getUserId(),
|
||||
'single_id' => $initiator->getSingleId(),
|
||||
'user_type' => $initiator->getUserType(),
|
||||
'user_id' => $initiator->getUserId(),
|
||||
'single_id' => $initiator->getSingleId(),
|
||||
'user_type' => $initiator->getUserType(),
|
||||
'cached_name' => $initiator->getDisplayName(),
|
||||
'instance' => $initiator->getInstance()
|
||||
'instance' => $initiator->getInstance()
|
||||
];
|
||||
}
|
||||
$aliasInheritedByMembership = $this->generateAlias($aliasInheritedBy, self::MEMBERSHIPS);
|
||||
|
@ -1649,6 +1644,4 @@ class CoreQueryBuilder extends NC22ExtendedQueryBuilder {
|
|||
|
||||
return $orX;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use Exception;
|
||||
use OC\DB\Connection;
|
||||
use OC\DB\SchemaWrapper;
|
||||
|
@ -40,40 +39,37 @@ use OCA\Circles\Service\ConfigService;
|
|||
use OCA\Circles\Service\TimezoneService;
|
||||
use OCP\Share\IShare;
|
||||
|
||||
|
||||
/**
|
||||
* Class CoreQueryBuilder
|
||||
*
|
||||
* @package OCA\Circles\Db
|
||||
*/
|
||||
class CoreRequestBuilder {
|
||||
public const TABLE_SHARE = 'share';
|
||||
public const TABLE_FILE_CACHE = 'filecache';
|
||||
public const TABLE_STORAGES = 'storages';
|
||||
|
||||
|
||||
const TABLE_SHARE = 'share';
|
||||
const TABLE_FILE_CACHE = 'filecache';
|
||||
const TABLE_STORAGES = 'storages';
|
||||
|
||||
const TABLE_CIRCLE = 'circles_circle';
|
||||
const TABLE_MEMBER = 'circles_member';
|
||||
const TABLE_MEMBERSHIP = 'circles_membership';
|
||||
const TABLE_REMOTE = 'circles_remote';
|
||||
const TABLE_EVENT = 'circles_event';
|
||||
const TABLE_MOUNT = 'circles_mount';
|
||||
const TABLE_MOUNTPOINT = 'circles_mountpoint';
|
||||
public const TABLE_CIRCLE = 'circles_circle';
|
||||
public const TABLE_MEMBER = 'circles_member';
|
||||
public const TABLE_MEMBERSHIP = 'circles_membership';
|
||||
public const TABLE_REMOTE = 'circles_remote';
|
||||
public const TABLE_EVENT = 'circles_event';
|
||||
public const TABLE_MOUNT = 'circles_mount';
|
||||
public const TABLE_MOUNTPOINT = 'circles_mountpoint';
|
||||
|
||||
// wip
|
||||
const TABLE_SHARE_LOCK = 'circles_share_lock';
|
||||
const TABLE_TOKEN = 'circles_token';
|
||||
public const TABLE_SHARE_LOCK = 'circles_share_lock';
|
||||
public const TABLE_TOKEN = 'circles_token';
|
||||
|
||||
const TABLE_GSSHARES = 'circle_gsshares'; // rename ?
|
||||
const TABLE_GSSHARES_MOUNTPOINT = 'circle_gsshares_mp'; // rename ?
|
||||
public const TABLE_GSSHARES = 'circle_gsshares'; // rename ?
|
||||
public const TABLE_GSSHARES_MOUNTPOINT = 'circle_gsshares_mp'; // rename ?
|
||||
|
||||
const NC_TABLE_ACCOUNTS = 'accounts';
|
||||
const NC_TABLE_GROUP_USER = 'group_user';
|
||||
public const NC_TABLE_ACCOUNTS = 'accounts';
|
||||
public const NC_TABLE_GROUP_USER = 'group_user';
|
||||
|
||||
/** @var array */
|
||||
static $tables = [
|
||||
self::TABLE_CIRCLE => [
|
||||
public static $tables = [
|
||||
self::TABLE_CIRCLE => [
|
||||
'unique_id',
|
||||
'name',
|
||||
'display_name',
|
||||
|
@ -86,7 +82,7 @@ class CoreRequestBuilder {
|
|||
'contact_groupname',
|
||||
'creation'
|
||||
],
|
||||
self::TABLE_MEMBER => [
|
||||
self::TABLE_MEMBER => [
|
||||
'circle_id',
|
||||
'member_id',
|
||||
'single_id',
|
||||
|
@ -102,7 +98,7 @@ class CoreRequestBuilder {
|
|||
'contact_meta',
|
||||
'joined'
|
||||
],
|
||||
self::TABLE_MEMBERSHIP => [
|
||||
self::TABLE_MEMBERSHIP => [
|
||||
'single_id',
|
||||
'circle_id',
|
||||
'level',
|
||||
|
@ -111,7 +107,7 @@ class CoreRequestBuilder {
|
|||
'inheritance_path',
|
||||
'inheritance_depth'
|
||||
],
|
||||
self::TABLE_REMOTE => [
|
||||
self::TABLE_REMOTE => [
|
||||
'id',
|
||||
'type',
|
||||
'interface',
|
||||
|
@ -121,7 +117,7 @@ class CoreRequestBuilder {
|
|||
'item',
|
||||
'creation'
|
||||
],
|
||||
self::TABLE_EVENT => [
|
||||
self::TABLE_EVENT => [
|
||||
'token',
|
||||
'event',
|
||||
'result',
|
||||
|
@ -132,7 +128,7 @@ class CoreRequestBuilder {
|
|||
'status',
|
||||
'creation'
|
||||
],
|
||||
self::TABLE_MOUNT => [
|
||||
self::TABLE_MOUNT => [
|
||||
'id',
|
||||
'mount_id',
|
||||
'circle_id',
|
||||
|
@ -142,9 +138,9 @@ class CoreRequestBuilder {
|
|||
'mountpoint',
|
||||
'mountpoint_hash'
|
||||
],
|
||||
self::TABLE_MOUNTPOINT => [],
|
||||
self::TABLE_SHARE_LOCK => [],
|
||||
self::TABLE_TOKEN => [
|
||||
self::TABLE_MOUNTPOINT => [],
|
||||
self::TABLE_SHARE_LOCK => [],
|
||||
self::TABLE_TOKEN => [
|
||||
'id',
|
||||
'share_id',
|
||||
'circle_id',
|
||||
|
@ -154,13 +150,13 @@ class CoreRequestBuilder {
|
|||
'password',
|
||||
'accepted'
|
||||
],
|
||||
self::TABLE_GSSHARES => [],
|
||||
self::TABLE_GSSHARES => [],
|
||||
self::TABLE_GSSHARES_MOUNTPOINT => []
|
||||
];
|
||||
|
||||
|
||||
static $outsideTables = [
|
||||
self::TABLE_SHARE => [
|
||||
public static $outsideTables = [
|
||||
self::TABLE_SHARE => [
|
||||
'id',
|
||||
'share_type',
|
||||
'share_with',
|
||||
|
@ -197,7 +193,7 @@ class CoreRequestBuilder {
|
|||
'etag',
|
||||
'checksum'
|
||||
],
|
||||
self::TABLE_STORAGES => [
|
||||
self::TABLE_STORAGES => [
|
||||
'id'
|
||||
]
|
||||
];
|
||||
|
@ -320,6 +316,4 @@ class CoreRequestBuilder {
|
|||
// $qb->where($this->exprLimitToDBField($qb, 'class', 'OCA\Circles\', true, true));
|
||||
// $qb->execute();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
<?php declare(strict_types=1);
|
||||
<?php
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
|
||||
/**
|
||||
|
@ -29,7 +31,6 @@
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use OCA\Circles\Exceptions\CircleAlreadyExistsException;
|
||||
use OCA\Circles\Exceptions\CircleDoesNotExistException;
|
||||
use OCA\Circles\Exceptions\ConfigNoCircleAvailableException;
|
||||
|
@ -113,7 +114,6 @@ class DeprecatedCirclesRequest extends DeprecatedCirclesRequestBuilder {
|
|||
* @throws CircleDoesNotExistException
|
||||
*/
|
||||
public function forceGetCircleByName($name) {
|
||||
|
||||
$qb = $this->getCirclesSelectSql();
|
||||
|
||||
$this->limitToName($qb, $name);
|
||||
|
@ -236,7 +236,6 @@ class DeprecatedCirclesRequest extends DeprecatedCirclesRequestBuilder {
|
|||
* @param DeprecatedCircle $circle
|
||||
*/
|
||||
public function createCircle(DeprecatedCircle $circle) {
|
||||
|
||||
$config = DeprecatedCircle::convertTypeToConfig($circle->getType());
|
||||
|
||||
$qb = $this->getCirclesInsertSql();
|
||||
|
@ -437,5 +436,4 @@ class DeprecatedCirclesRequest extends DeprecatedCirclesRequestBuilder {
|
|||
|
||||
return $this->parseCirclesSelectSql($data);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use Doctrine\DBAL\Query\QueryBuilder;
|
||||
use OCA\Circles\Exceptions\ConfigNoCircleAvailableException;
|
||||
use OCA\Circles\Model\DeprecatedCircle;
|
||||
|
@ -275,7 +274,6 @@ class DeprecatedCirclesRequestBuilder extends DeprecatedRequestBuilder {
|
|||
* @param string $ownerId
|
||||
*/
|
||||
public function leftJoinOwner(IQueryBuilder $qb, string $ownerId = '') {
|
||||
|
||||
if ($qb->getType() !== QueryBuilder::SELECT) {
|
||||
return;
|
||||
}
|
||||
|
@ -385,7 +383,6 @@ class DeprecatedCirclesRequestBuilder extends DeprecatedRequestBuilder {
|
|||
* @return DeprecatedCircle
|
||||
*/
|
||||
protected function parseCirclesSelectSql($data, bool $allSettings = false) {
|
||||
|
||||
$circle = new DeprecatedCircle();
|
||||
$circle->setId($data['id']);
|
||||
$circle->setUniqueId($data['unique_id']);
|
||||
|
@ -425,6 +422,4 @@ class DeprecatedCirclesRequestBuilder extends DeprecatedRequestBuilder {
|
|||
|
||||
return $circle;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Traits\TStringTools;
|
||||
use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
|
||||
use Exception;
|
||||
|
@ -38,8 +37,6 @@ use OCA\Circles\Model\DeprecatedMember;
|
|||
use OCP\IGroup;
|
||||
|
||||
class DeprecatedMembersRequest extends DeprecatedMembersRequestBuilder {
|
||||
|
||||
|
||||
use TStringTools;
|
||||
|
||||
|
||||
|
@ -159,7 +156,6 @@ class DeprecatedMembersRequest extends DeprecatedMembersRequestBuilder {
|
|||
* @return DeprecatedMember[]
|
||||
*/
|
||||
public function forceGetAllMembers() {
|
||||
|
||||
$qb = $this->getMembersSelectSql();
|
||||
|
||||
$members = [];
|
||||
|
@ -231,7 +227,7 @@ class DeprecatedMembersRequest extends DeprecatedMembersRequestBuilder {
|
|||
if ($force === false) {
|
||||
if (!$viewer->isLevel(DeprecatedMember::LEVEL_MODERATOR)) {
|
||||
array_map(
|
||||
function(DeprecatedMember $m) {
|
||||
function (DeprecatedMember $m) {
|
||||
$m->setNote('');
|
||||
}, $members
|
||||
);
|
||||
|
@ -309,7 +305,7 @@ class DeprecatedMembersRequest extends DeprecatedMembersRequestBuilder {
|
|||
$index = $this->indexOfMember($members, $member->getUserId());
|
||||
if ($index === -1) {
|
||||
array_push($members, $member);
|
||||
} else if ($members[$index]->getLevel() < $member->getLevel()) {
|
||||
} elseif ($members[$index]->getLevel() < $member->getLevel()) {
|
||||
$members[$index] = $member;
|
||||
}
|
||||
}
|
||||
|
@ -325,7 +321,6 @@ class DeprecatedMembersRequest extends DeprecatedMembersRequestBuilder {
|
|||
* @return int
|
||||
*/
|
||||
private function indexOfMember(array $members, $userId) {
|
||||
|
||||
foreach ($members as $k => $member) {
|
||||
if ($member->getUserId() === $userId) {
|
||||
return intval($k);
|
||||
|
@ -348,7 +343,6 @@ class DeprecatedMembersRequest extends DeprecatedMembersRequestBuilder {
|
|||
* @return DeprecatedMember
|
||||
*/
|
||||
public function getFreshNewMember($circleUniqueId, string $name, int $type, string $instance) {
|
||||
|
||||
try {
|
||||
$member = $this->forceGetMember($circleUniqueId, $name, $type, $instance);
|
||||
} catch (MemberDoesNotExistException $e) {
|
||||
|
@ -473,7 +467,6 @@ class DeprecatedMembersRequest extends DeprecatedMembersRequestBuilder {
|
|||
* @throws MemberAlreadyExistsException
|
||||
*/
|
||||
public function createMember(DeprecatedMember $member) {
|
||||
|
||||
if ($member->getMemberId() === '') {
|
||||
$member->setMemberId($this->token(14));
|
||||
}
|
||||
|
@ -785,6 +778,4 @@ class DeprecatedMembersRequest extends DeprecatedMembersRequestBuilder {
|
|||
|
||||
$qb->execute();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -28,7 +28,6 @@
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use OCA\Circles\Model\DeprecatedMember;
|
||||
use OCA\Circles\Service\ConfigService;
|
||||
use OCA\Circles\Service\MiscService;
|
||||
|
@ -188,5 +187,4 @@ class DeprecatedMembersRequestBuilder extends DeprecatedRequestBuilder {
|
|||
|
||||
return $member;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use Doctrine\DBAL\Query\QueryBuilder;
|
||||
use OCA\Circles\Exceptions\GSStatusException;
|
||||
use OCA\Circles\Model\DeprecatedMember;
|
||||
|
@ -20,23 +19,22 @@ use OCP\IDBConnection;
|
|||
use OCP\IL10N;
|
||||
|
||||
class DeprecatedRequestBuilder {
|
||||
public const TABLE_FILE_SHARES = 'share';
|
||||
public const SHARE_TYPE = 7;
|
||||
|
||||
const TABLE_FILE_SHARES = 'share';
|
||||
const SHARE_TYPE = 7;
|
||||
public const TABLE_CIRCLES = 'circle_circles';
|
||||
public const TABLE_MEMBERS = 'circle_members';
|
||||
public const TABLE_GROUPS = 'circle_groups';
|
||||
public const TABLE_SHARES = 'circle_shares';
|
||||
public const TABLE_LINKS = 'circle_links';
|
||||
public const TABLE_TOKENS = 'circle_tokens';
|
||||
public const TABLE_GSEVENTS = 'circle_gsevents';
|
||||
public const TABLE_GSSHARES = 'circle_gsshares';
|
||||
public const TABLE_GSSHARES_MOUNTPOINT = 'circle_gsshares_mp';
|
||||
public const TABLE_REMOTE = 'circle_remotes';
|
||||
|
||||
const TABLE_CIRCLES = 'circle_circles';
|
||||
const TABLE_MEMBERS = 'circle_members';
|
||||
const TABLE_GROUPS = 'circle_groups';
|
||||
const TABLE_SHARES = 'circle_shares';
|
||||
const TABLE_LINKS = 'circle_links';
|
||||
const TABLE_TOKENS = 'circle_tokens';
|
||||
const TABLE_GSEVENTS = 'circle_gsevents';
|
||||
const TABLE_GSSHARES = 'circle_gsshares';
|
||||
const TABLE_GSSHARES_MOUNTPOINT = 'circle_gsshares_mp';
|
||||
const TABLE_REMOTE = 'circle_remotes';
|
||||
|
||||
const NC_TABLE_ACCOUNTS = 'accounts';
|
||||
const NC_TABLE_GROUP_USER = 'group_user';
|
||||
public const NC_TABLE_ACCOUNTS = 'accounts';
|
||||
public const NC_TABLE_GROUP_USER = 'group_user';
|
||||
|
||||
/** @var array */
|
||||
private $tables = [
|
||||
|
@ -512,8 +510,4 @@ class DeprecatedRequestBuilder {
|
|||
|
||||
$this->leftJoinedNCGroupAndUser = true;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -31,10 +31,8 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use OCA\Circles\Model\Federated\EventWrapper;
|
||||
|
||||
|
||||
/**
|
||||
* Class EventWrapperRequest
|
||||
*
|
||||
|
@ -121,6 +119,4 @@ class EventWrapperRequest extends EventWrapperRequestBuilder {
|
|||
|
||||
return $this->getItemsFromRequest($qb);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,12 +31,10 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Exceptions\RowNotFoundException;
|
||||
use OCA\Circles\Exceptions\EventWrapperNotFoundException;
|
||||
use OCA\Circles\Model\Federated\EventWrapper;
|
||||
|
||||
|
||||
/**
|
||||
* Class GSEventsRequestBuilder
|
||||
*
|
||||
|
@ -120,6 +118,4 @@ class EventWrapperRequestBuilder extends CoreRequestBuilder {
|
|||
/** @var EventWrapper[] $result */
|
||||
return $qb->asItems(EventWrapper::class);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use OCA\Circles\Exceptions\FederatedLinkDoesNotExistException;
|
||||
use OCA\Circles\Model\FederatedLink;
|
||||
|
||||
|
@ -68,7 +67,6 @@ class FederatedLinksRequest extends FederatedLinksRequestBuilder {
|
|||
* @param FederatedLink $link
|
||||
*/
|
||||
public function update(FederatedLink $link) {
|
||||
|
||||
if ($link->getStatus() === FederatedLink::STATUS_LINK_REMOVE) {
|
||||
$this->delete($link);
|
||||
|
||||
|
@ -92,7 +90,6 @@ class FederatedLinksRequest extends FederatedLinksRequestBuilder {
|
|||
* @param FederatedLink $link
|
||||
*/
|
||||
public function delete(FederatedLink $link) {
|
||||
|
||||
if ($link === null) {
|
||||
return;
|
||||
}
|
||||
|
@ -225,6 +222,4 @@ class FederatedLinksRequest extends FederatedLinksRequestBuilder {
|
|||
|
||||
return $this->parseLinksSelectSql($data);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use OCA\Circles\Model\FederatedLink;
|
||||
use OCA\Circles\Service\ConfigService;
|
||||
use OCA\Circles\Service\MiscService;
|
||||
|
@ -36,7 +35,6 @@ use OCP\DB\QueryBuilder\IQueryBuilder;
|
|||
use OCP\IDBConnection;
|
||||
use OCP\IL10N;
|
||||
|
||||
|
||||
/**
|
||||
* @deprecated
|
||||
* Class FederatedLinksRequestBuilder
|
||||
|
@ -134,5 +132,4 @@ class FederatedLinksRequestBuilder extends DeprecatedRequestBuilder {
|
|||
|
||||
return $link;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -27,10 +27,8 @@
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use OCA\Circles\Model\DeprecatedMember;
|
||||
|
||||
|
||||
/**
|
||||
* @deprecated
|
||||
* Class SharesRequest
|
||||
|
@ -117,6 +115,4 @@ class FileSharesRequest extends FileSharesRequestBuilder {
|
|||
|
||||
return $shares;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -27,10 +27,8 @@
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use OCP\DB\QueryBuilder\IQueryBuilder;
|
||||
|
||||
|
||||
/**
|
||||
* @deprecated
|
||||
* Class FileSharesRequestBuilder
|
||||
|
@ -92,6 +90,4 @@ class FileSharesRequestBuilder extends DeprecatedRequestBuilder {
|
|||
|
||||
return $qb;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Traits\TStringTools;
|
||||
use OCA\Circles\Model\GlobalScale\GSShare;
|
||||
use OCA\Circles\Model\GlobalScale\GSShareMountpoint;
|
||||
|
@ -35,7 +34,6 @@ use OCA\Circles\Model\DeprecatedMember;
|
|||
use OCP\DB\QueryBuilder\IQueryBuilder;
|
||||
use OCP\Share\Exceptions\ShareNotFound;
|
||||
|
||||
|
||||
/**
|
||||
* @deprecated
|
||||
* Class GSSharesRequest
|
||||
|
@ -43,8 +41,6 @@ use OCP\Share\Exceptions\ShareNotFound;
|
|||
* @package OCA\Circles\Db
|
||||
*/
|
||||
class GSSharesRequest extends GSSharesRequestBuilder {
|
||||
|
||||
|
||||
use TStringTools;
|
||||
|
||||
|
||||
|
@ -219,8 +215,4 @@ class GSSharesRequest extends GSSharesRequestBuilder {
|
|||
|
||||
return ($nb === 1);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -28,14 +28,12 @@
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use OCA\Circles\Model\GlobalScale\GSShare;
|
||||
use OCA\Circles\Model\GlobalScale\GSShareMountpoint;
|
||||
use OCP\DB\QueryBuilder\IQueryBuilder;
|
||||
|
||||
|
||||
/** * @deprecated
|
||||
|
||||
*
|
||||
* Class GSSharesRequestBuilder
|
||||
*
|
||||
* @package OCA\Circles\Db
|
||||
|
@ -180,5 +178,4 @@ class GSSharesRequestBuilder extends DeprecatedRequestBuilder {
|
|||
|
||||
return $share;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -31,7 +31,6 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use OCA\Circles\Exceptions\InvalidIdException;
|
||||
use OCA\Circles\Exceptions\MemberNotFoundException;
|
||||
use OCA\Circles\Exceptions\RequestBuilderException;
|
||||
|
@ -41,7 +40,6 @@ use OCA\Circles\Model\Federated\RemoteInstance;
|
|||
use OCA\Circles\Model\FederatedUser;
|
||||
use OCA\Circles\Model\Member;
|
||||
|
||||
|
||||
/**
|
||||
* Class MemberRequest
|
||||
*
|
||||
|
@ -328,7 +326,7 @@ class MemberRequest extends MemberRequestBuilder {
|
|||
$qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER . '.instance'));
|
||||
|
||||
return array_map(
|
||||
function(Member $member): string {
|
||||
function (Member $member): string {
|
||||
return $member->getInstance();
|
||||
}, $this->getItemsFromRequest($qb)
|
||||
);
|
||||
|
@ -406,6 +404,4 @@ class MemberRequest extends MemberRequestBuilder {
|
|||
|
||||
return $this->getItemsFromRequest($qb);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Exceptions\RowNotFoundException;
|
||||
use OCA\Circles\Exceptions\MemberNotFoundException;
|
||||
use OCA\Circles\Exceptions\RequestBuilderException;
|
||||
|
@ -39,7 +38,6 @@ use OCA\Circles\IFederatedUser;
|
|||
use OCA\Circles\Model\FederatedUser;
|
||||
use OCA\Circles\Model\Member;
|
||||
|
||||
|
||||
/**
|
||||
* Class MemberRequestBuilder
|
||||
*
|
||||
|
@ -144,5 +142,4 @@ class MemberRequestBuilder extends CoreRequestBuilder {
|
|||
/** @var Member|FederatedUser[] $result */
|
||||
return $qb->asItems($object);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -31,13 +31,11 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use OCA\Circles\Exceptions\MembershipNotFoundException;
|
||||
use OCA\Circles\Model\FederatedUser;
|
||||
use OCA\Circles\Model\Membership;
|
||||
use OCP\DB\QueryBuilder\IQueryBuilder;
|
||||
|
||||
|
||||
/**
|
||||
* Class MembershipRequest
|
||||
*
|
||||
|
@ -176,6 +174,4 @@ class MembershipRequest extends MembershipRequestBuilder {
|
|||
|
||||
$qb->execute();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,12 +31,10 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Exceptions\RowNotFoundException;
|
||||
use OCA\Circles\Exceptions\MembershipNotFoundException;
|
||||
use OCA\Circles\Model\Membership;
|
||||
|
||||
|
||||
/**
|
||||
* Class MembershipRequestBuilder
|
||||
*
|
||||
|
@ -121,5 +119,4 @@ class MembershipRequestBuilder extends CoreRequestBuilder {
|
|||
/** @var Membership[] $result */
|
||||
return $qb->asItems(Membership::class);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -31,21 +31,17 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Traits\TStringTools;
|
||||
use OCA\Circles\Exceptions\RequestBuilderException;
|
||||
use OCA\Circles\IFederatedUser;
|
||||
use OCA\Circles\Model\Mount;
|
||||
|
||||
|
||||
/**
|
||||
* Class GSSharesRequest
|
||||
*
|
||||
* @package OCA\Circles\Db
|
||||
*/
|
||||
class MountRequest extends MountRequestBuilder {
|
||||
|
||||
|
||||
use TStringTools;
|
||||
|
||||
|
||||
|
@ -288,7 +284,4 @@ class MountRequest extends MountRequestBuilder {
|
|||
// return ($nb === 1);
|
||||
// }
|
||||
//
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,12 +31,10 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Exceptions\RowNotFoundException;
|
||||
use OCA\Circles\Exceptions\MountNotFoundException;
|
||||
use OCA\Circles\Model\Mount;
|
||||
|
||||
|
||||
/**
|
||||
* Class MountRequestBuilder
|
||||
*
|
||||
|
@ -117,6 +115,4 @@ class MountRequestBuilder extends CoreRequestBuilder {
|
|||
/** @var Mount[] $result */
|
||||
return $qb->asItems(Mount::class);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use OCA\Circles\Exceptions\RemoteNotFoundException;
|
||||
use OCA\Circles\Exceptions\RemoteUidException;
|
||||
use OCA\Circles\Exceptions\RequestBuilderException;
|
||||
|
@ -40,7 +39,6 @@ use OCA\Circles\Model\Federated\RemoteInstance;
|
|||
use OCA\Circles\Model\Member;
|
||||
use OCP\DB\QueryBuilder\IQueryBuilder;
|
||||
|
||||
|
||||
/**
|
||||
* Class RemoteRequest
|
||||
*
|
||||
|
@ -289,7 +287,4 @@ class RemoteRequest extends RemoteRequestBuilder {
|
|||
$qb->limitToId($remoteInstance->getDbId());
|
||||
$qb->execute();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,12 +31,10 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Exceptions\RowNotFoundException;
|
||||
use OCA\Circles\Exceptions\RemoteNotFoundException;
|
||||
use OCA\Circles\Model\Federated\RemoteInstance;
|
||||
|
||||
|
||||
/**
|
||||
* Class RemoteRequestBuilder
|
||||
*
|
||||
|
@ -122,6 +120,4 @@ class RemoteRequestBuilder extends CoreRequestBuilder {
|
|||
/** @var RemoteInstance[] $result */
|
||||
return $qb->asItems(RemoteInstance::class);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,12 +31,10 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use OCA\Circles\Exceptions\FederatedShareNotFoundException;
|
||||
use OCA\Circles\Exceptions\InvalidIdException;
|
||||
use OCA\Circles\Model\Federated\FederatedShare;
|
||||
|
||||
|
||||
/**
|
||||
* Class ShareRequest
|
||||
*
|
||||
|
@ -79,6 +77,4 @@ class ShareLockRequest extends ShareLockRequestBuilder {
|
|||
|
||||
return $this->getItemFromRequest($qb);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Exceptions\RowNotFoundException;
|
||||
use OCA\Circles\Exceptions\FederatedShareNotFoundException;
|
||||
use OCA\Circles\Model\Federated\FederatedShare;
|
||||
|
@ -117,6 +116,4 @@ class ShareLockRequestBuilder extends CoreRequestBuilder {
|
|||
/** @var FederatedShare[] $result */
|
||||
return $qb->asItems(FederatedShare::class);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -31,11 +31,9 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use OCA\Circles\Exceptions\ShareTokenNotFoundException;
|
||||
use OCA\Circles\Model\ShareToken;
|
||||
|
||||
|
||||
/**
|
||||
* Class ShareTokenRequest
|
||||
*
|
||||
|
@ -106,6 +104,4 @@ class ShareTokenRequest extends ShareTokenRequestBuilder {
|
|||
|
||||
$qb->execute();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,12 +31,10 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Exceptions\RowNotFoundException;
|
||||
use OCA\Circles\Exceptions\ShareTokenNotFoundException;
|
||||
use OCA\Circles\Model\ShareToken;
|
||||
|
||||
|
||||
/**
|
||||
* Class ShareTokenRequestBuilder
|
||||
*
|
||||
|
@ -121,6 +119,4 @@ class ShareTokenRequestBuilder extends CoreRequestBuilder {
|
|||
/** @var ShareToken[] $result */
|
||||
return $qb->asItems(ShareToken::class);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use OCA\Circles\Exceptions\RequestBuilderException;
|
||||
use OCA\Circles\Exceptions\ShareWrapperNotFoundException;
|
||||
use OCA\Circles\Model\FederatedUser;
|
||||
|
@ -41,7 +40,6 @@ use OCP\Files\NotFoundException;
|
|||
use OCP\Share\Exceptions\IllegalIDChangeException;
|
||||
use OCP\Share\IShare;
|
||||
|
||||
|
||||
/**
|
||||
* Class ShareWrapperRequest
|
||||
*
|
||||
|
@ -452,6 +450,4 @@ class ShareWrapperRequest extends ShareWrapperRequestBuilder {
|
|||
|
||||
$qb->execute();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,13 +31,11 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Exceptions\RowNotFoundException;
|
||||
use OC\Share20\Share;
|
||||
use OCA\Circles\Exceptions\ShareWrapperNotFoundException;
|
||||
use OCA\Circles\Model\ShareWrapper;
|
||||
|
||||
|
||||
/**
|
||||
* Class ShareWrapperRequestBuilder
|
||||
*
|
||||
|
@ -124,6 +122,4 @@ class ShareWrapperRequestBuilder extends CoreRequestBuilder {
|
|||
/** @var ShareWrapper[] $result */
|
||||
return $qb->asItems(ShareWrapper::class);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -27,13 +27,11 @@
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
|
||||
use OCA\Circles\Exceptions\TokenDoesNotExistException;
|
||||
use OCA\Circles\Model\DeprecatedMember;
|
||||
use OCA\Circles\Model\SharesToken;
|
||||
|
||||
|
||||
/**
|
||||
* @deprecated
|
||||
* Class TokensRequest
|
||||
|
@ -179,6 +177,4 @@ class TokensRequest extends TokensRequestBuilder {
|
|||
|
||||
$qb->execute();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -28,12 +28,10 @@
|
|||
|
||||
namespace OCA\Circles\Db;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
|
||||
use OCA\Circles\Model\SharesToken;
|
||||
use OCP\DB\QueryBuilder\IQueryBuilder;
|
||||
|
||||
|
||||
/**
|
||||
* @deprecated
|
||||
* Class TokensRequestBuilder
|
||||
|
@ -41,8 +39,6 @@ use OCP\DB\QueryBuilder\IQueryBuilder;
|
|||
* @package OCA\Circles\Db
|
||||
*/
|
||||
class TokensRequestBuilder extends DeprecatedRequestBuilder {
|
||||
|
||||
|
||||
use TArrayTools;
|
||||
|
||||
|
||||
|
@ -112,5 +108,4 @@ class TokensRequestBuilder extends DeprecatedRequestBuilder {
|
|||
|
||||
return $sharesToken;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -31,10 +31,8 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Events;
|
||||
|
||||
|
||||
use OCA\Circles\Model\Federated\FederatedEvent;
|
||||
|
||||
|
||||
/**
|
||||
* Class AddingCircleMemberEvent
|
||||
*
|
||||
|
@ -85,6 +83,4 @@ class AddingCircleMemberEvent extends CircleMemberGenericEvent {
|
|||
public function getType(): int {
|
||||
return $this->type;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,10 +31,8 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Events;
|
||||
|
||||
|
||||
use OCA\Circles\Model\Federated\FederatedEvent;
|
||||
|
||||
|
||||
/**
|
||||
* Class CircleCreatedEvent
|
||||
*
|
||||
|
@ -61,6 +59,4 @@ class CircleCreatedEvent extends CircleResultGenericEvent {
|
|||
public function __construct(FederatedEvent $federatedEvent, array $results) {
|
||||
parent::__construct($federatedEvent, $results);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,10 +31,8 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Events;
|
||||
|
||||
|
||||
use OCA\Circles\Model\Federated\FederatedEvent;
|
||||
|
||||
|
||||
/**
|
||||
* Class CircleDestroyedEvent
|
||||
*
|
||||
|
@ -60,6 +58,4 @@ class CircleDestroyedEvent extends CircleResultGenericEvent {
|
|||
public function __construct(FederatedEvent $federatedEvent, array $results) {
|
||||
parent::__construct($federatedEvent, $results);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,10 +31,8 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Events;
|
||||
|
||||
|
||||
use OCA\Circles\Model\Federated\FederatedEvent;
|
||||
|
||||
|
||||
/**
|
||||
* Class CircleEditedEvent
|
||||
*
|
||||
|
@ -60,6 +58,4 @@ class CircleEditedEvent extends CircleResultGenericEvent {
|
|||
public function __construct(FederatedEvent $federatedEvent, array $results) {
|
||||
parent::__construct($federatedEvent, $results);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,29 +31,25 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Events;
|
||||
|
||||
|
||||
use OCA\Circles\Model\Circle;
|
||||
use OCA\Circles\Model\Federated\FederatedEvent;
|
||||
use OCP\EventDispatcher\Event;
|
||||
|
||||
|
||||
/**
|
||||
* Class CircleMemberAddedEvent
|
||||
*
|
||||
* @package OCA\Circles\Events
|
||||
*/
|
||||
class CircleGenericEvent extends Event {
|
||||
|
||||
|
||||
const INVITED = 1;
|
||||
const JOINED = 2;
|
||||
public const INVITED = 1;
|
||||
public const JOINED = 2;
|
||||
/** @deprecated */
|
||||
const MULTIPLE = 3;
|
||||
const REMOVED = 4;
|
||||
const LEFT = 5;
|
||||
const LEVEL = 6;
|
||||
const NAME = 7;
|
||||
const REQUESTED = 8;
|
||||
public const MULTIPLE = 3;
|
||||
public const REMOVED = 4;
|
||||
public const LEFT = 5;
|
||||
public const LEVEL = 6;
|
||||
public const NAME = 7;
|
||||
public const REQUESTED = 8;
|
||||
|
||||
|
||||
/** @var FederatedEvent */
|
||||
|
@ -89,6 +85,4 @@ class CircleGenericEvent extends Event {
|
|||
public function getCircle(): Circle {
|
||||
return $this->circle;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,10 +31,8 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Events;
|
||||
|
||||
|
||||
use OCA\Circles\Model\Federated\FederatedEvent;
|
||||
|
||||
|
||||
/**
|
||||
* Class CircleMemberAddedEvent
|
||||
*
|
||||
|
@ -82,6 +80,4 @@ class CircleMemberAddedEvent extends CircleResultGenericEvent {
|
|||
public function getType(): int {
|
||||
return $this->type;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,10 +31,8 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Events;
|
||||
|
||||
|
||||
use OCA\Circles\Model\Federated\FederatedEvent;
|
||||
|
||||
|
||||
/**
|
||||
* Class CircleMemberEditedEvent
|
||||
*
|
||||
|
@ -125,6 +123,4 @@ class CircleMemberEditedEvent extends CircleResultGenericEvent {
|
|||
public function getNewDisplayName(): string {
|
||||
return $this->newDisplayName;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,11 +31,9 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Events;
|
||||
|
||||
|
||||
use OCA\Circles\Model\Federated\FederatedEvent;
|
||||
use OCA\Circles\Model\Member;
|
||||
|
||||
|
||||
/**
|
||||
* Class CircleMemberAddedEvent
|
||||
*
|
||||
|
@ -66,6 +64,4 @@ class CircleMemberGenericEvent extends CircleGenericEvent {
|
|||
public function getMember(): Member {
|
||||
return $this->member;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,10 +31,8 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Events;
|
||||
|
||||
|
||||
use OCA\Circles\Model\Federated\FederatedEvent;
|
||||
|
||||
|
||||
/**
|
||||
* Class CircleMemberRemovedEvent
|
||||
*
|
||||
|
@ -82,6 +80,4 @@ class CircleMemberRemovedEvent extends CircleResultGenericEvent {
|
|||
public function getType(): int {
|
||||
return $this->type;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,10 +31,8 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Events;
|
||||
|
||||
|
||||
use OCA\Circles\Model\Federated\FederatedEvent;
|
||||
|
||||
|
||||
/**
|
||||
* Class CircleMemberRequestedEvent
|
||||
*
|
||||
|
@ -82,6 +80,4 @@ class CircleMemberRequestedEvent extends CircleResultGenericEvent {
|
|||
public function getType(): int {
|
||||
return $this->type;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,14 +31,12 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Events;
|
||||
|
||||
|
||||
use ArtificialOwl\MySmallPhpTools\Model\SimpleDataStore;
|
||||
use OCA\Circles\Model\Circle;
|
||||
use OCA\Circles\Model\Federated\FederatedEvent;
|
||||
use OCA\Circles\Model\Member;
|
||||
use OCP\EventDispatcher\Event;
|
||||
|
||||
|
||||
/**
|
||||
* Class CircleResultGenericEvent
|
||||
*
|
||||
|
@ -116,6 +114,4 @@ class CircleResultGenericEvent extends Event {
|
|||
public function getMember(): ?Member {
|
||||
return $this->member;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,10 +31,8 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Events;
|
||||
|
||||
|
||||
use OCA\Circles\Model\Federated\FederatedEvent;
|
||||
|
||||
|
||||
/**
|
||||
* Class CreatingCircleEvent
|
||||
*
|
||||
|
@ -63,6 +61,4 @@ class CreatingCircleEvent extends CircleGenericEvent {
|
|||
public function __construct(FederatedEvent $federatedEvent) {
|
||||
parent::__construct($federatedEvent);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -31,10 +31,8 @@ declare(strict_types=1);
|
|||
|
||||
namespace OCA\Circles\Events;
|
||||
|
||||
|
||||
use OCA\Circles\Model\Federated\FederatedEvent;
|
||||
|
||||
|
||||
/**
|
||||
* Class DestroyingCircleEvent
|
||||
*
|
||||
|
@ -63,6 +61,4 @@ class DestroyingCircleEvent extends CircleGenericEvent {
|
|||
public function __construct(FederatedEvent $federatedEvent) {
|
||||
parent::__construct($federatedEvent);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue