@@ -6,5 +6,5 @@ |
||
6 | 6 | $baseDir = $vendorDir; |
7 | 7 | |
8 | 8 | return array( |
9 | - 'OCA\\Files_Trashbin\\' => array($baseDir . '/../lib'), |
|
9 | + 'OCA\\Files_Trashbin\\' => array($baseDir.'/../lib'), |
|
10 | 10 | ); |
@@ -6,5 +6,5 @@ |
||
6 | 6 | $baseDir = $vendorDir; |
7 | 7 | |
8 | 8 | return array( |
9 | - 'OCA\\Provisioning_API\\' => array($baseDir . '/../lib'), |
|
9 | + 'OCA\\Provisioning_API\\' => array($baseDir.'/../lib'), |
|
10 | 10 | ); |
@@ -6,5 +6,5 @@ |
||
6 | 6 | $baseDir = $vendorDir; |
7 | 7 | |
8 | 8 | return array( |
9 | - 'OCA\\Testing\\' => array($baseDir . '/../lib'), |
|
9 | + 'OCA\\Testing\\' => array($baseDir.'/../lib'), |
|
10 | 10 | ); |
@@ -6,5 +6,5 @@ |
||
6 | 6 | $baseDir = $vendorDir; |
7 | 7 | |
8 | 8 | return array( |
9 | - 'OCA\\TwoFactorBackupCodes\\' => array($baseDir . '/../lib'), |
|
9 | + 'OCA\\TwoFactorBackupCodes\\' => array($baseDir.'/../lib'), |
|
10 | 10 | ); |
@@ -6,5 +6,5 @@ |
||
6 | 6 | $baseDir = $vendorDir; |
7 | 7 | |
8 | 8 | return array( |
9 | - 'OCA\\ShareByMail\\' => array($baseDir . '/../lib'), |
|
9 | + 'OCA\\ShareByMail\\' => array($baseDir.'/../lib'), |
|
10 | 10 | ); |
@@ -6,5 +6,5 @@ |
||
6 | 6 | $baseDir = $vendorDir; |
7 | 7 | |
8 | 8 | return array( |
9 | - 'OCA\\UpdateNotification\\' => array($baseDir . '/../lib'), |
|
9 | + 'OCA\\UpdateNotification\\' => array($baseDir.'/../lib'), |
|
10 | 10 | ); |
@@ -6,5 +6,5 @@ |
||
6 | 6 | $baseDir = $vendorDir; |
7 | 7 | |
8 | 8 | return array( |
9 | - 'OCA\\Files_Versions\\' => array($baseDir . '/../lib'), |
|
9 | + 'OCA\\Files_Versions\\' => array($baseDir.'/../lib'), |
|
10 | 10 | ); |
@@ -26,61 +26,61 @@ |
||
26 | 26 | |
27 | 27 | interface ILDAPGroupPlugin { |
28 | 28 | |
29 | - /** |
|
30 | - * Check if plugin implements actions |
|
31 | - * @return int |
|
32 | - * |
|
33 | - * Returns the supported actions as int to be |
|
34 | - * compared with OC_GROUP_BACKEND_CREATE_GROUP etc. |
|
35 | - */ |
|
36 | - public function respondToActions(); |
|
29 | + /** |
|
30 | + * Check if plugin implements actions |
|
31 | + * @return int |
|
32 | + * |
|
33 | + * Returns the supported actions as int to be |
|
34 | + * compared with OC_GROUP_BACKEND_CREATE_GROUP etc. |
|
35 | + */ |
|
36 | + public function respondToActions(); |
|
37 | 37 | |
38 | - /** |
|
39 | - * @param string $gid |
|
40 | - * @return string|null The group DN if group creation was successful. |
|
41 | - */ |
|
42 | - public function createGroup($gid); |
|
38 | + /** |
|
39 | + * @param string $gid |
|
40 | + * @return string|null The group DN if group creation was successful. |
|
41 | + */ |
|
42 | + public function createGroup($gid); |
|
43 | 43 | |
44 | - /** |
|
45 | - * delete a group |
|
46 | - * @param string $gid gid of the group to delete |
|
47 | - * @return bool |
|
48 | - */ |
|
49 | - public function deleteGroup($gid); |
|
44 | + /** |
|
45 | + * delete a group |
|
46 | + * @param string $gid gid of the group to delete |
|
47 | + * @return bool |
|
48 | + */ |
|
49 | + public function deleteGroup($gid); |
|
50 | 50 | |
51 | - /** |
|
52 | - * Add a user to a group |
|
53 | - * @param string $uid Name of the user to add to group |
|
54 | - * @param string $gid Name of the group in which add the user |
|
55 | - * @return bool |
|
56 | - * |
|
57 | - * Adds a user to a group. |
|
58 | - */ |
|
59 | - public function addToGroup($uid, $gid); |
|
51 | + /** |
|
52 | + * Add a user to a group |
|
53 | + * @param string $uid Name of the user to add to group |
|
54 | + * @param string $gid Name of the group in which add the user |
|
55 | + * @return bool |
|
56 | + * |
|
57 | + * Adds a user to a group. |
|
58 | + */ |
|
59 | + public function addToGroup($uid, $gid); |
|
60 | 60 | |
61 | - /** |
|
62 | - * Removes a user from a group |
|
63 | - * @param string $uid Name of the user to remove from group |
|
64 | - * @param string $gid Name of the group from which remove the user |
|
65 | - * @return bool |
|
66 | - * |
|
67 | - * removes the user from a group. |
|
68 | - */ |
|
69 | - public function removeFromGroup($uid, $gid); |
|
61 | + /** |
|
62 | + * Removes a user from a group |
|
63 | + * @param string $uid Name of the user to remove from group |
|
64 | + * @param string $gid Name of the group from which remove the user |
|
65 | + * @return bool |
|
66 | + * |
|
67 | + * removes the user from a group. |
|
68 | + */ |
|
69 | + public function removeFromGroup($uid, $gid); |
|
70 | 70 | |
71 | - /** |
|
72 | - * get the number of all users matching the search string in a group |
|
73 | - * @param string $gid |
|
74 | - * @param string $search |
|
75 | - * @return int|false |
|
76 | - */ |
|
77 | - public function countUsersInGroup($gid, $search = ''); |
|
71 | + /** |
|
72 | + * get the number of all users matching the search string in a group |
|
73 | + * @param string $gid |
|
74 | + * @param string $search |
|
75 | + * @return int|false |
|
76 | + */ |
|
77 | + public function countUsersInGroup($gid, $search = ''); |
|
78 | 78 | |
79 | - /** |
|
80 | - * get an array with group details |
|
81 | - * @param string $gid |
|
82 | - * @return array|false |
|
83 | - */ |
|
84 | - public function getGroupDetails($gid); |
|
79 | + /** |
|
80 | + * get an array with group details |
|
81 | + * @param string $gid |
|
82 | + * @return array|false |
|
83 | + */ |
|
84 | + public function getGroupDetails($gid); |
|
85 | 85 | |
86 | 86 | } |
@@ -122,7 +122,7 @@ |
||
122 | 122 | } |
123 | 123 | |
124 | 124 | $eventName = $addToFavorite ? 'addFavorite' : 'removeFavorite'; |
125 | - $this->dispatcher->dispatch(self::class . '::' . $eventName, new GenericEvent(null, [ |
|
125 | + $this->dispatcher->dispatch(self::class.'::'.$eventName, new GenericEvent(null, [ |
|
126 | 126 | 'userId' => $user->getUID(), |
127 | 127 | 'fileId' => $fileId, |
128 | 128 | 'path' => $path, |
@@ -38,110 +38,110 @@ |
||
38 | 38 | */ |
39 | 39 | class TagService { |
40 | 40 | |
41 | - /** @var IUserSession */ |
|
42 | - private $userSession; |
|
43 | - /** @var IManager */ |
|
44 | - private $activityManager; |
|
45 | - /** @var ITags|null */ |
|
46 | - private $tagger; |
|
47 | - /** @var Folder|null */ |
|
48 | - private $homeFolder; |
|
49 | - /** @var EventDispatcherInterface */ |
|
50 | - private $dispatcher; |
|
41 | + /** @var IUserSession */ |
|
42 | + private $userSession; |
|
43 | + /** @var IManager */ |
|
44 | + private $activityManager; |
|
45 | + /** @var ITags|null */ |
|
46 | + private $tagger; |
|
47 | + /** @var Folder|null */ |
|
48 | + private $homeFolder; |
|
49 | + /** @var EventDispatcherInterface */ |
|
50 | + private $dispatcher; |
|
51 | 51 | |
52 | - public function __construct( |
|
53 | - IUserSession $userSession, |
|
54 | - IManager $activityManager, |
|
55 | - ?ITags $tagger, |
|
56 | - ?Folder $homeFolder, |
|
57 | - EventDispatcherInterface $dispatcher |
|
58 | - ) { |
|
59 | - $this->userSession = $userSession; |
|
60 | - $this->activityManager = $activityManager; |
|
61 | - $this->tagger = $tagger; |
|
62 | - $this->homeFolder = $homeFolder; |
|
63 | - $this->dispatcher = $dispatcher; |
|
64 | - } |
|
52 | + public function __construct( |
|
53 | + IUserSession $userSession, |
|
54 | + IManager $activityManager, |
|
55 | + ?ITags $tagger, |
|
56 | + ?Folder $homeFolder, |
|
57 | + EventDispatcherInterface $dispatcher |
|
58 | + ) { |
|
59 | + $this->userSession = $userSession; |
|
60 | + $this->activityManager = $activityManager; |
|
61 | + $this->tagger = $tagger; |
|
62 | + $this->homeFolder = $homeFolder; |
|
63 | + $this->dispatcher = $dispatcher; |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * Updates the tags of the specified file path. |
|
68 | - * The passed tags are absolute, which means they will |
|
69 | - * replace the actual tag selection. |
|
70 | - * |
|
71 | - * @param string $path path |
|
72 | - * @param array $tags array of tags |
|
73 | - * @return array list of tags |
|
74 | - * @throws \OCP\Files\NotFoundException if the file does not exist |
|
75 | - */ |
|
76 | - public function updateFileTags($path, $tags) { |
|
77 | - if ($this->tagger === null) { |
|
78 | - throw new \RuntimeException('No tagger set'); |
|
79 | - } |
|
80 | - if ($this->homeFolder === null) { |
|
81 | - throw new \RuntimeException('No homeFolder set'); |
|
82 | - } |
|
66 | + /** |
|
67 | + * Updates the tags of the specified file path. |
|
68 | + * The passed tags are absolute, which means they will |
|
69 | + * replace the actual tag selection. |
|
70 | + * |
|
71 | + * @param string $path path |
|
72 | + * @param array $tags array of tags |
|
73 | + * @return array list of tags |
|
74 | + * @throws \OCP\Files\NotFoundException if the file does not exist |
|
75 | + */ |
|
76 | + public function updateFileTags($path, $tags) { |
|
77 | + if ($this->tagger === null) { |
|
78 | + throw new \RuntimeException('No tagger set'); |
|
79 | + } |
|
80 | + if ($this->homeFolder === null) { |
|
81 | + throw new \RuntimeException('No homeFolder set'); |
|
82 | + } |
|
83 | 83 | |
84 | - $fileId = $this->homeFolder->get($path)->getId(); |
|
84 | + $fileId = $this->homeFolder->get($path)->getId(); |
|
85 | 85 | |
86 | - $currentTags = $this->tagger->getTagsForObjects([$fileId]); |
|
86 | + $currentTags = $this->tagger->getTagsForObjects([$fileId]); |
|
87 | 87 | |
88 | - if (!empty($currentTags)) { |
|
89 | - $currentTags = current($currentTags); |
|
90 | - } |
|
88 | + if (!empty($currentTags)) { |
|
89 | + $currentTags = current($currentTags); |
|
90 | + } |
|
91 | 91 | |
92 | - $newTags = array_diff($tags, $currentTags); |
|
93 | - foreach ($newTags as $tag) { |
|
94 | - if ($tag === ITags::TAG_FAVORITE) { |
|
95 | - $this->addActivity(true, $fileId, $path); |
|
96 | - } |
|
97 | - $this->tagger->tagAs($fileId, $tag); |
|
98 | - } |
|
99 | - $deletedTags = array_diff($currentTags, $tags); |
|
100 | - foreach ($deletedTags as $tag) { |
|
101 | - if ($tag === ITags::TAG_FAVORITE) { |
|
102 | - $this->addActivity(false, $fileId, $path); |
|
103 | - } |
|
104 | - $this->tagger->unTag($fileId, $tag); |
|
105 | - } |
|
92 | + $newTags = array_diff($tags, $currentTags); |
|
93 | + foreach ($newTags as $tag) { |
|
94 | + if ($tag === ITags::TAG_FAVORITE) { |
|
95 | + $this->addActivity(true, $fileId, $path); |
|
96 | + } |
|
97 | + $this->tagger->tagAs($fileId, $tag); |
|
98 | + } |
|
99 | + $deletedTags = array_diff($currentTags, $tags); |
|
100 | + foreach ($deletedTags as $tag) { |
|
101 | + if ($tag === ITags::TAG_FAVORITE) { |
|
102 | + $this->addActivity(false, $fileId, $path); |
|
103 | + } |
|
104 | + $this->tagger->unTag($fileId, $tag); |
|
105 | + } |
|
106 | 106 | |
107 | - // TODO: re-read from tagger to make sure the |
|
108 | - // list is up to date, in case of concurrent changes ? |
|
109 | - return $tags; |
|
110 | - } |
|
107 | + // TODO: re-read from tagger to make sure the |
|
108 | + // list is up to date, in case of concurrent changes ? |
|
109 | + return $tags; |
|
110 | + } |
|
111 | 111 | |
112 | - /** |
|
113 | - * @param bool $addToFavorite |
|
114 | - * @param int $fileId |
|
115 | - * @param string $path |
|
116 | - */ |
|
117 | - protected function addActivity($addToFavorite, $fileId, $path) { |
|
118 | - $user = $this->userSession->getUser(); |
|
119 | - if (!$user instanceof IUser) { |
|
120 | - return; |
|
121 | - } |
|
112 | + /** |
|
113 | + * @param bool $addToFavorite |
|
114 | + * @param int $fileId |
|
115 | + * @param string $path |
|
116 | + */ |
|
117 | + protected function addActivity($addToFavorite, $fileId, $path) { |
|
118 | + $user = $this->userSession->getUser(); |
|
119 | + if (!$user instanceof IUser) { |
|
120 | + return; |
|
121 | + } |
|
122 | 122 | |
123 | - $eventName = $addToFavorite ? 'addFavorite' : 'removeFavorite'; |
|
124 | - $this->dispatcher->dispatch(self::class . '::' . $eventName, new GenericEvent(null, [ |
|
125 | - 'userId' => $user->getUID(), |
|
126 | - 'fileId' => $fileId, |
|
127 | - 'path' => $path, |
|
128 | - ])); |
|
123 | + $eventName = $addToFavorite ? 'addFavorite' : 'removeFavorite'; |
|
124 | + $this->dispatcher->dispatch(self::class . '::' . $eventName, new GenericEvent(null, [ |
|
125 | + 'userId' => $user->getUID(), |
|
126 | + 'fileId' => $fileId, |
|
127 | + 'path' => $path, |
|
128 | + ])); |
|
129 | 129 | |
130 | - $event = $this->activityManager->generateEvent(); |
|
131 | - try { |
|
132 | - $event->setApp('files') |
|
133 | - ->setObject('files', $fileId, $path) |
|
134 | - ->setType('favorite') |
|
135 | - ->setAuthor($user->getUID()) |
|
136 | - ->setAffectedUser($user->getUID()) |
|
137 | - ->setTimestamp(time()) |
|
138 | - ->setSubject( |
|
139 | - $addToFavorite ? FavoriteProvider::SUBJECT_ADDED : FavoriteProvider::SUBJECT_REMOVED, |
|
140 | - ['id' => $fileId, 'path' => $path] |
|
141 | - ); |
|
142 | - $this->activityManager->publish($event); |
|
143 | - } catch (\InvalidArgumentException $e) { |
|
144 | - } catch (\BadMethodCallException $e) { |
|
145 | - } |
|
146 | - } |
|
130 | + $event = $this->activityManager->generateEvent(); |
|
131 | + try { |
|
132 | + $event->setApp('files') |
|
133 | + ->setObject('files', $fileId, $path) |
|
134 | + ->setType('favorite') |
|
135 | + ->setAuthor($user->getUID()) |
|
136 | + ->setAffectedUser($user->getUID()) |
|
137 | + ->setTimestamp(time()) |
|
138 | + ->setSubject( |
|
139 | + $addToFavorite ? FavoriteProvider::SUBJECT_ADDED : FavoriteProvider::SUBJECT_REMOVED, |
|
140 | + ['id' => $fileId, 'path' => $path] |
|
141 | + ); |
|
142 | + $this->activityManager->publish($event); |
|
143 | + } catch (\InvalidArgumentException $e) { |
|
144 | + } catch (\BadMethodCallException $e) { |
|
145 | + } |
|
146 | + } |
|
147 | 147 | } |