@@ -28,40 +28,40 @@ |
||
28 | 28 | namespace OCA\Files; |
29 | 29 | |
30 | 30 | class App { |
31 | - /** |
|
32 | - * @var \OCP\INavigationManager |
|
33 | - */ |
|
34 | - private static $navigationManager; |
|
31 | + /** |
|
32 | + * @var \OCP\INavigationManager |
|
33 | + */ |
|
34 | + private static $navigationManager; |
|
35 | 35 | |
36 | - /** |
|
37 | - * Returns the app's navigation manager |
|
38 | - * |
|
39 | - * @return \OCP\INavigationManager |
|
40 | - */ |
|
41 | - public static function getNavigationManager() { |
|
42 | - // TODO: move this into a service in the Application class |
|
43 | - if (self::$navigationManager === null) { |
|
44 | - self::$navigationManager = new \OC\NavigationManager( |
|
45 | - \OC::$server->getAppManager(), |
|
46 | - \OC::$server->getURLGenerator(), |
|
47 | - \OC::$server->getL10NFactory(), |
|
48 | - \OC::$server->getUserSession(), |
|
49 | - \OC::$server->getGroupManager(), |
|
50 | - \OC::$server->getConfig() |
|
51 | - ); |
|
52 | - self::$navigationManager->clear(false); |
|
53 | - } |
|
54 | - return self::$navigationManager; |
|
55 | - } |
|
36 | + /** |
|
37 | + * Returns the app's navigation manager |
|
38 | + * |
|
39 | + * @return \OCP\INavigationManager |
|
40 | + */ |
|
41 | + public static function getNavigationManager() { |
|
42 | + // TODO: move this into a service in the Application class |
|
43 | + if (self::$navigationManager === null) { |
|
44 | + self::$navigationManager = new \OC\NavigationManager( |
|
45 | + \OC::$server->getAppManager(), |
|
46 | + \OC::$server->getURLGenerator(), |
|
47 | + \OC::$server->getL10NFactory(), |
|
48 | + \OC::$server->getUserSession(), |
|
49 | + \OC::$server->getGroupManager(), |
|
50 | + \OC::$server->getConfig() |
|
51 | + ); |
|
52 | + self::$navigationManager->clear(false); |
|
53 | + } |
|
54 | + return self::$navigationManager; |
|
55 | + } |
|
56 | 56 | |
57 | - public static function extendJsConfig($settings) { |
|
58 | - $appConfig = json_decode($settings['array']['oc_appconfig'], true); |
|
57 | + public static function extendJsConfig($settings) { |
|
58 | + $appConfig = json_decode($settings['array']['oc_appconfig'], true); |
|
59 | 59 | |
60 | - $maxChunkSize = (int)\OC::$server->getConfig()->getAppValue('files', 'max_chunk_size', 10 * 1024 * 1024); |
|
61 | - $appConfig['files'] = [ |
|
62 | - 'max_chunk_size' => $maxChunkSize |
|
63 | - ]; |
|
60 | + $maxChunkSize = (int)\OC::$server->getConfig()->getAppValue('files', 'max_chunk_size', 10 * 1024 * 1024); |
|
61 | + $appConfig['files'] = [ |
|
62 | + 'max_chunk_size' => $maxChunkSize |
|
63 | + ]; |
|
64 | 64 | |
65 | - $settings['array']['oc_appconfig'] = json_encode($appConfig); |
|
66 | - } |
|
65 | + $settings['array']['oc_appconfig'] = json_encode($appConfig); |
|
66 | + } |
|
67 | 67 | } |
@@ -36,51 +36,51 @@ |
||
36 | 36 | */ |
37 | 37 | class RSA extends AuthMechanism { |
38 | 38 | |
39 | - /** @var IConfig */ |
|
40 | - private $config; |
|
39 | + /** @var IConfig */ |
|
40 | + private $config; |
|
41 | 41 | |
42 | - public function __construct(IL10N $l, IConfig $config) { |
|
43 | - $this->config = $config; |
|
42 | + public function __construct(IL10N $l, IConfig $config) { |
|
43 | + $this->config = $config; |
|
44 | 44 | |
45 | - $this |
|
46 | - ->setIdentifier('publickey::rsa') |
|
47 | - ->setScheme(self::SCHEME_PUBLICKEY) |
|
48 | - ->setText($l->t('RSA public key')) |
|
49 | - ->addParameters([ |
|
50 | - new DefinitionParameter('user', $l->t('Username')), |
|
51 | - new DefinitionParameter('public_key', $l->t('Public key')), |
|
52 | - (new DefinitionParameter('private_key', 'private_key')) |
|
53 | - ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
54 | - ]) |
|
55 | - ->addCustomJs('public_key') |
|
56 | - ; |
|
57 | - } |
|
45 | + $this |
|
46 | + ->setIdentifier('publickey::rsa') |
|
47 | + ->setScheme(self::SCHEME_PUBLICKEY) |
|
48 | + ->setText($l->t('RSA public key')) |
|
49 | + ->addParameters([ |
|
50 | + new DefinitionParameter('user', $l->t('Username')), |
|
51 | + new DefinitionParameter('public_key', $l->t('Public key')), |
|
52 | + (new DefinitionParameter('private_key', 'private_key')) |
|
53 | + ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
54 | + ]) |
|
55 | + ->addCustomJs('public_key') |
|
56 | + ; |
|
57 | + } |
|
58 | 58 | |
59 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
60 | - $auth = new RSACrypt(); |
|
61 | - $auth->setPassword($this->config->getSystemValue('secret', '')); |
|
62 | - if (!$auth->loadKey($storage->getBackendOption('private_key'))) { |
|
63 | - throw new \RuntimeException('unable to load private key'); |
|
64 | - } |
|
65 | - $storage->setBackendOption('public_key_auth', $auth); |
|
66 | - } |
|
59 | + public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
60 | + $auth = new RSACrypt(); |
|
61 | + $auth->setPassword($this->config->getSystemValue('secret', '')); |
|
62 | + if (!$auth->loadKey($storage->getBackendOption('private_key'))) { |
|
63 | + throw new \RuntimeException('unable to load private key'); |
|
64 | + } |
|
65 | + $storage->setBackendOption('public_key_auth', $auth); |
|
66 | + } |
|
67 | 67 | |
68 | - /** |
|
69 | - * Generate a keypair |
|
70 | - * |
|
71 | - * @param int $keyLenth |
|
72 | - * @return array ['privatekey' => $privateKey, 'publickey' => $publicKey] |
|
73 | - */ |
|
74 | - public function createKey($keyLength) { |
|
75 | - $rsa = new RSACrypt(); |
|
76 | - $rsa->setPublicKeyFormat(RSACrypt::PUBLIC_FORMAT_OPENSSH); |
|
77 | - $rsa->setPassword($this->config->getSystemValue('secret', '')); |
|
68 | + /** |
|
69 | + * Generate a keypair |
|
70 | + * |
|
71 | + * @param int $keyLenth |
|
72 | + * @return array ['privatekey' => $privateKey, 'publickey' => $publicKey] |
|
73 | + */ |
|
74 | + public function createKey($keyLength) { |
|
75 | + $rsa = new RSACrypt(); |
|
76 | + $rsa->setPublicKeyFormat(RSACrypt::PUBLIC_FORMAT_OPENSSH); |
|
77 | + $rsa->setPassword($this->config->getSystemValue('secret', '')); |
|
78 | 78 | |
79 | - if ($keyLength !== 1024 && $keyLength !== 2048 && $keyLength !== 4096) { |
|
80 | - $keyLength = 1024; |
|
81 | - } |
|
79 | + if ($keyLength !== 1024 && $keyLength !== 2048 && $keyLength !== 4096) { |
|
80 | + $keyLength = 1024; |
|
81 | + } |
|
82 | 82 | |
83 | - return $rsa->createKey($keyLength); |
|
84 | - } |
|
83 | + return $rsa->createKey($keyLength); |
|
84 | + } |
|
85 | 85 | |
86 | 86 | } |
@@ -31,40 +31,40 @@ |
||
31 | 31 | |
32 | 32 | class ClearFrontendCaches implements IRepairStep { |
33 | 33 | |
34 | - /** @var ICacheFactory */ |
|
35 | - protected $cacheFactory; |
|
34 | + /** @var ICacheFactory */ |
|
35 | + protected $cacheFactory; |
|
36 | 36 | |
37 | - /** @var SCSSCacher */ |
|
38 | - protected $scssCacher; |
|
37 | + /** @var SCSSCacher */ |
|
38 | + protected $scssCacher; |
|
39 | 39 | |
40 | - /** @var JSCombiner */ |
|
41 | - protected $jsCombiner; |
|
40 | + /** @var JSCombiner */ |
|
41 | + protected $jsCombiner; |
|
42 | 42 | |
43 | - public function __construct(ICacheFactory $cacheFactory, |
|
44 | - SCSSCacher $SCSSCacher, |
|
45 | - JSCombiner $JSCombiner) { |
|
46 | - $this->cacheFactory = $cacheFactory; |
|
47 | - $this->scssCacher = $SCSSCacher; |
|
48 | - $this->jsCombiner = $JSCombiner; |
|
49 | - } |
|
43 | + public function __construct(ICacheFactory $cacheFactory, |
|
44 | + SCSSCacher $SCSSCacher, |
|
45 | + JSCombiner $JSCombiner) { |
|
46 | + $this->cacheFactory = $cacheFactory; |
|
47 | + $this->scssCacher = $SCSSCacher; |
|
48 | + $this->jsCombiner = $JSCombiner; |
|
49 | + } |
|
50 | 50 | |
51 | - public function getName() { |
|
52 | - return 'Clear frontend caches'; |
|
53 | - } |
|
51 | + public function getName() { |
|
52 | + return 'Clear frontend caches'; |
|
53 | + } |
|
54 | 54 | |
55 | - public function run(IOutput $output) { |
|
56 | - try { |
|
57 | - $c = $this->cacheFactory->createDistributed('imagePath'); |
|
58 | - $c->clear(); |
|
59 | - $output->info('Image cache cleared'); |
|
55 | + public function run(IOutput $output) { |
|
56 | + try { |
|
57 | + $c = $this->cacheFactory->createDistributed('imagePath'); |
|
58 | + $c->clear(); |
|
59 | + $output->info('Image cache cleared'); |
|
60 | 60 | |
61 | - $this->scssCacher->resetCache(); |
|
62 | - $output->info('SCSS cache cleared'); |
|
61 | + $this->scssCacher->resetCache(); |
|
62 | + $output->info('SCSS cache cleared'); |
|
63 | 63 | |
64 | - $this->jsCombiner->resetCache(); |
|
65 | - $output->info('JS cache cleared'); |
|
66 | - } catch (\Exception $e) { |
|
67 | - $output->warning('Unable to clear the frontend cache'); |
|
68 | - } |
|
69 | - } |
|
64 | + $this->jsCombiner->resetCache(); |
|
65 | + $output->info('JS cache cleared'); |
|
66 | + } catch (\Exception $e) { |
|
67 | + $output->warning('Unable to clear the frontend cache'); |
|
68 | + } |
|
69 | + } |
|
70 | 70 | } |
@@ -34,35 +34,35 @@ |
||
34 | 34 | * @since 11.0.0 |
35 | 35 | */ |
36 | 36 | interface ISimpleRoot { |
37 | - /** |
|
38 | - * Get the folder with name $name |
|
39 | - * |
|
40 | - * @param string $name |
|
41 | - * @return ISimpleFolder |
|
42 | - * @throws NotFoundException |
|
43 | - * @throws \RuntimeException |
|
44 | - * @since 11.0.0 |
|
45 | - */ |
|
46 | - public function getFolder(string $name): ISimpleFolder; |
|
37 | + /** |
|
38 | + * Get the folder with name $name |
|
39 | + * |
|
40 | + * @param string $name |
|
41 | + * @return ISimpleFolder |
|
42 | + * @throws NotFoundException |
|
43 | + * @throws \RuntimeException |
|
44 | + * @since 11.0.0 |
|
45 | + */ |
|
46 | + public function getFolder(string $name): ISimpleFolder; |
|
47 | 47 | |
48 | - /** |
|
49 | - * Get all the Folders |
|
50 | - * |
|
51 | - * @return ISimpleFolder[] |
|
52 | - * @throws NotFoundException |
|
53 | - * @throws \RuntimeException |
|
54 | - * @since 11.0.0 |
|
55 | - */ |
|
56 | - public function getDirectoryListing(): array; |
|
48 | + /** |
|
49 | + * Get all the Folders |
|
50 | + * |
|
51 | + * @return ISimpleFolder[] |
|
52 | + * @throws NotFoundException |
|
53 | + * @throws \RuntimeException |
|
54 | + * @since 11.0.0 |
|
55 | + */ |
|
56 | + public function getDirectoryListing(): array; |
|
57 | 57 | |
58 | - /** |
|
59 | - * Create a new folder named $name |
|
60 | - * |
|
61 | - * @param string $name |
|
62 | - * @return ISimpleFolder |
|
63 | - * @throws NotPermittedException |
|
64 | - * @throws \RuntimeException |
|
65 | - * @since 11.0.0 |
|
66 | - */ |
|
67 | - public function newFolder(string $name): ISimpleFolder; |
|
58 | + /** |
|
59 | + * Create a new folder named $name |
|
60 | + * |
|
61 | + * @param string $name |
|
62 | + * @return ISimpleFolder |
|
63 | + * @throws NotPermittedException |
|
64 | + * @throws \RuntimeException |
|
65 | + * @since 11.0.0 |
|
66 | + */ |
|
67 | + public function newFolder(string $name): ISimpleFolder; |
|
68 | 68 | } |
@@ -34,101 +34,101 @@ |
||
34 | 34 | use OCP\Share\IShareHelper; |
35 | 35 | |
36 | 36 | class Listener { |
37 | - /** @var IManager */ |
|
38 | - protected $activityManager; |
|
39 | - /** @var IUserSession */ |
|
40 | - protected $session; |
|
41 | - /** @var \OCP\App\IAppManager */ |
|
42 | - protected $appManager; |
|
43 | - /** @var \OCP\Files\Config\IMountProviderCollection */ |
|
44 | - protected $mountCollection; |
|
45 | - /** @var \OCP\Files\IRootFolder */ |
|
46 | - protected $rootFolder; |
|
47 | - /** @var IShareHelper */ |
|
48 | - protected $shareHelper; |
|
37 | + /** @var IManager */ |
|
38 | + protected $activityManager; |
|
39 | + /** @var IUserSession */ |
|
40 | + protected $session; |
|
41 | + /** @var \OCP\App\IAppManager */ |
|
42 | + protected $appManager; |
|
43 | + /** @var \OCP\Files\Config\IMountProviderCollection */ |
|
44 | + protected $mountCollection; |
|
45 | + /** @var \OCP\Files\IRootFolder */ |
|
46 | + protected $rootFolder; |
|
47 | + /** @var IShareHelper */ |
|
48 | + protected $shareHelper; |
|
49 | 49 | |
50 | - /** |
|
51 | - * Listener constructor. |
|
52 | - * |
|
53 | - * @param IManager $activityManager |
|
54 | - * @param IUserSession $session |
|
55 | - * @param IAppManager $appManager |
|
56 | - * @param IMountProviderCollection $mountCollection |
|
57 | - * @param IRootFolder $rootFolder |
|
58 | - * @param IShareHelper $shareHelper |
|
59 | - */ |
|
60 | - public function __construct(IManager $activityManager, |
|
61 | - IUserSession $session, |
|
62 | - IAppManager $appManager, |
|
63 | - IMountProviderCollection $mountCollection, |
|
64 | - IRootFolder $rootFolder, |
|
65 | - IShareHelper $shareHelper) { |
|
66 | - $this->activityManager = $activityManager; |
|
67 | - $this->session = $session; |
|
68 | - $this->appManager = $appManager; |
|
69 | - $this->mountCollection = $mountCollection; |
|
70 | - $this->rootFolder = $rootFolder; |
|
71 | - $this->shareHelper = $shareHelper; |
|
72 | - } |
|
50 | + /** |
|
51 | + * Listener constructor. |
|
52 | + * |
|
53 | + * @param IManager $activityManager |
|
54 | + * @param IUserSession $session |
|
55 | + * @param IAppManager $appManager |
|
56 | + * @param IMountProviderCollection $mountCollection |
|
57 | + * @param IRootFolder $rootFolder |
|
58 | + * @param IShareHelper $shareHelper |
|
59 | + */ |
|
60 | + public function __construct(IManager $activityManager, |
|
61 | + IUserSession $session, |
|
62 | + IAppManager $appManager, |
|
63 | + IMountProviderCollection $mountCollection, |
|
64 | + IRootFolder $rootFolder, |
|
65 | + IShareHelper $shareHelper) { |
|
66 | + $this->activityManager = $activityManager; |
|
67 | + $this->session = $session; |
|
68 | + $this->appManager = $appManager; |
|
69 | + $this->mountCollection = $mountCollection; |
|
70 | + $this->rootFolder = $rootFolder; |
|
71 | + $this->shareHelper = $shareHelper; |
|
72 | + } |
|
73 | 73 | |
74 | - /** |
|
75 | - * @param CommentsEvent $event |
|
76 | - */ |
|
77 | - public function commentEvent(CommentsEvent $event) { |
|
78 | - if ($event->getComment()->getObjectType() !== 'files' |
|
79 | - || $event->getEvent() !== CommentsEvent::EVENT_ADD |
|
80 | - || !$this->appManager->isInstalled('activity')) { |
|
81 | - // Comment not for file, not adding a comment or no activity-app enabled (save the energy) |
|
82 | - return; |
|
83 | - } |
|
74 | + /** |
|
75 | + * @param CommentsEvent $event |
|
76 | + */ |
|
77 | + public function commentEvent(CommentsEvent $event) { |
|
78 | + if ($event->getComment()->getObjectType() !== 'files' |
|
79 | + || $event->getEvent() !== CommentsEvent::EVENT_ADD |
|
80 | + || !$this->appManager->isInstalled('activity')) { |
|
81 | + // Comment not for file, not adding a comment or no activity-app enabled (save the energy) |
|
82 | + return; |
|
83 | + } |
|
84 | 84 | |
85 | - // Get all mount point owners |
|
86 | - $cache = $this->mountCollection->getMountCache(); |
|
87 | - $mounts = $cache->getMountsForFileId((int)$event->getComment()->getObjectId()); |
|
88 | - if (empty($mounts)) { |
|
89 | - return; |
|
90 | - } |
|
85 | + // Get all mount point owners |
|
86 | + $cache = $this->mountCollection->getMountCache(); |
|
87 | + $mounts = $cache->getMountsForFileId((int)$event->getComment()->getObjectId()); |
|
88 | + if (empty($mounts)) { |
|
89 | + return; |
|
90 | + } |
|
91 | 91 | |
92 | - $users = []; |
|
93 | - foreach ($mounts as $mount) { |
|
94 | - $owner = $mount->getUser()->getUID(); |
|
95 | - $ownerFolder = $this->rootFolder->getUserFolder($owner); |
|
96 | - $nodes = $ownerFolder->getById((int)$event->getComment()->getObjectId()); |
|
97 | - if (!empty($nodes)) { |
|
98 | - /** @var Node $node */ |
|
99 | - $node = array_shift($nodes); |
|
100 | - $al = $this->shareHelper->getPathsForAccessList($node); |
|
101 | - $users += $al['users']; |
|
102 | - } |
|
103 | - } |
|
92 | + $users = []; |
|
93 | + foreach ($mounts as $mount) { |
|
94 | + $owner = $mount->getUser()->getUID(); |
|
95 | + $ownerFolder = $this->rootFolder->getUserFolder($owner); |
|
96 | + $nodes = $ownerFolder->getById((int)$event->getComment()->getObjectId()); |
|
97 | + if (!empty($nodes)) { |
|
98 | + /** @var Node $node */ |
|
99 | + $node = array_shift($nodes); |
|
100 | + $al = $this->shareHelper->getPathsForAccessList($node); |
|
101 | + $users += $al['users']; |
|
102 | + } |
|
103 | + } |
|
104 | 104 | |
105 | - $actor = $this->session->getUser(); |
|
106 | - if ($actor instanceof IUser) { |
|
107 | - $actor = $actor->getUID(); |
|
108 | - } else { |
|
109 | - $actor = ''; |
|
110 | - } |
|
105 | + $actor = $this->session->getUser(); |
|
106 | + if ($actor instanceof IUser) { |
|
107 | + $actor = $actor->getUID(); |
|
108 | + } else { |
|
109 | + $actor = ''; |
|
110 | + } |
|
111 | 111 | |
112 | - $activity = $this->activityManager->generateEvent(); |
|
113 | - $activity->setApp('comments') |
|
114 | - ->setType('comments') |
|
115 | - ->setAuthor($actor) |
|
116 | - ->setObject($event->getComment()->getObjectType(), (int) $event->getComment()->getObjectId()) |
|
117 | - ->setMessage('add_comment_message', [ |
|
118 | - 'commentId' => $event->getComment()->getId(), |
|
119 | - ]); |
|
112 | + $activity = $this->activityManager->generateEvent(); |
|
113 | + $activity->setApp('comments') |
|
114 | + ->setType('comments') |
|
115 | + ->setAuthor($actor) |
|
116 | + ->setObject($event->getComment()->getObjectType(), (int) $event->getComment()->getObjectId()) |
|
117 | + ->setMessage('add_comment_message', [ |
|
118 | + 'commentId' => $event->getComment()->getId(), |
|
119 | + ]); |
|
120 | 120 | |
121 | - foreach ($users as $user => $path) { |
|
122 | - // numerical user ids end up as integers from array keys, but string |
|
123 | - // is required |
|
124 | - $activity->setAffectedUser((string)$user); |
|
121 | + foreach ($users as $user => $path) { |
|
122 | + // numerical user ids end up as integers from array keys, but string |
|
123 | + // is required |
|
124 | + $activity->setAffectedUser((string)$user); |
|
125 | 125 | |
126 | - $activity->setSubject('add_comment_subject', [ |
|
127 | - 'actor' => $actor, |
|
128 | - 'fileId' => (int) $event->getComment()->getObjectId(), |
|
129 | - 'filePath' => trim($path, '/'), |
|
130 | - ]); |
|
131 | - $this->activityManager->publish($activity); |
|
132 | - } |
|
133 | - } |
|
126 | + $activity->setSubject('add_comment_subject', [ |
|
127 | + 'actor' => $actor, |
|
128 | + 'fileId' => (int) $event->getComment()->getObjectId(), |
|
129 | + 'filePath' => trim($path, '/'), |
|
130 | + ]); |
|
131 | + $this->activityManager->publish($activity); |
|
132 | + } |
|
133 | + } |
|
134 | 134 | } |
@@ -29,82 +29,82 @@ |
||
29 | 29 | |
30 | 30 | class InfoChecker extends BasicEmitter { |
31 | 31 | |
32 | - /** @var string[] */ |
|
33 | - private $shippedApps; |
|
32 | + /** @var string[] */ |
|
33 | + private $shippedApps; |
|
34 | 34 | |
35 | - /** @var string[] */ |
|
36 | - private $alwaysEnabled; |
|
35 | + /** @var string[] */ |
|
36 | + private $alwaysEnabled; |
|
37 | 37 | |
38 | - /** |
|
39 | - * @param string $appId |
|
40 | - * @return array |
|
41 | - * @throws \RuntimeException |
|
42 | - */ |
|
43 | - public function analyse($appId): array { |
|
44 | - $appPath = \OC_App::getAppPath($appId); |
|
45 | - if ($appPath === false) { |
|
46 | - throw new \RuntimeException("No app with given id <$appId> known."); |
|
47 | - } |
|
38 | + /** |
|
39 | + * @param string $appId |
|
40 | + * @return array |
|
41 | + * @throws \RuntimeException |
|
42 | + */ |
|
43 | + public function analyse($appId): array { |
|
44 | + $appPath = \OC_App::getAppPath($appId); |
|
45 | + if ($appPath === false) { |
|
46 | + throw new \RuntimeException("No app with given id <$appId> known."); |
|
47 | + } |
|
48 | 48 | |
49 | - $xml = new \DOMDocument(); |
|
50 | - $xml->load($appPath . '/appinfo/info.xml'); |
|
49 | + $xml = new \DOMDocument(); |
|
50 | + $xml->load($appPath . '/appinfo/info.xml'); |
|
51 | 51 | |
52 | - $schema = \OC::$SERVERROOT . '/resources/app-info.xsd'; |
|
53 | - try { |
|
54 | - if ($this->isShipped($appId)) { |
|
55 | - // Shipped apps are allowed to have the public and default_enabled tags |
|
56 | - $schema = \OC::$SERVERROOT . '/resources/app-info-shipped.xsd'; |
|
57 | - } |
|
58 | - } catch (\Exception $e) { |
|
59 | - // Assume it is not shipped |
|
60 | - } |
|
52 | + $schema = \OC::$SERVERROOT . '/resources/app-info.xsd'; |
|
53 | + try { |
|
54 | + if ($this->isShipped($appId)) { |
|
55 | + // Shipped apps are allowed to have the public and default_enabled tags |
|
56 | + $schema = \OC::$SERVERROOT . '/resources/app-info-shipped.xsd'; |
|
57 | + } |
|
58 | + } catch (\Exception $e) { |
|
59 | + // Assume it is not shipped |
|
60 | + } |
|
61 | 61 | |
62 | - $errors = []; |
|
63 | - if (!$xml->schemaValidate($schema)) { |
|
64 | - foreach (libxml_get_errors() as $error) { |
|
65 | - $errors[] = [ |
|
66 | - 'type' => 'parseError', |
|
67 | - 'field' => $error->message, |
|
68 | - ]; |
|
69 | - $this->emit('InfoChecker', 'parseError', [$error->message]); |
|
70 | - } |
|
71 | - } |
|
62 | + $errors = []; |
|
63 | + if (!$xml->schemaValidate($schema)) { |
|
64 | + foreach (libxml_get_errors() as $error) { |
|
65 | + $errors[] = [ |
|
66 | + 'type' => 'parseError', |
|
67 | + 'field' => $error->message, |
|
68 | + ]; |
|
69 | + $this->emit('InfoChecker', 'parseError', [$error->message]); |
|
70 | + } |
|
71 | + } |
|
72 | 72 | |
73 | - return $errors; |
|
74 | - } |
|
73 | + return $errors; |
|
74 | + } |
|
75 | 75 | |
76 | - /** |
|
77 | - * This is a copy of \OC\App\AppManager::isShipped(), keep both in sync. |
|
78 | - * This method is copied, so the code checker works even when Nextcloud is |
|
79 | - * not installed yet. The AppManager requires a database connection, which |
|
80 | - * fails in that case. |
|
81 | - * |
|
82 | - * @param string $appId |
|
83 | - * @return bool |
|
84 | - * @throws \Exception |
|
85 | - */ |
|
86 | - protected function isShipped(string $appId): bool { |
|
87 | - $this->loadShippedJson(); |
|
88 | - return \in_array($appId, $this->shippedApps, true); |
|
89 | - } |
|
76 | + /** |
|
77 | + * This is a copy of \OC\App\AppManager::isShipped(), keep both in sync. |
|
78 | + * This method is copied, so the code checker works even when Nextcloud is |
|
79 | + * not installed yet. The AppManager requires a database connection, which |
|
80 | + * fails in that case. |
|
81 | + * |
|
82 | + * @param string $appId |
|
83 | + * @return bool |
|
84 | + * @throws \Exception |
|
85 | + */ |
|
86 | + protected function isShipped(string $appId): bool { |
|
87 | + $this->loadShippedJson(); |
|
88 | + return \in_array($appId, $this->shippedApps, true); |
|
89 | + } |
|
90 | 90 | |
91 | - /** |
|
92 | - * This is a copy of \OC\App\AppManager::loadShippedJson(), keep both in sync |
|
93 | - * This method is copied, so the code checker works even when Nextcloud is |
|
94 | - * not installed yet. The AppManager requires a database connection, which |
|
95 | - * fails in that case. |
|
96 | - * |
|
97 | - * @throws \Exception |
|
98 | - */ |
|
99 | - protected function loadShippedJson() { |
|
100 | - if ($this->shippedApps === null) { |
|
101 | - $shippedJson = \OC::$SERVERROOT . '/core/shipped.json'; |
|
102 | - if (!file_exists($shippedJson)) { |
|
103 | - throw new \Exception("File not found: $shippedJson"); |
|
104 | - } |
|
105 | - $content = json_decode(file_get_contents($shippedJson), true); |
|
106 | - $this->shippedApps = $content['shippedApps']; |
|
107 | - $this->alwaysEnabled = $content['alwaysEnabled']; |
|
108 | - } |
|
109 | - } |
|
91 | + /** |
|
92 | + * This is a copy of \OC\App\AppManager::loadShippedJson(), keep both in sync |
|
93 | + * This method is copied, so the code checker works even when Nextcloud is |
|
94 | + * not installed yet. The AppManager requires a database connection, which |
|
95 | + * fails in that case. |
|
96 | + * |
|
97 | + * @throws \Exception |
|
98 | + */ |
|
99 | + protected function loadShippedJson() { |
|
100 | + if ($this->shippedApps === null) { |
|
101 | + $shippedJson = \OC::$SERVERROOT . '/core/shipped.json'; |
|
102 | + if (!file_exists($shippedJson)) { |
|
103 | + throw new \Exception("File not found: $shippedJson"); |
|
104 | + } |
|
105 | + $content = json_decode(file_get_contents($shippedJson), true); |
|
106 | + $this->shippedApps = $content['shippedApps']; |
|
107 | + $this->alwaysEnabled = $content['alwaysEnabled']; |
|
108 | + } |
|
109 | + } |
|
110 | 110 | } |
@@ -30,21 +30,21 @@ |
||
30 | 30 | * @package OC\IntegrityCheck\Helpers |
31 | 31 | */ |
32 | 32 | class EnvironmentHelper { |
33 | - /** |
|
34 | - * Provides \OC::$SERVERROOT |
|
35 | - * |
|
36 | - * @return string |
|
37 | - */ |
|
38 | - public function getServerRoot(): string { |
|
39 | - return rtrim(\OC::$SERVERROOT, '/'); |
|
40 | - } |
|
33 | + /** |
|
34 | + * Provides \OC::$SERVERROOT |
|
35 | + * |
|
36 | + * @return string |
|
37 | + */ |
|
38 | + public function getServerRoot(): string { |
|
39 | + return rtrim(\OC::$SERVERROOT, '/'); |
|
40 | + } |
|
41 | 41 | |
42 | - /** |
|
43 | - * Provides \OC_Util::getChannel() |
|
44 | - * |
|
45 | - * @return string |
|
46 | - */ |
|
47 | - public function getChannel(): string { |
|
48 | - return \OC_Util::getChannel(); |
|
49 | - } |
|
42 | + /** |
|
43 | + * Provides \OC_Util::getChannel() |
|
44 | + * |
|
45 | + * @return string |
|
46 | + */ |
|
47 | + public function getChannel(): string { |
|
48 | + return \OC_Util::getChannel(); |
|
49 | + } |
|
50 | 50 | } |
@@ -31,102 +31,102 @@ |
||
31 | 31 | */ |
32 | 32 | interface ISystemTagObjectMapper { |
33 | 33 | |
34 | - /** |
|
35 | - * Get a list of tag ids for the given object ids. |
|
36 | - * |
|
37 | - * This returns an array that maps object id to tag ids |
|
38 | - * [ |
|
39 | - * 1 => array('id1', 'id2'), |
|
40 | - * 2 => array('id3', 'id2'), |
|
41 | - * 3 => array('id5'), |
|
42 | - * 4 => array() |
|
43 | - * ] |
|
44 | - * |
|
45 | - * Untagged objects will have an empty array associated. |
|
46 | - * |
|
47 | - * @param string|array $objIds object ids |
|
48 | - * @param string $objectType object type |
|
49 | - * |
|
50 | - * @return array with object id as key and an array |
|
51 | - * of tag ids as value |
|
52 | - * |
|
53 | - * @since 9.0.0 |
|
54 | - */ |
|
55 | - public function getTagIdsForObjects($objIds, string $objectType): array; |
|
34 | + /** |
|
35 | + * Get a list of tag ids for the given object ids. |
|
36 | + * |
|
37 | + * This returns an array that maps object id to tag ids |
|
38 | + * [ |
|
39 | + * 1 => array('id1', 'id2'), |
|
40 | + * 2 => array('id3', 'id2'), |
|
41 | + * 3 => array('id5'), |
|
42 | + * 4 => array() |
|
43 | + * ] |
|
44 | + * |
|
45 | + * Untagged objects will have an empty array associated. |
|
46 | + * |
|
47 | + * @param string|array $objIds object ids |
|
48 | + * @param string $objectType object type |
|
49 | + * |
|
50 | + * @return array with object id as key and an array |
|
51 | + * of tag ids as value |
|
52 | + * |
|
53 | + * @since 9.0.0 |
|
54 | + */ |
|
55 | + public function getTagIdsForObjects($objIds, string $objectType): array; |
|
56 | 56 | |
57 | - /** |
|
58 | - * Get a list of objects tagged with $tagIds. |
|
59 | - * |
|
60 | - * @param string|array $tagIds Tag id or array of tag ids. |
|
61 | - * @param string $objectType object type |
|
62 | - * @param int $limit Count of object ids you want to get |
|
63 | - * @param string $offset The last object id you already received |
|
64 | - * |
|
65 | - * @return string[] array of object ids or empty array if none found |
|
66 | - * |
|
67 | - * @throws TagNotFoundException if at least one of the |
|
68 | - * given tags does not exist |
|
69 | - * @throws \InvalidArgumentException When a limit is specified together with |
|
70 | - * multiple tag ids |
|
71 | - * |
|
72 | - * @since 9.0.0 |
|
73 | - */ |
|
74 | - public function getObjectIdsForTags($tagIds, string $objectType, int $limit = 0, string $offset = ''): array; |
|
57 | + /** |
|
58 | + * Get a list of objects tagged with $tagIds. |
|
59 | + * |
|
60 | + * @param string|array $tagIds Tag id or array of tag ids. |
|
61 | + * @param string $objectType object type |
|
62 | + * @param int $limit Count of object ids you want to get |
|
63 | + * @param string $offset The last object id you already received |
|
64 | + * |
|
65 | + * @return string[] array of object ids or empty array if none found |
|
66 | + * |
|
67 | + * @throws TagNotFoundException if at least one of the |
|
68 | + * given tags does not exist |
|
69 | + * @throws \InvalidArgumentException When a limit is specified together with |
|
70 | + * multiple tag ids |
|
71 | + * |
|
72 | + * @since 9.0.0 |
|
73 | + */ |
|
74 | + public function getObjectIdsForTags($tagIds, string $objectType, int $limit = 0, string $offset = ''): array; |
|
75 | 75 | |
76 | - /** |
|
77 | - * Assign the given tags to the given object. |
|
78 | - * |
|
79 | - * If at least one of the given tag ids doesn't exist, none of the tags |
|
80 | - * will be assigned. |
|
81 | - * |
|
82 | - * If the relationship already existed, fail silently. |
|
83 | - * |
|
84 | - * @param string $objId object id |
|
85 | - * @param string $objectType object type |
|
86 | - * @param string|array $tagIds tag id or array of tag ids to assign |
|
87 | - * |
|
88 | - * @throws TagNotFoundException if at least one of the |
|
89 | - * given tags does not exist |
|
90 | - * |
|
91 | - * @since 9.0.0 |
|
92 | - */ |
|
93 | - public function assignTags(string $objId, string $objectType, $tagIds); |
|
76 | + /** |
|
77 | + * Assign the given tags to the given object. |
|
78 | + * |
|
79 | + * If at least one of the given tag ids doesn't exist, none of the tags |
|
80 | + * will be assigned. |
|
81 | + * |
|
82 | + * If the relationship already existed, fail silently. |
|
83 | + * |
|
84 | + * @param string $objId object id |
|
85 | + * @param string $objectType object type |
|
86 | + * @param string|array $tagIds tag id or array of tag ids to assign |
|
87 | + * |
|
88 | + * @throws TagNotFoundException if at least one of the |
|
89 | + * given tags does not exist |
|
90 | + * |
|
91 | + * @since 9.0.0 |
|
92 | + */ |
|
93 | + public function assignTags(string $objId, string $objectType, $tagIds); |
|
94 | 94 | |
95 | - /** |
|
96 | - * Unassign the given tags from the given object. |
|
97 | - * |
|
98 | - * If at least one of the given tag ids doesn't exist, none of the tags |
|
99 | - * will be unassigned. |
|
100 | - * |
|
101 | - * If the relationship did not exist in the first place, fail silently. |
|
102 | - * |
|
103 | - * @param string $objId object id |
|
104 | - * @param string $objectType object type |
|
105 | - * @param string|array $tagIds tag id or array of tag ids to unassign |
|
106 | - * |
|
107 | - * @throws TagNotFoundException if at least one of the |
|
108 | - * given tags does not exist |
|
109 | - * |
|
110 | - * @since 9.0.0 |
|
111 | - */ |
|
112 | - public function unassignTags(string $objId, string $objectType, $tagIds); |
|
95 | + /** |
|
96 | + * Unassign the given tags from the given object. |
|
97 | + * |
|
98 | + * If at least one of the given tag ids doesn't exist, none of the tags |
|
99 | + * will be unassigned. |
|
100 | + * |
|
101 | + * If the relationship did not exist in the first place, fail silently. |
|
102 | + * |
|
103 | + * @param string $objId object id |
|
104 | + * @param string $objectType object type |
|
105 | + * @param string|array $tagIds tag id or array of tag ids to unassign |
|
106 | + * |
|
107 | + * @throws TagNotFoundException if at least one of the |
|
108 | + * given tags does not exist |
|
109 | + * |
|
110 | + * @since 9.0.0 |
|
111 | + */ |
|
112 | + public function unassignTags(string $objId, string $objectType, $tagIds); |
|
113 | 113 | |
114 | - /** |
|
115 | - * Checks whether the given objects have the given tag. |
|
116 | - * |
|
117 | - * @param string|array $objIds object ids |
|
118 | - * @param string $objectType object type |
|
119 | - * @param string $tagId tag id to check |
|
120 | - * @param bool $all true to check that ALL objects have the tag assigned, |
|
121 | - * false to check that at least ONE object has the tag. |
|
122 | - * |
|
123 | - * @return bool true if the condition set by $all is matched, false |
|
124 | - * otherwise |
|
125 | - * |
|
126 | - * @throws TagNotFoundException if the tag does not exist |
|
127 | - * |
|
128 | - * @since 9.0.0 |
|
129 | - */ |
|
130 | - public function haveTag($objIds, string $objectType, string $tagId, bool $all = true): bool; |
|
114 | + /** |
|
115 | + * Checks whether the given objects have the given tag. |
|
116 | + * |
|
117 | + * @param string|array $objIds object ids |
|
118 | + * @param string $objectType object type |
|
119 | + * @param string $tagId tag id to check |
|
120 | + * @param bool $all true to check that ALL objects have the tag assigned, |
|
121 | + * false to check that at least ONE object has the tag. |
|
122 | + * |
|
123 | + * @return bool true if the condition set by $all is matched, false |
|
124 | + * otherwise |
|
125 | + * |
|
126 | + * @throws TagNotFoundException if the tag does not exist |
|
127 | + * |
|
128 | + * @since 9.0.0 |
|
129 | + */ |
|
130 | + public function haveTag($objIds, string $objectType, string $tagId, bool $all = true): bool; |
|
131 | 131 | |
132 | 132 | } |
@@ -34,28 +34,28 @@ |
||
34 | 34 | */ |
35 | 35 | interface ISystemTagManagerFactory { |
36 | 36 | |
37 | - /** |
|
38 | - * Constructor for the system tag manager factory |
|
39 | - * |
|
40 | - * @param IServerContainer $serverContainer server container |
|
41 | - * @since 9.0.0 |
|
42 | - */ |
|
43 | - public function __construct(IServerContainer $serverContainer); |
|
37 | + /** |
|
38 | + * Constructor for the system tag manager factory |
|
39 | + * |
|
40 | + * @param IServerContainer $serverContainer server container |
|
41 | + * @since 9.0.0 |
|
42 | + */ |
|
43 | + public function __construct(IServerContainer $serverContainer); |
|
44 | 44 | |
45 | - /** |
|
46 | - * creates and returns an instance of the system tag manager |
|
47 | - * |
|
48 | - * @return ISystemTagManager |
|
49 | - * @since 9.0.0 |
|
50 | - */ |
|
51 | - public function getManager(): ISystemTagManager; |
|
45 | + /** |
|
46 | + * creates and returns an instance of the system tag manager |
|
47 | + * |
|
48 | + * @return ISystemTagManager |
|
49 | + * @since 9.0.0 |
|
50 | + */ |
|
51 | + public function getManager(): ISystemTagManager; |
|
52 | 52 | |
53 | - /** |
|
54 | - * creates and returns an instance of the system tag object |
|
55 | - * mapper |
|
56 | - * |
|
57 | - * @return ISystemTagObjectMapper |
|
58 | - * @since 9.0.0 |
|
59 | - */ |
|
60 | - public function getObjectMapper(): ISystemTagObjectMapper; |
|
53 | + /** |
|
54 | + * creates and returns an instance of the system tag object |
|
55 | + * mapper |
|
56 | + * |
|
57 | + * @return ISystemTagObjectMapper |
|
58 | + * @since 9.0.0 |
|
59 | + */ |
|
60 | + public function getObjectMapper(): ISystemTagObjectMapper; |
|
61 | 61 | } |