Completed
Pull Request — master (#5174)
by Björn
16:36
created
apps/dav/lib/CalDAV/CalendarObject.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -61,19 +61,19 @@
 block discarded – undo
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':
Please login to merge, or discard this patch.
apps/dav/lib/CalDAV/BirthdayService.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 		foreach ($targetPrincipals as $principalUri) {
98 98
 			$calendar = $this->ensureCalendarExists($principalUri);
99 99
 			foreach (['', '-death', '-anniversary'] as $tag) {
100
-				$objectUri = $book['uri'] . '-' . $cardUri . $tag .'.ics';
100
+				$objectUri = $book['uri'].'-'.$cardUri.$tag.'.ics';
101 101
 				$this->calDavBackEnd->deleteCalendarObject($calendar['id'], $objectUri);
102 102
 			}
103 103
 		}
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 			return null;
152 152
 		}
153 153
 		$birthday = $doc->{$dateField};
154
-		if (!(string)$birthday) {
154
+		if (!(string) $birthday) {
155 155
 			return null;
156 156
 		}
157 157
 		// Skip if the BDAY property is not of the right type.
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
 
169 169
 		$unknownYear = false;
170 170
 		if (!$dateParts['year']) {
171
-			$birthday = '1900-' . $dateParts['month'] . '-' . $dateParts['date'];
171
+			$birthday = '1900-'.$dateParts['month'].'-'.$dateParts['date'];
172 172
 
173 173
 			$unknownYear = true;
174 174
 		}
@@ -179,10 +179,10 @@  discard block
 block discarded – undo
179 179
 			return null;
180 180
 		}
181 181
 		if ($unknownYear) {
182
-			$summary = $doc->FN->getValue() . ' ' . $summarySymbol;
182
+			$summary = $doc->FN->getValue().' '.$summarySymbol;
183 183
 		} else {
184
-			$year = (int)$date->format('Y');
185
-			$summary = $doc->FN->getValue() . " ($summarySymbol$year)";
184
+			$year = (int) $date->format('Y');
185
+			$summary = $doc->FN->getValue()." ($summarySymbol$year)";
186 186
 		}
187 187
 		$vCal = new VCalendar();
188 188
 		$vCal->VERSION = '2.0';
@@ -218,9 +218,9 @@  discard block
 block discarded – undo
218 218
 		$principal = 'principals/users/'.$user;
219 219
 		$this->ensureCalendarExists($principal);
220 220
 		$books = $this->cardDavBackEnd->getAddressBooksForUser($principal);
221
-		foreach($books as $book) {
221
+		foreach ($books as $book) {
222 222
 			$cards = $this->cardDavBackEnd->getCards($book['id']);
223
-			foreach($cards as $card) {
223
+			foreach ($cards as $card) {
224 224
 				$this->onCardChanged($book['id'], $card['uri'], $card['carddata']);
225 225
 			}
226 226
 		}
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
 	 * @param string $type
274 274
 	 */
275 275
 	private function updateCalendar($cardUri, $cardData, $book, $calendarId, $type) {
276
-		$objectUri = $book['uri'] . '-' . $cardUri . $type['postfix'] . '.ics';
276
+		$objectUri = $book['uri'].'-'.$cardUri.$type['postfix'].'.ics';
277 277
 		$calendarData = $this->buildDateFromContact($cardData, $type['field'], $type['symbol']);
278 278
 		$existing = $this->calDavBackEnd->getCalendarObject($calendarId, $objectUri);
279 279
 		if (is_null($calendarData)) {
Please login to merge, or discard this patch.
apps/dav/lib/CalDAV/Schedule/Plugin.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 				}
Please login to merge, or discard this patch.
apps/dav/lib/CalDAV/Schedule/IMipPlugin.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -95,17 +95,17 @@  discard block
 block discarded – undo
95 95
 		$subject = 'SabreDAV iTIP message';
96 96
 		switch (strtoupper($iTipMessage->method)) {
97 97
 			case 'REPLY' :
98
-				$subject = 'Re: ' . $summary;
98
+				$subject = 'Re: '.$summary;
99 99
 				break;
100 100
 			case 'REQUEST' :
101 101
 				$subject = $summary;
102 102
 				break;
103 103
 			case 'CANCEL' :
104
-				$subject = 'Cancelled: ' . $summary;
104
+				$subject = 'Cancelled: '.$summary;
105 105
 				break;
106 106
 		}
107 107
 
108
-		$contentType = 'text/calendar; charset=UTF-8; method=' . $iTipMessage->method;
108
+		$contentType = 'text/calendar; charset=UTF-8; method='.$iTipMessage->method;
109 109
 
110 110
 		$message = $this->mailer->createMessage();
111 111
 
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 				$iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
121 121
 			}
122 122
 			$iTipMessage->scheduleStatus = '1.1; Scheduling message is sent via iMip';
123
-		} catch(\Exception $ex) {
123
+		} catch (\Exception $ex) {
124 124
 			$this->logger->logException($ex, ['app' => 'dav']);
125 125
 			$iTipMessage->scheduleStatus = '5.0; EMail delivery failed';
126 126
 		}
Please login to merge, or discard this patch.
apps/dav/lib/CalDAV/Publishing/PublishPlugin.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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();
Please login to merge, or discard this patch.
apps/dav/lib/CardDAV/AddressBookImpl.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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);
Please login to merge, or discard this patch.
apps/dav/lib/CardDAV/Xml/Groups.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
apps/dav/lib/CardDAV/Plugin.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -45,15 +45,15 @@  discard block
 block discarded – undo
45 45
 
46 46
 		if (strrpos($principal, 'principals/users', -strlen($principal)) !== false) {
47 47
 			list(, $principalId) = URLUtil::splitPath($principal);
48
-			return self::ADDRESSBOOK_ROOT . '/users/' . $principalId;
48
+			return self::ADDRESSBOOK_ROOT.'/users/'.$principalId;
49 49
 		}
50 50
 		if (strrpos($principal, 'principals/groups', -strlen($principal)) !== false) {
51 51
 			list(, $principalId) = URLUtil::splitPath($principal);
52
-			return self::ADDRESSBOOK_ROOT . '/groups/' . $principalId;
52
+			return self::ADDRESSBOOK_ROOT.'/groups/'.$principalId;
53 53
 		}
54 54
 		if (strrpos($principal, 'principals/system', -strlen($principal)) !== false) {
55 55
 			list(, $principalId) = URLUtil::splitPath($principal);
56
-			return self::ADDRESSBOOK_ROOT . '/system/' . $principalId;
56
+			return self::ADDRESSBOOK_ROOT.'/system/'.$principalId;
57 57
 		}
58 58
 
59 59
 		throw new \LogicException('This is not supposed to happen');
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 
73 73
 		if ($node instanceof AddressBook) {
74 74
 
75
-			$propFind->handle($ns . 'groups', function () use ($node) {
75
+			$propFind->handle($ns.'groups', function() use ($node) {
76 76
 				return new Groups($node->getContactsGroups());
77 77
 			});
78 78
 		}
Please login to merge, or discard this patch.
apps/dav/lib/CardDAV/UserAddressBooks.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
 
41 41
 		$addressBooks = $this->carddavBackend->getAddressBooksForUser($this->principalUri);
42 42
 		$objects = [];
43
-		foreach($addressBooks as $addressBook) {
43
+		foreach ($addressBooks as $addressBook) {
44 44
 			$objects[] = new AddressBook($this->carddavBackend, $addressBook, $this->l10n);
45 45
 		}
46 46
 		return $objects;
Please login to merge, or discard this patch.