@@ -88,39 +88,39 @@ discard block |
||
88 | 88 | |
89 | 89 | if ($event->getSubject() === self::SUBJECT_ADD) { |
90 | 90 | $subject = $this->l->t('{actor} created calendar {calendar}'); |
91 | - } else if ($event->getSubject() === self::SUBJECT_ADD . '_self') { |
|
91 | + } else if ($event->getSubject() === self::SUBJECT_ADD.'_self') { |
|
92 | 92 | $subject = $this->l->t('You created calendar {calendar}'); |
93 | 93 | } else if ($event->getSubject() === self::SUBJECT_DELETE) { |
94 | 94 | $subject = $this->l->t('{actor} deleted calendar {calendar}'); |
95 | - } else if ($event->getSubject() === self::SUBJECT_DELETE . '_self') { |
|
95 | + } else if ($event->getSubject() === self::SUBJECT_DELETE.'_self') { |
|
96 | 96 | $subject = $this->l->t('You deleted calendar {calendar}'); |
97 | 97 | } else if ($event->getSubject() === self::SUBJECT_UPDATE) { |
98 | 98 | $subject = $this->l->t('{actor} updated calendar {calendar}'); |
99 | - } else if ($event->getSubject() === self::SUBJECT_UPDATE . '_self') { |
|
99 | + } else if ($event->getSubject() === self::SUBJECT_UPDATE.'_self') { |
|
100 | 100 | $subject = $this->l->t('You updated calendar {calendar}'); |
101 | 101 | |
102 | 102 | } else if ($event->getSubject() === self::SUBJECT_SHARE_USER) { |
103 | 103 | $subject = $this->l->t('{actor} shared calendar {calendar} with you'); |
104 | - } else if ($event->getSubject() === self::SUBJECT_SHARE_USER . '_you') { |
|
104 | + } else if ($event->getSubject() === self::SUBJECT_SHARE_USER.'_you') { |
|
105 | 105 | $subject = $this->l->t('You shared calendar {calendar} with {user}'); |
106 | - } else if ($event->getSubject() === self::SUBJECT_SHARE_USER . '_by') { |
|
106 | + } else if ($event->getSubject() === self::SUBJECT_SHARE_USER.'_by') { |
|
107 | 107 | $subject = $this->l->t('{actor} shared calendar {calendar} with {user}'); |
108 | 108 | } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER) { |
109 | 109 | $subject = $this->l->t('{actor} unshared calendar {calendar} from you'); |
110 | - } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_you') { |
|
110 | + } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_you') { |
|
111 | 111 | $subject = $this->l->t('You unshared calendar {calendar} from {user}'); |
112 | - } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_by') { |
|
112 | + } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_by') { |
|
113 | 113 | $subject = $this->l->t('{actor} unshared calendar {calendar} from {user}'); |
114 | - } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_self') { |
|
114 | + } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_self') { |
|
115 | 115 | $subject = $this->l->t('{actor} unshared calendar {calendar} from themselves'); |
116 | 116 | |
117 | - } else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_you') { |
|
117 | + } else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP.'_you') { |
|
118 | 118 | $subject = $this->l->t('You shared calendar {calendar} with group {group}'); |
119 | - } else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_by') { |
|
119 | + } else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP.'_by') { |
|
120 | 120 | $subject = $this->l->t('{actor} shared calendar {calendar} with group {group}'); |
121 | - } else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_you') { |
|
121 | + } else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP.'_you') { |
|
122 | 122 | $subject = $this->l->t('You unshared calendar {calendar} from group {group}'); |
123 | - } else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') { |
|
123 | + } else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP.'_by') { |
|
124 | 124 | $subject = $this->l->t('{actor} unshared calendar {calendar} from group {group}'); |
125 | 125 | } else { |
126 | 126 | throw new \InvalidArgumentException(); |
@@ -154,39 +154,39 @@ discard block |
||
154 | 154 | |
155 | 155 | switch ($subject) { |
156 | 156 | case self::SUBJECT_ADD: |
157 | - case self::SUBJECT_ADD . '_self': |
|
157 | + case self::SUBJECT_ADD.'_self': |
|
158 | 158 | case self::SUBJECT_DELETE: |
159 | - case self::SUBJECT_DELETE . '_self': |
|
159 | + case self::SUBJECT_DELETE.'_self': |
|
160 | 160 | case self::SUBJECT_UPDATE: |
161 | - case self::SUBJECT_UPDATE . '_self': |
|
161 | + case self::SUBJECT_UPDATE.'_self': |
|
162 | 162 | case self::SUBJECT_SHARE_USER: |
163 | 163 | case self::SUBJECT_UNSHARE_USER: |
164 | - case self::SUBJECT_UNSHARE_USER . '_self': |
|
164 | + case self::SUBJECT_UNSHARE_USER.'_self': |
|
165 | 165 | return [ |
166 | 166 | 'actor' => $this->generateUserParameter($parameters[0]), |
167 | 167 | 'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]), |
168 | 168 | ]; |
169 | - case self::SUBJECT_SHARE_USER . '_you': |
|
170 | - case self::SUBJECT_UNSHARE_USER . '_you': |
|
169 | + case self::SUBJECT_SHARE_USER.'_you': |
|
170 | + case self::SUBJECT_UNSHARE_USER.'_you': |
|
171 | 171 | return [ |
172 | 172 | 'user' => $this->generateUserParameter($parameters[0]), |
173 | 173 | 'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]), |
174 | 174 | ]; |
175 | - case self::SUBJECT_SHARE_USER . '_by': |
|
176 | - case self::SUBJECT_UNSHARE_USER . '_by': |
|
175 | + case self::SUBJECT_SHARE_USER.'_by': |
|
176 | + case self::SUBJECT_UNSHARE_USER.'_by': |
|
177 | 177 | return [ |
178 | 178 | 'user' => $this->generateUserParameter($parameters[0]), |
179 | 179 | 'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]), |
180 | 180 | 'actor' => $this->generateUserParameter($parameters[2]), |
181 | 181 | ]; |
182 | - case self::SUBJECT_SHARE_GROUP . '_you': |
|
183 | - case self::SUBJECT_UNSHARE_GROUP . '_you': |
|
182 | + case self::SUBJECT_SHARE_GROUP.'_you': |
|
183 | + case self::SUBJECT_UNSHARE_GROUP.'_you': |
|
184 | 184 | return [ |
185 | 185 | 'group' => $this->generateGroupParameter($parameters[0]), |
186 | 186 | 'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]), |
187 | 187 | ]; |
188 | - case self::SUBJECT_SHARE_GROUP . '_by': |
|
189 | - case self::SUBJECT_UNSHARE_GROUP . '_by': |
|
188 | + case self::SUBJECT_SHARE_GROUP.'_by': |
|
189 | + case self::SUBJECT_UNSHARE_GROUP.'_by': |
|
190 | 190 | return [ |
191 | 191 | 'group' => $this->generateGroupParameter($parameters[0]), |
192 | 192 | 'calendar' => $this->generateCalendarParameter($event->getObjectId(), $parameters[1]), |
@@ -49,7 +49,7 @@ |
||
49 | 49 | protected function setSubjects(IEvent $event, $subject, array $parameters) { |
50 | 50 | $placeholders = $replacements = []; |
51 | 51 | foreach ($parameters as $placeholder => $parameter) { |
52 | - $placeholders[] = '{' . $placeholder . '}'; |
|
52 | + $placeholders[] = '{'.$placeholder.'}'; |
|
53 | 53 | $replacements[] = $parameter['name']; |
54 | 54 | } |
55 | 55 |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | foreach ($users as $user) { |
134 | 134 | $event->setAffectedUser($user) |
135 | 135 | ->setSubject( |
136 | - $user === $currentUser ? $action . '_self' : $action, |
|
136 | + $user === $currentUser ? $action.'_self' : $action, |
|
137 | 137 | [ |
138 | 138 | $currentUser, |
139 | 139 | $calendarData['{DAV:}displayname'], |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | $event, |
183 | 183 | $calendarData, |
184 | 184 | Calendar::SUBJECT_UNSHARE_USER, |
185 | - Calendar::SUBJECT_DELETE . '_self' |
|
185 | + Calendar::SUBJECT_DELETE.'_self' |
|
186 | 186 | ); |
187 | 187 | |
188 | 188 | if ($owner !== $principal[2]) { |
@@ -192,15 +192,15 @@ discard block |
||
192 | 192 | ]; |
193 | 193 | |
194 | 194 | if ($owner === $event->getAuthor()) { |
195 | - $subject = Calendar::SUBJECT_UNSHARE_USER . '_you'; |
|
195 | + $subject = Calendar::SUBJECT_UNSHARE_USER.'_you'; |
|
196 | 196 | } else if ($principal[2] === $event->getAuthor()) { |
197 | - $subject = Calendar::SUBJECT_UNSHARE_USER . '_self'; |
|
197 | + $subject = Calendar::SUBJECT_UNSHARE_USER.'_self'; |
|
198 | 198 | } else { |
199 | 199 | $event->setAffectedUser($event->getAuthor()) |
200 | - ->setSubject(Calendar::SUBJECT_UNSHARE_USER . '_you', $parameters); |
|
200 | + ->setSubject(Calendar::SUBJECT_UNSHARE_USER.'_you', $parameters); |
|
201 | 201 | $this->activityManager->publish($event); |
202 | 202 | |
203 | - $subject = Calendar::SUBJECT_UNSHARE_USER . '_by'; |
|
203 | + $subject = Calendar::SUBJECT_UNSHARE_USER.'_by'; |
|
204 | 204 | $parameters[] = $event->getAuthor(); |
205 | 205 | } |
206 | 206 | |
@@ -217,13 +217,13 @@ discard block |
||
217 | 217 | ]; |
218 | 218 | |
219 | 219 | if ($owner === $event->getAuthor()) { |
220 | - $subject = Calendar::SUBJECT_UNSHARE_GROUP . '_you'; |
|
220 | + $subject = Calendar::SUBJECT_UNSHARE_GROUP.'_you'; |
|
221 | 221 | } else { |
222 | 222 | $event->setAffectedUser($event->getAuthor()) |
223 | - ->setSubject(Calendar::SUBJECT_UNSHARE_GROUP . '_you', $parameters); |
|
223 | + ->setSubject(Calendar::SUBJECT_UNSHARE_GROUP.'_you', $parameters); |
|
224 | 224 | $this->activityManager->publish($event); |
225 | 225 | |
226 | - $subject = Calendar::SUBJECT_UNSHARE_GROUP . '_by'; |
|
226 | + $subject = Calendar::SUBJECT_UNSHARE_GROUP.'_by'; |
|
227 | 227 | $parameters[] = $event->getAuthor(); |
228 | 228 | } |
229 | 229 | |
@@ -255,13 +255,13 @@ discard block |
||
255 | 255 | ]; |
256 | 256 | |
257 | 257 | if ($owner === $event->getAuthor()) { |
258 | - $subject = Calendar::SUBJECT_SHARE_USER . '_you'; |
|
258 | + $subject = Calendar::SUBJECT_SHARE_USER.'_you'; |
|
259 | 259 | } else { |
260 | 260 | $event->setAffectedUser($event->getAuthor()) |
261 | - ->setSubject(Calendar::SUBJECT_SHARE_USER . '_you', $parameters); |
|
261 | + ->setSubject(Calendar::SUBJECT_SHARE_USER.'_you', $parameters); |
|
262 | 262 | $this->activityManager->publish($event); |
263 | 263 | |
264 | - $subject = Calendar::SUBJECT_SHARE_USER . '_by'; |
|
264 | + $subject = Calendar::SUBJECT_SHARE_USER.'_by'; |
|
265 | 265 | $parameters[] = $event->getAuthor(); |
266 | 266 | } |
267 | 267 | |
@@ -278,13 +278,13 @@ discard block |
||
278 | 278 | ]; |
279 | 279 | |
280 | 280 | if ($owner === $event->getAuthor()) { |
281 | - $subject = Calendar::SUBJECT_SHARE_GROUP . '_you'; |
|
281 | + $subject = Calendar::SUBJECT_SHARE_GROUP.'_you'; |
|
282 | 282 | } else { |
283 | 283 | $event->setAffectedUser($event->getAuthor()) |
284 | - ->setSubject(Calendar::SUBJECT_SHARE_GROUP . '_you', $parameters); |
|
284 | + ->setSubject(Calendar::SUBJECT_SHARE_GROUP.'_you', $parameters); |
|
285 | 285 | $this->activityManager->publish($event); |
286 | 286 | |
287 | - $subject = Calendar::SUBJECT_SHARE_GROUP . '_by'; |
|
287 | + $subject = Calendar::SUBJECT_SHARE_GROUP.'_by'; |
|
288 | 288 | $parameters[] = $event->getAuthor(); |
289 | 289 | } |
290 | 290 | |
@@ -379,7 +379,7 @@ discard block |
||
379 | 379 | } |
380 | 380 | |
381 | 381 | $object = $this->getObjectNameAndType($objectData); |
382 | - $action = $action . '_' . $object['type']; |
|
382 | + $action = $action.'_'.$object['type']; |
|
383 | 383 | |
384 | 384 | if ($object['type'] === 'todo' && strpos($action, Event::SUBJECT_OBJECT_UPDATE) === 0 && $object['status'] === 'COMPLETED') { |
385 | 385 | $action .= '_completed'; |
@@ -399,7 +399,7 @@ discard block |
||
399 | 399 | foreach ($users as $user) { |
400 | 400 | $event->setAffectedUser($user) |
401 | 401 | ->setSubject( |
402 | - $user === $currentUser ? $action . '_self' : $action, |
|
402 | + $user === $currentUser ? $action.'_self' : $action, |
|
403 | 403 | [ |
404 | 404 | $currentUser, |
405 | 405 | $calendarData['{DAV:}displayname'], |
@@ -420,7 +420,7 @@ discard block |
||
420 | 420 | protected function getObjectNameAndType(array $objectData) { |
421 | 421 | $vObject = Reader::read($objectData['calendardata']); |
422 | 422 | $component = $componentType = null; |
423 | - foreach($vObject->getComponents() as $component) { |
|
423 | + foreach ($vObject->getComponents() as $component) { |
|
424 | 424 | if (in_array($component->name, ['VEVENT', 'VTODO'])) { |
425 | 425 | $componentType = $component->name; |
426 | 426 | break; |
@@ -32,7 +32,7 @@ |
||
32 | 32 | |
33 | 33 | if (strrpos($principalUrl, 'principals/users', -strlen($principalUrl)) !== false) { |
34 | 34 | list(, $principalId) = URLUtil::splitPath($principalUrl); |
35 | - return self::CALENDAR_ROOT .'/' . $principalId; |
|
35 | + return self::CALENDAR_ROOT.'/'.$principalId; |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | return; |
@@ -61,19 +61,19 @@ |
||
61 | 61 | |
62 | 62 | /** @var Component $vElement */ |
63 | 63 | $vElement = null; |
64 | - if(isset($vObject->VEVENT)) { |
|
64 | + if (isset($vObject->VEVENT)) { |
|
65 | 65 | $vElement = $vObject->VEVENT; |
66 | 66 | } |
67 | - if(isset($vObject->VJOURNAL)) { |
|
67 | + if (isset($vObject->VJOURNAL)) { |
|
68 | 68 | $vElement = $vObject->VJOURNAL; |
69 | 69 | } |
70 | - if(isset($vObject->VTODO)) { |
|
70 | + if (isset($vObject->VTODO)) { |
|
71 | 71 | $vElement = $vObject->VTODO; |
72 | 72 | } |
73 | - if(!is_null($vElement)) { |
|
73 | + if (!is_null($vElement)) { |
|
74 | 74 | foreach ($vElement->children() as &$property) { |
75 | 75 | /** @var Property $property */ |
76 | - switch($property->name) { |
|
76 | + switch ($property->name) { |
|
77 | 77 | case 'CREATED': |
78 | 78 | case 'DTSTART': |
79 | 79 | case 'RRULE': |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | */ |
71 | 71 | function propFindDefaultCalendarUrl(PropFind $propFind, INode $node) { |
72 | 72 | if ($node instanceof IPrincipal) { |
73 | - $propFind->handle('{' . self::NS_CALDAV . '}schedule-default-calendar-URL', function() use ($node) { |
|
73 | + $propFind->handle('{'.self::NS_CALDAV.'}schedule-default-calendar-URL', function() use ($node) { |
|
74 | 74 | /** @var \OCA\DAV\CalDAV\Plugin $caldavPlugin */ |
75 | 75 | $caldavPlugin = $this->server->getPlugin('caldav'); |
76 | 76 | $principalUrl = $node->getPrincipalUrl(); |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | ]); |
90 | 90 | } |
91 | 91 | |
92 | - $result = $this->server->getPropertiesForPath($calendarHomePath . '/' . CalDavBackend::PERSONAL_CALENDAR_URI, [], 1); |
|
92 | + $result = $this->server->getPropertiesForPath($calendarHomePath.'/'.CalDavBackend::PERSONAL_CALENDAR_URI, [], 1); |
|
93 | 93 | if (empty($result)) { |
94 | 94 | return null; |
95 | 95 | } |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | * |
90 | 90 | * @return string |
91 | 91 | */ |
92 | - public function getPluginName() { |
|
92 | + public function getPluginName() { |
|
93 | 93 | return 'oc-calendar-publishing'; |
94 | 94 | } |
95 | 95 | |
@@ -107,12 +107,12 @@ discard block |
||
107 | 107 | $this->server = $server; |
108 | 108 | |
109 | 109 | $this->server->on('method:POST', [$this, 'httpPost']); |
110 | - $this->server->on('propFind', [$this, 'propFind']); |
|
110 | + $this->server->on('propFind', [$this, 'propFind']); |
|
111 | 111 | } |
112 | 112 | |
113 | 113 | public function propFind(PropFind $propFind, INode $node) { |
114 | 114 | if ($node instanceof Calendar) { |
115 | - $propFind->handle('{'.self::NS_CALENDARSERVER.'}publish-url', function () use ($node) { |
|
115 | + $propFind->handle('{'.self::NS_CALENDARSERVER.'}publish-url', function() use ($node) { |
|
116 | 116 | if ($node->getPublishStatus()) { |
117 | 117 | // We return the publish-url only if the calendar is published. |
118 | 118 | $token = $node->getPublishStatus(); |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | $update = false; |
112 | 112 | if (!isset($properties['URI'])) { // create a new contact |
113 | 113 | $uid = $this->createUid(); |
114 | - $uri = $uid . '.vcf'; |
|
114 | + $uri = $uid.'.vcf'; |
|
115 | 115 | $vCard = $this->createEmptyVCard($uid); |
116 | 116 | } else { // update existing contact |
117 | 117 | $uri = $properties['URI']; |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | $permissions = $this->addressBook->getACL(); |
143 | 143 | $result = 0; |
144 | 144 | foreach ($permissions as $permission) { |
145 | - switch($permission['privilege']) { |
|
145 | + switch ($permission['privilege']) { |
|
146 | 146 | case '{DAV:}read': |
147 | 147 | $result |= Constants::PERMISSION_READ; |
148 | 148 | break; |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | protected function createUid() { |
188 | 188 | do { |
189 | 189 | $uid = $this->getUid(); |
190 | - $contact = $this->backend->getContact($this->getKey(), $uid . '.vcf'); |
|
190 | + $contact = $this->backend->getContact($this->getKey(), $uid.'.vcf'); |
|
191 | 191 | } while (!empty($contact)); |
192 | 192 | |
193 | 193 | return $uid; |
@@ -227,15 +227,15 @@ discard block |
||
227 | 227 | foreach ($vCard->children() as $property) { |
228 | 228 | if ($property->name === 'PHOTO' && $property->getValueType() === 'BINARY') { |
229 | 229 | $url = $this->urlGenerator->getAbsoluteURL( |
230 | - $this->urlGenerator->linkTo('', 'remote.php') . '/dav/'); |
|
230 | + $this->urlGenerator->linkTo('', 'remote.php').'/dav/'); |
|
231 | 231 | $url .= implode('/', [ |
232 | 232 | 'addressbooks', |
233 | 233 | substr($this->addressBookInfo['principaluri'], 11), //cut off 'principals/' |
234 | 234 | $this->addressBookInfo['uri'], |
235 | 235 | $uri |
236 | - ]) . '?photo'; |
|
236 | + ]).'?photo'; |
|
237 | 237 | |
238 | - $result['PHOTO'] = 'VALUE=uri:' . $url; |
|
238 | + $result['PHOTO'] = 'VALUE=uri:'.$url; |
|
239 | 239 | |
240 | 240 | } else if ($property->name === 'X-SOCIALPROFILE') { |
241 | 241 | $type = $this->getTypeFromProperty($property); |
@@ -40,7 +40,7 @@ |
||
40 | 40 | |
41 | 41 | function xmlSerialize(Writer $writer) { |
42 | 42 | foreach ($this->groups as $group) { |
43 | - $writer->writeElement('{' . self::NS_OWNCLOUD . '}group', $group); |
|
43 | + $writer->writeElement('{'.self::NS_OWNCLOUD.'}group', $group); |
|
44 | 44 | } |
45 | 45 | } |
46 | 46 | } |