@@ -20,10 +20,10 @@ |
||
20 | 20 | */ |
21 | 21 | |
22 | 22 | script('core', [ |
23 | - 'oc-backbone-webdav', |
|
24 | - 'systemtags/systemtags', |
|
25 | - 'systemtags/systemtagmodel', |
|
26 | - 'systemtags/systemtagscollection', |
|
23 | + 'oc-backbone-webdav', |
|
24 | + 'systemtags/systemtags', |
|
25 | + 'systemtags/systemtagmodel', |
|
26 | + 'systemtags/systemtagscollection', |
|
27 | 27 | ]); |
28 | 28 | |
29 | 29 | script('systemtags', 'admin'); |
@@ -18,14 +18,14 @@ |
||
18 | 18 | <tr> |
19 | 19 | <th id='headerName' class="hidden column-name"> |
20 | 20 | <div id="headerName-container"> |
21 | - <a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a> |
|
21 | + <a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a> |
|
22 | 22 | </div> |
23 | 23 | </th> |
24 | 24 | <th id="headerSize" class="hidden column-size"> |
25 | 25 | <a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a> |
26 | 26 | </th> |
27 | 27 | <th id="headerDate" class="hidden column-mtime"> |
28 | - <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a> |
|
28 | + <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a> |
|
29 | 29 | </th> |
30 | 30 | </tr> |
31 | 31 | </thead> |
@@ -32,301 +32,301 @@ |
||
32 | 32 | |
33 | 33 | class Provider implements IProvider { |
34 | 34 | |
35 | - const CREATE_TAG = 'create_tag'; |
|
36 | - const UPDATE_TAG = 'update_tag'; |
|
37 | - const DELETE_TAG = 'delete_tag'; |
|
35 | + const CREATE_TAG = 'create_tag'; |
|
36 | + const UPDATE_TAG = 'update_tag'; |
|
37 | + const DELETE_TAG = 'delete_tag'; |
|
38 | 38 | |
39 | - const ASSIGN_TAG = 'assign_tag'; |
|
40 | - const UNASSIGN_TAG = 'unassign_tag'; |
|
39 | + const ASSIGN_TAG = 'assign_tag'; |
|
40 | + const UNASSIGN_TAG = 'unassign_tag'; |
|
41 | 41 | |
42 | - /** @var IFactory */ |
|
43 | - protected $languageFactory; |
|
42 | + /** @var IFactory */ |
|
43 | + protected $languageFactory; |
|
44 | 44 | |
45 | - /** @var IL10N */ |
|
46 | - protected $l; |
|
45 | + /** @var IL10N */ |
|
46 | + protected $l; |
|
47 | 47 | |
48 | - /** @var IURLGenerator */ |
|
49 | - protected $url; |
|
48 | + /** @var IURLGenerator */ |
|
49 | + protected $url; |
|
50 | 50 | |
51 | - /** @var IManager */ |
|
52 | - protected $activityManager; |
|
51 | + /** @var IManager */ |
|
52 | + protected $activityManager; |
|
53 | 53 | |
54 | - /** @var IUserManager */ |
|
55 | - protected $userManager; |
|
54 | + /** @var IUserManager */ |
|
55 | + protected $userManager; |
|
56 | 56 | |
57 | - /** @var string[] */ |
|
58 | - protected $displayNames = []; |
|
57 | + /** @var string[] */ |
|
58 | + protected $displayNames = []; |
|
59 | 59 | |
60 | - /** |
|
61 | - * @param IFactory $languageFactory |
|
62 | - * @param IURLGenerator $url |
|
63 | - * @param IManager $activityManager |
|
64 | - * @param IUserManager $userManager |
|
65 | - */ |
|
66 | - public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager) { |
|
67 | - $this->languageFactory = $languageFactory; |
|
68 | - $this->url = $url; |
|
69 | - $this->activityManager = $activityManager; |
|
70 | - $this->userManager = $userManager; |
|
71 | - } |
|
60 | + /** |
|
61 | + * @param IFactory $languageFactory |
|
62 | + * @param IURLGenerator $url |
|
63 | + * @param IManager $activityManager |
|
64 | + * @param IUserManager $userManager |
|
65 | + */ |
|
66 | + public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager) { |
|
67 | + $this->languageFactory = $languageFactory; |
|
68 | + $this->url = $url; |
|
69 | + $this->activityManager = $activityManager; |
|
70 | + $this->userManager = $userManager; |
|
71 | + } |
|
72 | 72 | |
73 | - /** |
|
74 | - * @param string $language |
|
75 | - * @param IEvent $event |
|
76 | - * @param IEvent|null $previousEvent |
|
77 | - * @return IEvent |
|
78 | - * @throws \InvalidArgumentException |
|
79 | - * @since 11.0.0 |
|
80 | - */ |
|
81 | - public function parse($language, IEvent $event, IEvent $previousEvent = null) { |
|
82 | - if ($event->getApp() !== 'systemtags') { |
|
83 | - throw new \InvalidArgumentException(); |
|
84 | - } |
|
73 | + /** |
|
74 | + * @param string $language |
|
75 | + * @param IEvent $event |
|
76 | + * @param IEvent|null $previousEvent |
|
77 | + * @return IEvent |
|
78 | + * @throws \InvalidArgumentException |
|
79 | + * @since 11.0.0 |
|
80 | + */ |
|
81 | + public function parse($language, IEvent $event, IEvent $previousEvent = null) { |
|
82 | + if ($event->getApp() !== 'systemtags') { |
|
83 | + throw new \InvalidArgumentException(); |
|
84 | + } |
|
85 | 85 | |
86 | - $this->l = $this->languageFactory->get('systemtags', $language); |
|
86 | + $this->l = $this->languageFactory->get('systemtags', $language); |
|
87 | 87 | |
88 | - if ($this->activityManager->isFormattingFilteredObject()) { |
|
89 | - try { |
|
90 | - return $this->parseShortVersion($event); |
|
91 | - } catch (\InvalidArgumentException $e) { |
|
92 | - // Ignore and simply use the long version... |
|
93 | - } |
|
94 | - } |
|
88 | + if ($this->activityManager->isFormattingFilteredObject()) { |
|
89 | + try { |
|
90 | + return $this->parseShortVersion($event); |
|
91 | + } catch (\InvalidArgumentException $e) { |
|
92 | + // Ignore and simply use the long version... |
|
93 | + } |
|
94 | + } |
|
95 | 95 | |
96 | - return $this->parseLongVersion($event); |
|
97 | - } |
|
96 | + return $this->parseLongVersion($event); |
|
97 | + } |
|
98 | 98 | |
99 | - /** |
|
100 | - * @param IEvent $event |
|
101 | - * @return IEvent |
|
102 | - * @throws \InvalidArgumentException |
|
103 | - * @since 11.0.0 |
|
104 | - */ |
|
105 | - public function parseShortVersion(IEvent $event) { |
|
106 | - $parsedParameters = $this->getParameters($event); |
|
107 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.svg'))); |
|
99 | + /** |
|
100 | + * @param IEvent $event |
|
101 | + * @return IEvent |
|
102 | + * @throws \InvalidArgumentException |
|
103 | + * @since 11.0.0 |
|
104 | + */ |
|
105 | + public function parseShortVersion(IEvent $event) { |
|
106 | + $parsedParameters = $this->getParameters($event); |
|
107 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.svg'))); |
|
108 | 108 | |
109 | - if ($event->getSubject() === self::ASSIGN_TAG) { |
|
110 | - if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) { |
|
111 | - $event->setParsedSubject($this->l->t('Added system tag %1$s', [ |
|
112 | - $this->generatePlainSystemTag($parsedParameters['systemtag']), |
|
113 | - ])) |
|
114 | - ->setRichSubject($this->l->t('Added system tag {systemtag}'), [ |
|
115 | - 'systemtag' => $parsedParameters['systemtag'], |
|
116 | - ]); |
|
117 | - } else { |
|
118 | - $event->setParsedSubject($this->l->t('%1$s added system tag %2$s', [ |
|
119 | - $parsedParameters['actor']['name'], |
|
120 | - $this->generatePlainSystemTag($parsedParameters['systemtag']), |
|
121 | - ])) |
|
122 | - ->setRichSubject($this->l->t('{actor} added system tag {systemtag}'), [ |
|
123 | - 'actor' => $parsedParameters['actor'], |
|
124 | - 'systemtag' => $parsedParameters['systemtag'], |
|
125 | - ]); |
|
126 | - } |
|
127 | - } else if ($event->getSubject() === self::UNASSIGN_TAG) { |
|
128 | - if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) { |
|
129 | - $event->setParsedSubject($this->l->t('Removed system tag %1$s', [ |
|
130 | - $this->generatePlainSystemTag($parsedParameters['systemtag']), |
|
131 | - ])) |
|
132 | - ->setRichSubject($this->l->t('Removed system tag {systemtag}'), [ |
|
133 | - 'systemtag' => $parsedParameters['systemtag'], |
|
134 | - ]); |
|
135 | - } else { |
|
136 | - $event->setParsedSubject($this->l->t('%1$s removed system tag %2$s', [ |
|
137 | - $parsedParameters['actor']['name'], |
|
138 | - $this->generatePlainSystemTag($parsedParameters['systemtag']), |
|
139 | - ])) |
|
140 | - ->setRichSubject($this->l->t('{actor} removed system tag {systemtag}'), [ |
|
141 | - 'actor' => $parsedParameters['actor'], |
|
142 | - 'systemtag' => $parsedParameters['systemtag'], |
|
143 | - ]); |
|
144 | - } |
|
145 | - } else { |
|
146 | - throw new \InvalidArgumentException(); |
|
147 | - } |
|
109 | + if ($event->getSubject() === self::ASSIGN_TAG) { |
|
110 | + if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) { |
|
111 | + $event->setParsedSubject($this->l->t('Added system tag %1$s', [ |
|
112 | + $this->generatePlainSystemTag($parsedParameters['systemtag']), |
|
113 | + ])) |
|
114 | + ->setRichSubject($this->l->t('Added system tag {systemtag}'), [ |
|
115 | + 'systemtag' => $parsedParameters['systemtag'], |
|
116 | + ]); |
|
117 | + } else { |
|
118 | + $event->setParsedSubject($this->l->t('%1$s added system tag %2$s', [ |
|
119 | + $parsedParameters['actor']['name'], |
|
120 | + $this->generatePlainSystemTag($parsedParameters['systemtag']), |
|
121 | + ])) |
|
122 | + ->setRichSubject($this->l->t('{actor} added system tag {systemtag}'), [ |
|
123 | + 'actor' => $parsedParameters['actor'], |
|
124 | + 'systemtag' => $parsedParameters['systemtag'], |
|
125 | + ]); |
|
126 | + } |
|
127 | + } else if ($event->getSubject() === self::UNASSIGN_TAG) { |
|
128 | + if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) { |
|
129 | + $event->setParsedSubject($this->l->t('Removed system tag %1$s', [ |
|
130 | + $this->generatePlainSystemTag($parsedParameters['systemtag']), |
|
131 | + ])) |
|
132 | + ->setRichSubject($this->l->t('Removed system tag {systemtag}'), [ |
|
133 | + 'systemtag' => $parsedParameters['systemtag'], |
|
134 | + ]); |
|
135 | + } else { |
|
136 | + $event->setParsedSubject($this->l->t('%1$s removed system tag %2$s', [ |
|
137 | + $parsedParameters['actor']['name'], |
|
138 | + $this->generatePlainSystemTag($parsedParameters['systemtag']), |
|
139 | + ])) |
|
140 | + ->setRichSubject($this->l->t('{actor} removed system tag {systemtag}'), [ |
|
141 | + 'actor' => $parsedParameters['actor'], |
|
142 | + 'systemtag' => $parsedParameters['systemtag'], |
|
143 | + ]); |
|
144 | + } |
|
145 | + } else { |
|
146 | + throw new \InvalidArgumentException(); |
|
147 | + } |
|
148 | 148 | |
149 | - return $event; |
|
150 | - } |
|
149 | + return $event; |
|
150 | + } |
|
151 | 151 | |
152 | - /** |
|
153 | - * @param IEvent $event |
|
154 | - * @return IEvent |
|
155 | - * @throws \InvalidArgumentException |
|
156 | - * @since 11.0.0 |
|
157 | - */ |
|
158 | - public function parseLongVersion(IEvent $event) { |
|
159 | - $parsedParameters = $this->getParameters($event); |
|
160 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.svg'))); |
|
152 | + /** |
|
153 | + * @param IEvent $event |
|
154 | + * @return IEvent |
|
155 | + * @throws \InvalidArgumentException |
|
156 | + * @since 11.0.0 |
|
157 | + */ |
|
158 | + public function parseLongVersion(IEvent $event) { |
|
159 | + $parsedParameters = $this->getParameters($event); |
|
160 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/tag.svg'))); |
|
161 | 161 | |
162 | - if ($event->getSubject() === self::CREATE_TAG) { |
|
163 | - if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) { |
|
164 | - $event->setParsedSubject($this->l->t('You created system tag %1$s', [ |
|
165 | - $this->generatePlainSystemTag($parsedParameters['systemtag']), |
|
166 | - ])) |
|
167 | - ->setRichSubject($this->l->t('You created system tag {systemtag}'), $parsedParameters); |
|
168 | - } else { |
|
169 | - $event->setParsedSubject($this->l->t('%1$s created system tag %2$s', [ |
|
170 | - $parsedParameters['actor']['name'], |
|
171 | - $this->generatePlainSystemTag($parsedParameters['systemtag']), |
|
172 | - ])) |
|
173 | - ->setRichSubject($this->l->t('{actor} created system tag {systemtag}'), $parsedParameters); |
|
174 | - } |
|
175 | - } else if ($event->getSubject() === self::DELETE_TAG) { |
|
176 | - if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) { |
|
177 | - $event->setParsedSubject($this->l->t('You deleted system tag %1$s', [ |
|
178 | - $this->generatePlainSystemTag($parsedParameters['systemtag']), |
|
179 | - ])) |
|
180 | - ->setRichSubject($this->l->t('You deleted system tag {systemtag}'), $parsedParameters); |
|
181 | - } else { |
|
182 | - $event->setParsedSubject($this->l->t('%1$s deleted system tag %2$s', [ |
|
183 | - $parsedParameters['actor']['name'], |
|
184 | - $this->generatePlainSystemTag($parsedParameters['systemtag']), |
|
185 | - ])) |
|
186 | - ->setRichSubject($this->l->t('{actor} deleted system tag {systemtag}'), $parsedParameters); |
|
187 | - } |
|
188 | - } else if ($event->getSubject() === self::UPDATE_TAG) { |
|
189 | - if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) { |
|
190 | - $event->setParsedSubject($this->l->t('You updated system tag %2$s to %1$s', [ |
|
191 | - $this->generatePlainSystemTag($parsedParameters['newsystemtag']), |
|
192 | - $this->generatePlainSystemTag($parsedParameters['oldsystemtag']), |
|
193 | - ])) |
|
194 | - ->setRichSubject($this->l->t('You updated system tag {oldsystemtag} to {newsystemtag}'), $parsedParameters); |
|
195 | - } else { |
|
196 | - $event->setParsedSubject($this->l->t('%1$s updated system tag %3$s to %2$s', [ |
|
197 | - $parsedParameters['actor']['name'], |
|
198 | - $this->generatePlainSystemTag($parsedParameters['newsystemtag']), |
|
199 | - $this->generatePlainSystemTag($parsedParameters['oldsystemtag']), |
|
200 | - ])) |
|
201 | - ->setRichSubject($this->l->t('{actor} updated system tag {oldsystemtag} to {newsystemtag}'), $parsedParameters); |
|
202 | - } |
|
203 | - } else if ($event->getSubject() === self::ASSIGN_TAG) { |
|
204 | - if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) { |
|
205 | - $event->setParsedSubject($this->l->t('You added system tag %2$s to %1$s', [ |
|
206 | - $parsedParameters['file']['path'], |
|
207 | - $this->generatePlainSystemTag($parsedParameters['systemtag']), |
|
208 | - ])) |
|
209 | - ->setRichSubject($this->l->t('You added system tag {systemtag} to {file}'), $parsedParameters); |
|
210 | - } else { |
|
211 | - $event->setParsedSubject($this->l->t('%1$s added system tag %3$s to %2$s', [ |
|
212 | - $parsedParameters['actor']['name'], |
|
213 | - $parsedParameters['file']['path'], |
|
214 | - $this->generatePlainSystemTag($parsedParameters['systemtag']), |
|
215 | - ])) |
|
216 | - ->setRichSubject($this->l->t('{actor} added system tag {systemtag} to {file}'), $parsedParameters); |
|
217 | - } |
|
218 | - } else if ($event->getSubject() === self::UNASSIGN_TAG) { |
|
219 | - if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) { |
|
220 | - $event->setParsedSubject($this->l->t('You removed system tag %2$s from %1$s', [ |
|
221 | - $parsedParameters['file']['path'], |
|
222 | - $this->generatePlainSystemTag($parsedParameters['systemtag']), |
|
223 | - ])) |
|
224 | - ->setRichSubject($this->l->t('You removed system tag {systemtag} from {file}'), $parsedParameters); |
|
225 | - } else { |
|
226 | - $event->setParsedSubject($this->l->t('%1$s removed system tag %3$s from %2$s', [ |
|
227 | - $parsedParameters['actor']['name'], |
|
228 | - $parsedParameters['file']['path'], |
|
229 | - $this->generatePlainSystemTag($parsedParameters['systemtag']), |
|
230 | - ])) |
|
231 | - ->setRichSubject($this->l->t('{actor} removed system tag {systemtag} from {file}'), $parsedParameters); |
|
232 | - } |
|
233 | - } else { |
|
234 | - throw new \InvalidArgumentException(); |
|
235 | - } |
|
162 | + if ($event->getSubject() === self::CREATE_TAG) { |
|
163 | + if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) { |
|
164 | + $event->setParsedSubject($this->l->t('You created system tag %1$s', [ |
|
165 | + $this->generatePlainSystemTag($parsedParameters['systemtag']), |
|
166 | + ])) |
|
167 | + ->setRichSubject($this->l->t('You created system tag {systemtag}'), $parsedParameters); |
|
168 | + } else { |
|
169 | + $event->setParsedSubject($this->l->t('%1$s created system tag %2$s', [ |
|
170 | + $parsedParameters['actor']['name'], |
|
171 | + $this->generatePlainSystemTag($parsedParameters['systemtag']), |
|
172 | + ])) |
|
173 | + ->setRichSubject($this->l->t('{actor} created system tag {systemtag}'), $parsedParameters); |
|
174 | + } |
|
175 | + } else if ($event->getSubject() === self::DELETE_TAG) { |
|
176 | + if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) { |
|
177 | + $event->setParsedSubject($this->l->t('You deleted system tag %1$s', [ |
|
178 | + $this->generatePlainSystemTag($parsedParameters['systemtag']), |
|
179 | + ])) |
|
180 | + ->setRichSubject($this->l->t('You deleted system tag {systemtag}'), $parsedParameters); |
|
181 | + } else { |
|
182 | + $event->setParsedSubject($this->l->t('%1$s deleted system tag %2$s', [ |
|
183 | + $parsedParameters['actor']['name'], |
|
184 | + $this->generatePlainSystemTag($parsedParameters['systemtag']), |
|
185 | + ])) |
|
186 | + ->setRichSubject($this->l->t('{actor} deleted system tag {systemtag}'), $parsedParameters); |
|
187 | + } |
|
188 | + } else if ($event->getSubject() === self::UPDATE_TAG) { |
|
189 | + if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) { |
|
190 | + $event->setParsedSubject($this->l->t('You updated system tag %2$s to %1$s', [ |
|
191 | + $this->generatePlainSystemTag($parsedParameters['newsystemtag']), |
|
192 | + $this->generatePlainSystemTag($parsedParameters['oldsystemtag']), |
|
193 | + ])) |
|
194 | + ->setRichSubject($this->l->t('You updated system tag {oldsystemtag} to {newsystemtag}'), $parsedParameters); |
|
195 | + } else { |
|
196 | + $event->setParsedSubject($this->l->t('%1$s updated system tag %3$s to %2$s', [ |
|
197 | + $parsedParameters['actor']['name'], |
|
198 | + $this->generatePlainSystemTag($parsedParameters['newsystemtag']), |
|
199 | + $this->generatePlainSystemTag($parsedParameters['oldsystemtag']), |
|
200 | + ])) |
|
201 | + ->setRichSubject($this->l->t('{actor} updated system tag {oldsystemtag} to {newsystemtag}'), $parsedParameters); |
|
202 | + } |
|
203 | + } else if ($event->getSubject() === self::ASSIGN_TAG) { |
|
204 | + if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) { |
|
205 | + $event->setParsedSubject($this->l->t('You added system tag %2$s to %1$s', [ |
|
206 | + $parsedParameters['file']['path'], |
|
207 | + $this->generatePlainSystemTag($parsedParameters['systemtag']), |
|
208 | + ])) |
|
209 | + ->setRichSubject($this->l->t('You added system tag {systemtag} to {file}'), $parsedParameters); |
|
210 | + } else { |
|
211 | + $event->setParsedSubject($this->l->t('%1$s added system tag %3$s to %2$s', [ |
|
212 | + $parsedParameters['actor']['name'], |
|
213 | + $parsedParameters['file']['path'], |
|
214 | + $this->generatePlainSystemTag($parsedParameters['systemtag']), |
|
215 | + ])) |
|
216 | + ->setRichSubject($this->l->t('{actor} added system tag {systemtag} to {file}'), $parsedParameters); |
|
217 | + } |
|
218 | + } else if ($event->getSubject() === self::UNASSIGN_TAG) { |
|
219 | + if ($parsedParameters['actor']['id'] === $this->activityManager->getCurrentUserId()) { |
|
220 | + $event->setParsedSubject($this->l->t('You removed system tag %2$s from %1$s', [ |
|
221 | + $parsedParameters['file']['path'], |
|
222 | + $this->generatePlainSystemTag($parsedParameters['systemtag']), |
|
223 | + ])) |
|
224 | + ->setRichSubject($this->l->t('You removed system tag {systemtag} from {file}'), $parsedParameters); |
|
225 | + } else { |
|
226 | + $event->setParsedSubject($this->l->t('%1$s removed system tag %3$s from %2$s', [ |
|
227 | + $parsedParameters['actor']['name'], |
|
228 | + $parsedParameters['file']['path'], |
|
229 | + $this->generatePlainSystemTag($parsedParameters['systemtag']), |
|
230 | + ])) |
|
231 | + ->setRichSubject($this->l->t('{actor} removed system tag {systemtag} from {file}'), $parsedParameters); |
|
232 | + } |
|
233 | + } else { |
|
234 | + throw new \InvalidArgumentException(); |
|
235 | + } |
|
236 | 236 | |
237 | - return $event; |
|
238 | - } |
|
237 | + return $event; |
|
238 | + } |
|
239 | 239 | |
240 | - protected function getParameters(IEvent $event) { |
|
241 | - $subject = $event->getSubject(); |
|
242 | - $parameters = $event->getSubjectParameters(); |
|
240 | + protected function getParameters(IEvent $event) { |
|
241 | + $subject = $event->getSubject(); |
|
242 | + $parameters = $event->getSubjectParameters(); |
|
243 | 243 | |
244 | - switch ($subject) { |
|
245 | - case self::CREATE_TAG: |
|
246 | - case self::DELETE_TAG: |
|
247 | - return [ |
|
248 | - 'actor' => $this->getUserParameter($parameters[0]), |
|
249 | - 'systemtag' => $this->getSystemTagParameter($parameters[1]), |
|
250 | - ]; |
|
251 | - case self::UPDATE_TAG: |
|
252 | - return [ |
|
253 | - 'actor' => $this->getUserParameter($parameters[0]), |
|
254 | - 'newsystemtag' => $this->getSystemTagParameter($parameters[1]), |
|
255 | - 'oldsystemtag' => $this->getSystemTagParameter($parameters[2]), |
|
256 | - ]; |
|
257 | - case self::ASSIGN_TAG: |
|
258 | - case self::UNASSIGN_TAG: |
|
259 | - return [ |
|
260 | - 'actor' => $this->getUserParameter($parameters[0]), |
|
261 | - 'file' => $this->getFileParameter($event->getObjectId(), $parameters[1]), |
|
262 | - 'systemtag' => $this->getSystemTagParameter($parameters[2]), |
|
263 | - ]; |
|
264 | - } |
|
265 | - return []; |
|
266 | - } |
|
244 | + switch ($subject) { |
|
245 | + case self::CREATE_TAG: |
|
246 | + case self::DELETE_TAG: |
|
247 | + return [ |
|
248 | + 'actor' => $this->getUserParameter($parameters[0]), |
|
249 | + 'systemtag' => $this->getSystemTagParameter($parameters[1]), |
|
250 | + ]; |
|
251 | + case self::UPDATE_TAG: |
|
252 | + return [ |
|
253 | + 'actor' => $this->getUserParameter($parameters[0]), |
|
254 | + 'newsystemtag' => $this->getSystemTagParameter($parameters[1]), |
|
255 | + 'oldsystemtag' => $this->getSystemTagParameter($parameters[2]), |
|
256 | + ]; |
|
257 | + case self::ASSIGN_TAG: |
|
258 | + case self::UNASSIGN_TAG: |
|
259 | + return [ |
|
260 | + 'actor' => $this->getUserParameter($parameters[0]), |
|
261 | + 'file' => $this->getFileParameter($event->getObjectId(), $parameters[1]), |
|
262 | + 'systemtag' => $this->getSystemTagParameter($parameters[2]), |
|
263 | + ]; |
|
264 | + } |
|
265 | + return []; |
|
266 | + } |
|
267 | 267 | |
268 | - protected function getFileParameter($id, $path) { |
|
269 | - return [ |
|
270 | - 'type' => 'file', |
|
271 | - 'id' => $id, |
|
272 | - 'name' => basename($path), |
|
273 | - 'path' => trim($path, '/'), |
|
274 | - ]; |
|
275 | - } |
|
268 | + protected function getFileParameter($id, $path) { |
|
269 | + return [ |
|
270 | + 'type' => 'file', |
|
271 | + 'id' => $id, |
|
272 | + 'name' => basename($path), |
|
273 | + 'path' => trim($path, '/'), |
|
274 | + ]; |
|
275 | + } |
|
276 | 276 | |
277 | - protected function getSystemTagParameter($parameter) { |
|
278 | - $tagData = json_decode($parameter, true); |
|
279 | - if ($tagData === null) { |
|
280 | - list($name, $status) = explode('|||', substr($parameter, 3, -3)); |
|
281 | - $tagData = [ |
|
282 | - 'id' => 0,// No way to recover the ID |
|
283 | - 'name' => $name, |
|
284 | - 'assignable' => $status === 'assignable', |
|
285 | - 'visible' => $status !== 'invisible', |
|
286 | - ]; |
|
287 | - } |
|
277 | + protected function getSystemTagParameter($parameter) { |
|
278 | + $tagData = json_decode($parameter, true); |
|
279 | + if ($tagData === null) { |
|
280 | + list($name, $status) = explode('|||', substr($parameter, 3, -3)); |
|
281 | + $tagData = [ |
|
282 | + 'id' => 0,// No way to recover the ID |
|
283 | + 'name' => $name, |
|
284 | + 'assignable' => $status === 'assignable', |
|
285 | + 'visible' => $status !== 'invisible', |
|
286 | + ]; |
|
287 | + } |
|
288 | 288 | |
289 | - return [ |
|
290 | - 'type' => 'systemtag', |
|
291 | - 'id' => (int) $tagData['id'], |
|
292 | - 'name' => $tagData['name'], |
|
293 | - 'assignable' => $tagData['assignable'] ? '1' : '0', |
|
294 | - 'visibility' => $tagData['visible'] ? '1' : '0', |
|
295 | - ]; |
|
296 | - } |
|
289 | + return [ |
|
290 | + 'type' => 'systemtag', |
|
291 | + 'id' => (int) $tagData['id'], |
|
292 | + 'name' => $tagData['name'], |
|
293 | + 'assignable' => $tagData['assignable'] ? '1' : '0', |
|
294 | + 'visibility' => $tagData['visible'] ? '1' : '0', |
|
295 | + ]; |
|
296 | + } |
|
297 | 297 | |
298 | - protected function getUserParameter($uid) { |
|
299 | - if (!isset($this->displayNames[$uid])) { |
|
300 | - $this->displayNames[$uid] = $this->getDisplayName($uid); |
|
301 | - } |
|
298 | + protected function getUserParameter($uid) { |
|
299 | + if (!isset($this->displayNames[$uid])) { |
|
300 | + $this->displayNames[$uid] = $this->getDisplayName($uid); |
|
301 | + } |
|
302 | 302 | |
303 | - return [ |
|
304 | - 'type' => 'user', |
|
305 | - 'id' => $uid, |
|
306 | - 'name' => $this->displayNames[$uid], |
|
307 | - ]; |
|
308 | - } |
|
303 | + return [ |
|
304 | + 'type' => 'user', |
|
305 | + 'id' => $uid, |
|
306 | + 'name' => $this->displayNames[$uid], |
|
307 | + ]; |
|
308 | + } |
|
309 | 309 | |
310 | - protected function generatePlainSystemTag(array $parameter) { |
|
311 | - if ($parameter['assignable'] === '1') { |
|
312 | - return $parameter['name']; |
|
313 | - } else if ($parameter['visibility'] === '1') { |
|
314 | - return $this->l->t('%s (restricted)', $parameter['name']); |
|
315 | - } else { |
|
316 | - return $this->l->t('%s (invisible)', $parameter['name']); |
|
317 | - } |
|
318 | - } |
|
310 | + protected function generatePlainSystemTag(array $parameter) { |
|
311 | + if ($parameter['assignable'] === '1') { |
|
312 | + return $parameter['name']; |
|
313 | + } else if ($parameter['visibility'] === '1') { |
|
314 | + return $this->l->t('%s (restricted)', $parameter['name']); |
|
315 | + } else { |
|
316 | + return $this->l->t('%s (invisible)', $parameter['name']); |
|
317 | + } |
|
318 | + } |
|
319 | 319 | |
320 | - /** |
|
321 | - * @param string $uid |
|
322 | - * @return string |
|
323 | - */ |
|
324 | - protected function getDisplayName($uid) { |
|
325 | - $user = $this->userManager->get($uid); |
|
326 | - if ($user instanceof IUser) { |
|
327 | - return $user->getDisplayName(); |
|
328 | - } else { |
|
329 | - return $uid; |
|
330 | - } |
|
331 | - } |
|
320 | + /** |
|
321 | + * @param string $uid |
|
322 | + * @return string |
|
323 | + */ |
|
324 | + protected function getDisplayName($uid) { |
|
325 | + $user = $this->userManager->get($uid); |
|
326 | + if ($user instanceof IUser) { |
|
327 | + return $user->getDisplayName(); |
|
328 | + } else { |
|
329 | + return $uid; |
|
330 | + } |
|
331 | + } |
|
332 | 332 | } |
@@ -279,7 +279,7 @@ |
||
279 | 279 | if ($tagData === null) { |
280 | 280 | list($name, $status) = explode('|||', substr($parameter, 3, -3)); |
281 | 281 | $tagData = [ |
282 | - 'id' => 0,// No way to recover the ID |
|
282 | + 'id' => 0, // No way to recover the ID |
|
283 | 283 | 'name' => $name, |
284 | 284 | 'assignable' => $status === 'assignable', |
285 | 285 | 'visible' => $status !== 'invisible', |
@@ -27,72 +27,72 @@ |
||
27 | 27 | |
28 | 28 | class Setting implements ISetting { |
29 | 29 | |
30 | - /** @var IL10N */ |
|
31 | - protected $l; |
|
30 | + /** @var IL10N */ |
|
31 | + protected $l; |
|
32 | 32 | |
33 | - /** |
|
34 | - * @param IL10N $l |
|
35 | - */ |
|
36 | - public function __construct(IL10N $l) { |
|
37 | - $this->l = $l; |
|
38 | - } |
|
33 | + /** |
|
34 | + * @param IL10N $l |
|
35 | + */ |
|
36 | + public function __construct(IL10N $l) { |
|
37 | + $this->l = $l; |
|
38 | + } |
|
39 | 39 | |
40 | - /** |
|
41 | - * @return string Lowercase a-z and underscore only identifier |
|
42 | - * @since 11.0.0 |
|
43 | - */ |
|
44 | - public function getIdentifier() { |
|
45 | - return 'systemtags'; |
|
46 | - } |
|
40 | + /** |
|
41 | + * @return string Lowercase a-z and underscore only identifier |
|
42 | + * @since 11.0.0 |
|
43 | + */ |
|
44 | + public function getIdentifier() { |
|
45 | + return 'systemtags'; |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * @return string A translated string |
|
50 | - * @since 11.0.0 |
|
51 | - */ |
|
52 | - public function getName() { |
|
53 | - return $this->l->t('<strong>System tags</strong> for a file have been modified'); |
|
54 | - } |
|
48 | + /** |
|
49 | + * @return string A translated string |
|
50 | + * @since 11.0.0 |
|
51 | + */ |
|
52 | + public function getName() { |
|
53 | + return $this->l->t('<strong>System tags</strong> for a file have been modified'); |
|
54 | + } |
|
55 | 55 | |
56 | - /** |
|
57 | - * @return int whether the filter should be rather on the top or bottom of |
|
58 | - * the admin section. The filters are arranged in ascending order of the |
|
59 | - * priority values. It is required to return a value between 0 and 100. |
|
60 | - * @since 11.0.0 |
|
61 | - */ |
|
62 | - public function getPriority() { |
|
63 | - return 50; |
|
64 | - } |
|
56 | + /** |
|
57 | + * @return int whether the filter should be rather on the top or bottom of |
|
58 | + * the admin section. The filters are arranged in ascending order of the |
|
59 | + * priority values. It is required to return a value between 0 and 100. |
|
60 | + * @since 11.0.0 |
|
61 | + */ |
|
62 | + public function getPriority() { |
|
63 | + return 50; |
|
64 | + } |
|
65 | 65 | |
66 | - /** |
|
67 | - * @return bool True when the option can be changed for the stream |
|
68 | - * @since 11.0.0 |
|
69 | - */ |
|
70 | - public function canChangeStream() { |
|
71 | - return true; |
|
72 | - } |
|
66 | + /** |
|
67 | + * @return bool True when the option can be changed for the stream |
|
68 | + * @since 11.0.0 |
|
69 | + */ |
|
70 | + public function canChangeStream() { |
|
71 | + return true; |
|
72 | + } |
|
73 | 73 | |
74 | - /** |
|
75 | - * @return bool True when the option can be changed for the stream |
|
76 | - * @since 11.0.0 |
|
77 | - */ |
|
78 | - public function isDefaultEnabledStream() { |
|
79 | - return true; |
|
80 | - } |
|
74 | + /** |
|
75 | + * @return bool True when the option can be changed for the stream |
|
76 | + * @since 11.0.0 |
|
77 | + */ |
|
78 | + public function isDefaultEnabledStream() { |
|
79 | + return true; |
|
80 | + } |
|
81 | 81 | |
82 | - /** |
|
83 | - * @return bool True when the option can be changed for the mail |
|
84 | - * @since 11.0.0 |
|
85 | - */ |
|
86 | - public function canChangeMail() { |
|
87 | - return true; |
|
88 | - } |
|
82 | + /** |
|
83 | + * @return bool True when the option can be changed for the mail |
|
84 | + * @since 11.0.0 |
|
85 | + */ |
|
86 | + public function canChangeMail() { |
|
87 | + return true; |
|
88 | + } |
|
89 | 89 | |
90 | - /** |
|
91 | - * @return bool True when the option can be changed for the stream |
|
92 | - * @since 11.0.0 |
|
93 | - */ |
|
94 | - public function isDefaultEnabledMail() { |
|
95 | - return false; |
|
96 | - } |
|
90 | + /** |
|
91 | + * @return bool True when the option can be changed for the stream |
|
92 | + * @since 11.0.0 |
|
93 | + */ |
|
94 | + public function isDefaultEnabledMail() { |
|
95 | + return false; |
|
96 | + } |
|
97 | 97 | } |
98 | 98 |
@@ -30,30 +30,30 @@ |
||
30 | 30 | |
31 | 31 | class LastUsedController extends Controller { |
32 | 32 | |
33 | - /** @var IConfig */ |
|
34 | - protected $config; |
|
35 | - |
|
36 | - /** @var IUserSession */ |
|
37 | - protected $userSession; |
|
38 | - |
|
39 | - /** |
|
40 | - * @param string $appName |
|
41 | - * @param IRequest $request |
|
42 | - * @param IConfig $config |
|
43 | - * @param IUserSession $userSession |
|
44 | - */ |
|
45 | - public function __construct($appName, IRequest $request, IConfig $config, IUserSession $userSession) { |
|
46 | - parent::__construct($appName, $request); |
|
47 | - $this->config = $config; |
|
48 | - $this->userSession = $userSession; |
|
49 | - } |
|
50 | - |
|
51 | - /** |
|
52 | - * @NoAdminRequired |
|
53 | - */ |
|
54 | - public function getLastUsedTagIds() { |
|
55 | - $lastUsed = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'systemtags', 'last_used', '[]'); |
|
56 | - $tagIds = json_decode($lastUsed, true); |
|
57 | - return new DataResponse(array_map(function($id) { return (string) $id; }, $tagIds)); |
|
58 | - } |
|
33 | + /** @var IConfig */ |
|
34 | + protected $config; |
|
35 | + |
|
36 | + /** @var IUserSession */ |
|
37 | + protected $userSession; |
|
38 | + |
|
39 | + /** |
|
40 | + * @param string $appName |
|
41 | + * @param IRequest $request |
|
42 | + * @param IConfig $config |
|
43 | + * @param IUserSession $userSession |
|
44 | + */ |
|
45 | + public function __construct($appName, IRequest $request, IConfig $config, IUserSession $userSession) { |
|
46 | + parent::__construct($appName, $request); |
|
47 | + $this->config = $config; |
|
48 | + $this->userSession = $userSession; |
|
49 | + } |
|
50 | + |
|
51 | + /** |
|
52 | + * @NoAdminRequired |
|
53 | + */ |
|
54 | + public function getLastUsedTagIds() { |
|
55 | + $lastUsed = $this->config->getUserValue($this->userSession->getUser()->getUID(), 'systemtags', 'last_used', '[]'); |
|
56 | + $tagIds = json_decode($lastUsed, true); |
|
57 | + return new DataResponse(array_map(function($id) { return (string) $id; }, $tagIds)); |
|
58 | + } |
|
59 | 59 | } |
@@ -28,29 +28,29 @@ |
||
28 | 28 | |
29 | 29 | class Admin implements ISettings { |
30 | 30 | |
31 | - /** |
|
32 | - * @return TemplateResponse |
|
33 | - */ |
|
34 | - public function getForm() { |
|
35 | - return new TemplateResponse('systemtags', 'admin', [], ''); |
|
36 | - } |
|
31 | + /** |
|
32 | + * @return TemplateResponse |
|
33 | + */ |
|
34 | + public function getForm() { |
|
35 | + return new TemplateResponse('systemtags', 'admin', [], ''); |
|
36 | + } |
|
37 | 37 | |
38 | - /** |
|
39 | - * @return string the section ID, e.g. 'sharing' |
|
40 | - */ |
|
41 | - public function getSection() { |
|
42 | - return 'workflow'; |
|
43 | - } |
|
38 | + /** |
|
39 | + * @return string the section ID, e.g. 'sharing' |
|
40 | + */ |
|
41 | + public function getSection() { |
|
42 | + return 'workflow'; |
|
43 | + } |
|
44 | 44 | |
45 | - /** |
|
46 | - * @return int whether the form should be rather on the top or bottom of |
|
47 | - * the admin section. The forms are arranged in ascending order of the |
|
48 | - * priority values. It is required to return a value between 0 and 100. |
|
49 | - * |
|
50 | - * E.g.: 70 |
|
51 | - */ |
|
52 | - public function getPriority() { |
|
53 | - return 70; |
|
54 | - } |
|
45 | + /** |
|
46 | + * @return int whether the form should be rather on the top or bottom of |
|
47 | + * the admin section. The forms are arranged in ascending order of the |
|
48 | + * priority values. It is required to return a value between 0 and 100. |
|
49 | + * |
|
50 | + * E.g.: 70 |
|
51 | + */ |
|
52 | + public function getPriority() { |
|
53 | + return 70; |
|
54 | + } |
|
55 | 55 | |
56 | 56 | } |
@@ -22,7 +22,7 @@ |
||
22 | 22 | */ |
23 | 23 | |
24 | 24 | return [ |
25 | - 'routes' => [ |
|
26 | - ['name' => 'LastUsed#getLastUsedTagIds', 'url' => '/lastused', 'verb' => 'GET'], |
|
27 | - ] |
|
25 | + 'routes' => [ |
|
26 | + ['name' => 'LastUsed#getLastUsedTagIds', 'url' => '/lastused', 'verb' => 'GET'], |
|
27 | + ] |
|
28 | 28 | ]; |
@@ -15,14 +15,14 @@ |
||
15 | 15 | <tr> |
16 | 16 | <th id='headerName' class="hidden column-name"> |
17 | 17 | <div id="headerName-container"> |
18 | - <a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a> |
|
18 | + <a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a> |
|
19 | 19 | </div> |
20 | 20 | </th> |
21 | 21 | <th id="headerDate" class="hidden column-mtime"> |
22 | - <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Share time' )); ?></span><span class="sort-indicator"></span></a> |
|
22 | + <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Share time')); ?></span><span class="sort-indicator"></span></a> |
|
23 | 23 | </th> |
24 | 24 | <th class="hidden column-expiration"> |
25 | - <a class="columntitle"><span><?php p($l->t( 'Expiration date' )); ?></span></a> |
|
25 | + <a class="columntitle"><span><?php p($l->t('Expiration date')); ?></span></a> |
|
26 | 26 | </th> |
27 | 27 | </tr> |
28 | 28 | </thead> |
@@ -48,8 +48,8 @@ |
||
48 | 48 | <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div> |
49 | 49 | <div id="header-right"> |
50 | 50 | <?php if (!isset($_['hideFileList']) || (isset($_['hideFileList']) && $_['hideFileList'] === false)) { |
51 | - if ($_['server2serversharing']) { |
|
52 | - ?> |
|
51 | + if ($_['server2serversharing']) { |
|
52 | + ?> |
|
53 | 53 | <span id="save" data-protected="<?php p($_['protected']) ?>" |
54 | 54 | data-owner-display-name="<?php p($_['displayName']) ?>" data-owner="<?php p($_['owner']) ?>" data-name="<?php p($_['filename']) ?>"> |
55 | 55 | <button id="save-button"><?php p($l->t('Add to your Nextcloud')) ?></button> |
@@ -72,17 +72,23 @@ |
||
72 | 72 | <div id="preview"> |
73 | 73 | <?php if (isset($_['folder'])): ?> |
74 | 74 | <?php print_unescaped($_['folder']); ?> |
75 | - <?php else: ?> |
|
75 | + <?php else { |
|
76 | + : ?> |
|
76 | 77 | <?php if ($_['previewEnabled'] && substr($_['mimetype'], 0, strpos($_['mimetype'], '/')) == 'video'): ?> |
77 | 78 | <div id="imgframe"> |
78 | - <video tabindex="0" controls="" preload="none" style="max-width: <?php p($_['previewMaxX']); ?>px; max-height: <?php p($_['previewMaxY']); ?>px"> |
|
79 | + <video tabindex="0" controls="" preload="none" style="max-width: <?php p($_['previewMaxX']); |
|
80 | +} |
|
81 | +?>px; max-height: <?php p($_['previewMaxY']); ?>px"> |
|
79 | 82 | <source src="<?php p($_['downloadURL']); ?>" type="<?php p($_['mimetype']); ?>" /> |
80 | 83 | </video> |
81 | 84 | </div> |
82 | - <?php else: ?> |
|
85 | + <?php else { |
|
86 | + : ?> |
|
83 | 87 | <!-- Preview frame is filled via JS to support SVG images for modern browsers --> |
84 | 88 | <div id="imgframe"></div> |
85 | - <?php endif; ?> |
|
89 | + <?php endif; |
|
90 | +} |
|
91 | +?> |
|
86 | 92 | <div class="directDownload"> |
87 | 93 | <a href="<?php p($_['downloadURL']); ?>" id="downloadFile" class="button"> |
88 | 94 | <span class="icon icon-download"></span> |