Completed
Push — master ( 89fdd0...fb17f1 )
by Morris
28:03 queued 12:49
created
core/Controller/AutoCompleteController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@
 block discarded – undo
73 73
 		unset($results['exact']);
74 74
 		$results = array_merge_recursive($exactMatches, $results);
75 75
 
76
-		if($sorter !== null) {
76
+		if ($sorter !== null) {
77 77
 			$sorters = array_reverse(explode('|', $sorter));
78 78
 			$this->autoCompleteManager->runSorters($sorters, $results, [
79 79
 				'itemType' => $itemType,
Please login to merge, or discard this patch.
apps/files_sharing/lib/Capabilities.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -87,7 +87,7 @@
 block discarded – undo
87 87
 			$res['group'] = [];
88 88
 			$res['group']['enabled'] = $this->config->getAppValue('core', 'shareapi_allow_group_sharing', 'yes') === 'yes';
89 89
 			$res['group']['expire_date']['enabled'] = true;
90
-			$res['default_permissions'] = (int)$this->config->getAppValue('core', 'shareapi_default_permissions', Constants::PERMISSION_ALL);
90
+			$res['default_permissions'] = (int) $this->config->getAppValue('core', 'shareapi_default_permissions', Constants::PERMISSION_ALL);
91 91
 		}
92 92
 
93 93
 		//Federated sharing
Please login to merge, or discard this patch.
settings/templates/settings/admin/sharing.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -27,94 +27,94 @@
 block discarded – undo
27 27
 ?>
28 28
 
29 29
 <div class="section" id="shareAPI">
30
-	<h2><?php p($l->t('Sharing'));?></h2>
30
+	<h2><?php p($l->t('Sharing')); ?></h2>
31 31
 	<a target="_blank" rel="noreferrer noopener" class="icon-info"
32
-	   title="<?php p($l->t('Open documentation'));?>"
32
+	   title="<?php p($l->t('Open documentation')); ?>"
33 33
 	   href="<?php p(link_to_docs('admin-sharing')); ?>"></a>
34
-        <p class="settings-hint"><?php p($l->t('As admin you can fine-tune the sharing behavior. Please see the documentation for more information.'));?></p>
34
+        <p class="settings-hint"><?php p($l->t('As admin you can fine-tune the sharing behavior. Please see the documentation for more information.')); ?></p>
35 35
 	<p id="enable">
36 36
 		<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled" class="checkbox"
37 37
 			   value="1" <?php if ($_['shareAPIEnabled'] === 'yes') print_unescaped('checked="checked"'); ?> />
38
-		<label for="shareAPIEnabled"><?php p($l->t('Allow apps to use the Share API'));?></label><br/>
38
+		<label for="shareAPIEnabled"><?php p($l->t('Allow apps to use the Share API')); ?></label><br/>
39 39
 	</p>
40
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
40
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
41 41
 		<input type="checkbox" name="shareapi_allow_links" id="allowLinks" class="checkbox"
42 42
 			   value="1" <?php if ($_['allowLinks'] === 'yes') print_unescaped('checked="checked"'); ?> />
43
-		<label for="allowLinks"><?php p($l->t('Allow users to share via link'));?></label><br/>
43
+		<label for="allowLinks"><?php p($l->t('Allow users to share via link')); ?></label><br/>
44 44
 	</p>
45 45
 
46 46
 	<p id="publicLinkSettings" class="indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
47 47
 		<input type="checkbox" name="shareapi_allow_public_upload" id="allowPublicUpload" class="checkbox"
48 48
 			   value="1" <?php if ($_['allowPublicUpload'] == 'yes') print_unescaped('checked="checked"'); ?> />
49
-		<label for="allowPublicUpload"><?php p($l->t('Allow public uploads'));?></label><br/>
49
+		<label for="allowPublicUpload"><?php p($l->t('Allow public uploads')); ?></label><br/>
50 50
 		<input type="checkbox" name="shareapi_enable_link_password_by_default" id="enableLinkPasswordByDefault" class="checkbox"
51 51
 			   value="1" <?php if ($_['enableLinkPasswordByDefault'] === 'yes') print_unescaped('checked="checked"'); ?> />
52
-		<label for="enableLinkPasswordByDefault"><?php p($l->t('Always ask for a password'));?></label><br/>
52
+		<label for="enableLinkPasswordByDefault"><?php p($l->t('Always ask for a password')); ?></label><br/>
53 53
 		<input type="checkbox" name="shareapi_enforce_links_password" id="enforceLinkPassword" class="checkbox"
54 54
 			   value="1" <?php if ($_['enforceLinkPassword']) print_unescaped('checked="checked"'); ?> />
55
-		<label for="enforceLinkPassword"><?php p($l->t('Enforce password protection'));?></label><br/>
55
+		<label for="enforceLinkPassword"><?php p($l->t('Enforce password protection')); ?></label><br/>
56 56
 
57 57
 		<input type="checkbox" name="shareapi_default_expire_date" id="shareapiDefaultExpireDate" class="checkbox"
58 58
 			   value="1" <?php if ($_['shareDefaultExpireDateSet'] === 'yes') print_unescaped('checked="checked"'); ?> />
59
-		<label for="shareapiDefaultExpireDate"><?php p($l->t('Set default expiration date'));?></label><br/>
59
+		<label for="shareapiDefaultExpireDate"><?php p($l->t('Set default expiration date')); ?></label><br/>
60 60
 
61 61
 	</p>
62
-	<p id="setDefaultExpireDate" class="double-indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareDefaultExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') p('hidden');?>">
63
-		<?php p($l->t( 'Expire after ' )); ?>
62
+	<p id="setDefaultExpireDate" class="double-indent <?php if ($_['allowLinks'] !== 'yes' || $_['shareDefaultExpireDateSet'] === 'no' || $_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
63
+		<?php p($l->t('Expire after ')); ?>
64 64
 		<input type="text" name='shareapi_expire_after_n_days' id="shareapiExpireAfterNDays" placeholder="<?php p('7')?>"
65 65
 			   value='<?php p($_['shareExpireAfterNDays']) ?>' />
66
-		<?php p($l->t( 'days' )); ?>
66
+		<?php p($l->t('days')); ?>
67 67
 		<input type="checkbox" name="shareapi_enforce_expire_date" id="shareapiEnforceExpireDate" class="checkbox"
68 68
 			   value="1" <?php if ($_['shareEnforceExpireDate'] === 'yes') print_unescaped('checked="checked"'); ?> />
69
-		<label for="shareapiEnforceExpireDate"><?php p($l->t('Enforce expiration date'));?></label><br/>
69
+		<label for="shareapiEnforceExpireDate"><?php p($l->t('Enforce expiration date')); ?></label><br/>
70 70
 	</p>
71
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
71
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
72 72
 		<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing" class="checkbox"
73 73
 			   value="1" <?php if ($_['allowResharing'] === 'yes') print_unescaped('checked="checked"'); ?> />
74
-		<label for="allowResharing"><?php p($l->t('Allow resharing'));?></label><br/>
74
+		<label for="allowResharing"><?php p($l->t('Allow resharing')); ?></label><br/>
75 75
 	</p>
76
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
76
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
77 77
 		<input type="checkbox" name="shareapi_allow_group_sharing" id="allowGroupSharing" class="checkbox"
78 78
 			   value="1" <?php if ($_['allowGroupSharing'] === 'yes') print_unescaped('checked="checked"'); ?> />
79
-		<label for="allowGroupSharing"><?php p($l->t('Allow sharing with groups'));?></label><br />
79
+		<label for="allowGroupSharing"><?php p($l->t('Allow sharing with groups')); ?></label><br />
80 80
 	</p>
81
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
81
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
82 82
 		<input type="checkbox" name="shareapi_only_share_with_group_members" id="onlyShareWithGroupMembers" class="checkbox"
83 83
 			   value="1" <?php if ($_['onlyShareWithGroupMembers']) print_unescaped('checked="checked"'); ?> />
84
-		<label for="onlyShareWithGroupMembers"><?php p($l->t('Restrict users to only share with users in their groups'));?></label><br/>
84
+		<label for="onlyShareWithGroupMembers"><?php p($l->t('Restrict users to only share with users in their groups')); ?></label><br/>
85 85
 	</p>
86
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
86
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
87 87
 		<input type="checkbox" name="shareapi_exclude_groups" id="shareapiExcludeGroups" class="checkbox"
88 88
 			   value="1" <?php if ($_['shareExcludeGroups']) print_unescaped('checked="checked"'); ?> />
89
-		<label for="shareapiExcludeGroups"><?php p($l->t('Exclude groups from sharing'));?></label><br/>
89
+		<label for="shareapiExcludeGroups"><?php p($l->t('Exclude groups from sharing')); ?></label><br/>
90 90
 	</p>
91 91
 	<p id="selectExcludedGroups" class="indent <?php if (!$_['shareExcludeGroups'] || $_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
92 92
 		<input name="shareapi_exclude_groups_list" type="hidden" id="excludedGroups" value="<?php p($_['shareExcludedGroupsList']) ?>" style="width: 400px" class="noJSAutoUpdate"/>
93 93
 		<br />
94 94
 		<em><?php p($l->t('These groups will still be able to receive shares, but not to initiate them.')); ?></em>
95 95
 	</p>
96
-	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden');?>">
96
+	<p class="<?php if ($_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
97 97
 		<input type="checkbox" name="shareapi_allow_share_dialog_user_enumeration" value="1" id="shareapi_allow_share_dialog_user_enumeration" class="checkbox"
98 98
 			<?php if ($_['allowShareDialogUserEnumeration'] === 'yes') print_unescaped('checked="checked"'); ?> />
99
-		<label for="shareapi_allow_share_dialog_user_enumeration"><?php p($l->t('Allow username autocompletion in share dialog. If this is disabled the full username or email address needs to be entered.'));?></label><br />
99
+		<label for="shareapi_allow_share_dialog_user_enumeration"><?php p($l->t('Allow username autocompletion in share dialog. If this is disabled the full username or email address needs to be entered.')); ?></label><br />
100 100
 	</p>
101 101
 	<p>
102 102
 		<input type="checkbox" id="publicShareDisclaimer" class="checkbox noJSAutoUpdate"
103 103
 			<?php if ($_['publicShareDisclaimerText'] !== null) print_unescaped('checked="checked"'); ?> />
104
-		<label for="publicShareDisclaimer"><?php p($l->t('Show disclaimer text on the public link upload page. (Only shown when the file list is hidden.)'));?></label>
104
+		<label for="publicShareDisclaimer"><?php p($l->t('Show disclaimer text on the public link upload page. (Only shown when the file list is hidden.)')); ?></label>
105 105
 		<span id="publicShareDisclaimerStatus" class="msg" style="display:none"></span>
106 106
 		<br/>
107 107
 		<textarea placeholder="<?php p($l->t('This text will be shown on the public link upload page when the file list is hidden.')) ?>" id="publicShareDisclaimerText" <?php if ($_['publicShareDisclaimerText'] === null) { print_unescaped('class="hidden"'); } ?>><?php p($_['publicShareDisclaimerText']) ?></textarea>
108 108
 	</p>
109 109
 
110
-	<h3><?php p($l->t('Default share permissions'));?></h3>
110
+	<h3><?php p($l->t('Default share permissions')); ?></h3>
111 111
 	<input type="hidden" name="shareapi_default_permissions" id="shareApiDefaultPermissions" class="checkbox"
112 112
 		   value="<?php p($_['shareApiDefaultPermissions']) ?>" />
113 113
 	<p id="shareApiDefaultPermissionsSection" class="indent <?php if ($_['shareAPIEnabled'] === 'no') p('hidden'); ?>">
114 114
 		<?php foreach ($_['shareApiDefaultPermissionsCheckboxes'] as $perm): ?>
115 115
 			<input type="checkbox" name="shareapi_default_permission_<?php p($perm['id']) ?>" id="shareapi_default_permission_<?php p($perm['id']) ?>"
116 116
 				   class="noautosave checkbox" value="<?php p($perm['value']) ?>" <?php if (($_['shareApiDefaultPermissions'] & $perm['value']) !== 0) print_unescaped('checked="checked"'); ?> />
117
-			<label for="shareapi_default_permission_<?php p($perm['id']) ?>"><?php p($perm['label']);?></label>
117
+			<label for="shareapi_default_permission_<?php p($perm['id']) ?>"><?php p($perm['label']); ?></label>
118 118
 		<?php endforeach ?>
119 119
 	</p>
120 120
 </div>
Please login to merge, or discard this patch.
lib/private/Files/Cache/Wrapper/CacheJail.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 		if ($path === '') {
59 59
 			return $this->getRoot();
60 60
 		} else {
61
-			return $this->getRoot() . '/' . ltrim($path, '/');
61
+			return $this->getRoot().'/'.ltrim($path, '/');
62 62
 		}
63 63
 	}
64 64
 
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 		$rootLength = strlen($this->getRoot()) + 1;
74 74
 		if ($path === $this->getRoot()) {
75 75
 			return '';
76
-		} else if (substr($path, 0, $rootLength) === $this->getRoot() . '/') {
76
+		} else if (substr($path, 0, $rootLength) === $this->getRoot().'/') {
77 77
 			return substr($path, $rootLength);
78 78
 		} else {
79 79
 			return null;
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 
94 94
 	protected function filterCacheEntry($entry) {
95 95
 		$rootLength = strlen($this->getRoot()) + 1;
96
-		return ($entry['path'] === $this->getRoot()) or (substr($entry['path'], 0, $rootLength) === $this->getRoot() . '/');
96
+		return ($entry['path'] === $this->getRoot()) or (substr($entry['path'], 0, $rootLength) === $this->getRoot().'/');
97 97
 	}
98 98
 
99 99
 	/**
Please login to merge, or discard this patch.
lib/private/legacy/defaults.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 		$this->defaultColorPrimary = '#0082c9';
70 70
 		$this->defaultTextColorPrimary = '#ffffff';
71 71
 
72
-		$themePath = OC::$SERVERROOT . '/themes/' . OC_Util::getTheme() . '/defaults.php';
72
+		$themePath = OC::$SERVERROOT.'/themes/'.OC_Util::getTheme().'/defaults.php';
73 73
 		if (file_exists($themePath)) {
74 74
 			// prevent defaults.php from printing output
75 75
 			ob_start();
@@ -240,9 +240,9 @@  discard block
 block discarded – undo
240 240
 		if ($this->themeExist('getShortFooter')) {
241 241
 			$footer = $this->theme->getShortFooter();
242 242
 		} else {
243
-			$footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' .
244
-				' rel="noreferrer noopener">' .$this->getEntity() . '</a>'.
245
-				' – ' . $this->getSlogan();
243
+			$footer = '<a href="'.$this->getBaseUrl().'" target="_blank"'.
244
+				' rel="noreferrer noopener">'.$this->getEntity().'</a>'.
245
+				' – '.$this->getSlogan();
246 246
 		}
247 247
 
248 248
 		return $footer;
@@ -270,7 +270,7 @@  discard block
 block discarded – undo
270 270
 		if ($this->themeExist('buildDocLinkToKey')) {
271 271
 			return $this->theme->buildDocLinkToKey($key);
272 272
 		}
273
-		return $this->getDocBaseUrl() . '/server/' . $this->defaultDocVersion . '/go.php?to=' . $key;
273
+		return $this->getDocBaseUrl().'/server/'.$this->defaultDocVersion.'/go.php?to='.$key;
274 274
 	}
275 275
 
276 276
 	/**
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
 	 * @return array scss variables to overwrite
293 293
 	 */
294 294
 	public function getScssVariables() {
295
-		if($this->themeExist('getScssVariables')) {
295
+		if ($this->themeExist('getScssVariables')) {
296 296
 			return $this->theme->getScssVariables();
297 297
 		}
298 298
 		return [];
@@ -313,12 +313,12 @@  discard block
 block discarded – undo
313 313
 			return $this->theme->getLogo($useSvg);
314 314
 		}
315 315
 
316
-		if($useSvg) {
316
+		if ($useSvg) {
317 317
 			$logo = \OC::$server->getURLGenerator()->imagePath('core', 'logo.svg');
318 318
 		} else {
319 319
 			$logo = \OC::$server->getURLGenerator()->imagePath('core', 'logo.png');
320 320
 		}
321
-	    return $logo . '?v=' . hash('sha1', implode('.', \OCP\Util::getVersion()));
321
+	    return $logo.'?v='.hash('sha1', implode('.', \OCP\Util::getVersion()));
322 322
 	}
323 323
 
324 324
 	public function getTextColorPrimary() {
Please login to merge, or discard this patch.
lib/private/Preview/TXT.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -51,10 +51,10 @@  discard block
 block discarded – undo
51 51
 			return false;
52 52
 		}
53 53
 
54
-		$content = stream_get_contents($content,3000);
54
+		$content = stream_get_contents($content, 3000);
55 55
 
56 56
 		//don't create previews of empty text files
57
-		if(trim($content) === '') {
57
+		if (trim($content) === '') {
58 58
 			return false;
59 59
 		}
60 60
 
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 
74 74
 		$canUseTTF = function_exists('imagettftext');
75 75
 
76
-		foreach($lines as $index => $line) {
76
+		foreach ($lines as $index => $line) {
77 77
 			$index = $index + 1;
78 78
 
79 79
 			$x = (int) 1;
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
 				imagestring($image, 1, $x, $y, $line, $textColor);
87 87
 			}
88 88
 
89
-			if(($index * $lineSize) >= $maxY) {
89
+			if (($index * $lineSize) >= $maxY) {
90 90
 				break;
91 91
 			}
92 92
 		}
Please login to merge, or discard this patch.
apps/dav/lib/CalDAV/CalDavBackend.php 1 patch
Spacing   +130 added lines, -130 removed lines patch added patch discarded remove patch
@@ -217,7 +217,7 @@  discard block
 block discarded – undo
217 217
 			$query->andWhere($query->expr()->neq('uri', $query->createNamedParameter(BirthdayService::BIRTHDAY_CALENDAR_URI)));
218 218
 		}
219 219
 
220
-		return (int)$query->execute()->fetchColumn();
220
+		return (int) $query->execute()->fetchColumn();
221 221
 	}
222 222
 
223 223
 	/**
@@ -264,25 +264,25 @@  discard block
 block discarded – undo
264 264
 		$stmt = $query->execute();
265 265
 
266 266
 		$calendars = [];
267
-		while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
267
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
268 268
 
269 269
 			$components = [];
270 270
 			if ($row['components']) {
271
-				$components = explode(',',$row['components']);
271
+				$components = explode(',', $row['components']);
272 272
 			}
273 273
 
274 274
 			$calendar = [
275 275
 				'id' => $row['id'],
276 276
 				'uri' => $row['uri'],
277 277
 				'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
278
-				'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
279
-				'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
280
-				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
281
-				'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
282
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($principalUri, !$this->legacyEndpoint),
278
+				'{'.Plugin::NS_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ? $row['synctoken'] : '0'),
279
+				'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $row['synctoken'] : '0',
280
+				'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
281
+				'{'.Plugin::NS_CALDAV.'}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent'] ? 'transparent' : 'opaque'),
282
+				'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}owner-principal' => $this->convertPrincipal($principalUri, !$this->legacyEndpoint),
283 283
 			];
284 284
 
285
-			foreach($this->propertyMap as $xmlName=>$dbName) {
285
+			foreach ($this->propertyMap as $xmlName=>$dbName) {
286 286
 				$calendar[$xmlName] = $row[$dbName];
287 287
 			}
288 288
 
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
 		$principals = array_map(function($principal) {
301 301
 			return urldecode($principal);
302 302
 		}, $principals);
303
-		$principals[]= $principalUri;
303
+		$principals[] = $principalUri;
304 304
 
305 305
 		$fields = array_values($this->propertyMap);
306 306
 		$fields[] = 'a.id';
@@ -320,8 +320,8 @@  discard block
 block discarded – undo
320 320
 			->setParameter('principaluri', $principals, \Doctrine\DBAL\Connection::PARAM_STR_ARRAY)
321 321
 			->execute();
322 322
 
323
-		$readOnlyPropertyName = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only';
324
-		while($row = $result->fetch()) {
323
+		$readOnlyPropertyName = '{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}read-only';
324
+		while ($row = $result->fetch()) {
325 325
 			if ($row['principaluri'] === $principalUri) {
326 326
 				continue;
327 327
 			}
@@ -340,25 +340,25 @@  discard block
 block discarded – undo
340 340
 			}
341 341
 
342 342
 			list(, $name) = Uri\split($row['principaluri']);
343
-			$uri = $row['uri'] . '_shared_by_' . $name;
344
-			$row['displayname'] = $row['displayname'] . ' (' . $this->getUserDisplayName($name) . ')';
343
+			$uri = $row['uri'].'_shared_by_'.$name;
344
+			$row['displayname'] = $row['displayname'].' ('.$this->getUserDisplayName($name).')';
345 345
 			$components = [];
346 346
 			if ($row['components']) {
347
-				$components = explode(',',$row['components']);
347
+				$components = explode(',', $row['components']);
348 348
 			}
349 349
 			$calendar = [
350 350
 				'id' => $row['id'],
351 351
 				'uri' => $uri,
352 352
 				'principaluri' => $this->convertPrincipal($principalUri, !$this->legacyEndpoint),
353
-				'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
354
-				'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
355
-				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
356
-				'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp('transparent'),
357
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
353
+				'{'.Plugin::NS_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ? $row['synctoken'] : '0'),
354
+				'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $row['synctoken'] : '0',
355
+				'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
356
+				'{'.Plugin::NS_CALDAV.'}schedule-calendar-transp' => new ScheduleCalendarTransp('transparent'),
357
+				'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}owner-principal' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
358 358
 				$readOnlyPropertyName => $readOnly,
359 359
 			];
360 360
 
361
-			foreach($this->propertyMap as $xmlName=>$dbName) {
361
+			foreach ($this->propertyMap as $xmlName=>$dbName) {
362 362
 				$calendar[$xmlName] = $row[$dbName];
363 363
 			}
364 364
 
@@ -387,21 +387,21 @@  discard block
 block discarded – undo
387 387
 			->orderBy('calendarorder', 'ASC');
388 388
 		$stmt = $query->execute();
389 389
 		$calendars = [];
390
-		while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
390
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
391 391
 			$components = [];
392 392
 			if ($row['components']) {
393
-				$components = explode(',',$row['components']);
393
+				$components = explode(',', $row['components']);
394 394
 			}
395 395
 			$calendar = [
396 396
 				'id' => $row['id'],
397 397
 				'uri' => $row['uri'],
398 398
 				'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
399
-				'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
400
-				'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
401
-				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
402
-				'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
399
+				'{'.Plugin::NS_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ? $row['synctoken'] : '0'),
400
+				'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $row['synctoken'] : '0',
401
+				'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
402
+				'{'.Plugin::NS_CALDAV.'}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent'] ? 'transparent' : 'opaque'),
403 403
 			];
404
-			foreach($this->propertyMap as $xmlName=>$dbName) {
404
+			foreach ($this->propertyMap as $xmlName=>$dbName) {
405 405
 				$calendar[$xmlName] = $row[$dbName];
406 406
 			}
407 407
 
@@ -452,27 +452,27 @@  discard block
 block discarded – undo
452 452
 			->andWhere($query->expr()->eq('s.type', $query->createNamedParameter('calendar')))
453 453
 			->execute();
454 454
 
455
-		while($row = $result->fetch()) {
455
+		while ($row = $result->fetch()) {
456 456
 			list(, $name) = Uri\split($row['principaluri']);
457
-			$row['displayname'] = $row['displayname'] . "($name)";
457
+			$row['displayname'] = $row['displayname']."($name)";
458 458
 			$components = [];
459 459
 			if ($row['components']) {
460
-				$components = explode(',',$row['components']);
460
+				$components = explode(',', $row['components']);
461 461
 			}
462 462
 			$calendar = [
463 463
 				'id' => $row['id'],
464 464
 				'uri' => $row['publicuri'],
465 465
 				'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
466
-				'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
467
-				'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
468
-				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
469
-				'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
470
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($row['principaluri'], $this->legacyEndpoint),
471
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only' => (int)$row['access'] === Backend::ACCESS_READ,
472
-				'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}public' => (int)$row['access'] === self::ACCESS_PUBLIC,
466
+				'{'.Plugin::NS_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ? $row['synctoken'] : '0'),
467
+				'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $row['synctoken'] : '0',
468
+				'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
469
+				'{'.Plugin::NS_CALDAV.'}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent'] ? 'transparent' : 'opaque'),
470
+				'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}owner-principal' => $this->convertPrincipal($row['principaluri'], $this->legacyEndpoint),
471
+				'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}read-only' => (int) $row['access'] === Backend::ACCESS_READ,
472
+				'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}public' => (int) $row['access'] === self::ACCESS_PUBLIC,
473 473
 			];
474 474
 
475
-			foreach($this->propertyMap as $xmlName=>$dbName) {
475
+			foreach ($this->propertyMap as $xmlName=>$dbName) {
476 476
 				$calendar[$xmlName] = $row[$dbName];
477 477
 			}
478 478
 
@@ -516,29 +516,29 @@  discard block
 block discarded – undo
516 516
 		$result->closeCursor();
517 517
 
518 518
 		if ($row === false) {
519
-			throw new NotFound('Node with name \'' . $uri . '\' could not be found');
519
+			throw new NotFound('Node with name \''.$uri.'\' could not be found');
520 520
 		}
521 521
 
522 522
 		list(, $name) = Uri\split($row['principaluri']);
523
-		$row['displayname'] = $row['displayname'] . ' ' . "($name)";
523
+		$row['displayname'] = $row['displayname'].' '."($name)";
524 524
 		$components = [];
525 525
 		if ($row['components']) {
526
-			$components = explode(',',$row['components']);
526
+			$components = explode(',', $row['components']);
527 527
 		}
528 528
 		$calendar = [
529 529
 			'id' => $row['id'],
530 530
 			'uri' => $row['publicuri'],
531 531
 			'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
532
-			'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
533
-			'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
534
-			'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
535
-			'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
536
-			'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
537
-			'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only' => (int)$row['access'] === Backend::ACCESS_READ,
538
-			'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}public' => (int)$row['access'] === self::ACCESS_PUBLIC,
532
+			'{'.Plugin::NS_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ? $row['synctoken'] : '0'),
533
+			'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $row['synctoken'] : '0',
534
+			'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
535
+			'{'.Plugin::NS_CALDAV.'}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent'] ? 'transparent' : 'opaque'),
536
+			'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}owner-principal' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
537
+			'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}read-only' => (int) $row['access'] === Backend::ACCESS_READ,
538
+			'{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}public' => (int) $row['access'] === self::ACCESS_PUBLIC,
539 539
 		];
540 540
 
541
-		foreach($this->propertyMap as $xmlName=>$dbName) {
541
+		foreach ($this->propertyMap as $xmlName=>$dbName) {
542 542
 			$calendar[$xmlName] = $row[$dbName];
543 543
 		}
544 544
 
@@ -578,20 +578,20 @@  discard block
 block discarded – undo
578 578
 
579 579
 		$components = [];
580 580
 		if ($row['components']) {
581
-			$components = explode(',',$row['components']);
581
+			$components = explode(',', $row['components']);
582 582
 		}
583 583
 
584 584
 		$calendar = [
585 585
 			'id' => $row['id'],
586 586
 			'uri' => $row['uri'],
587 587
 			'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
588
-			'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
589
-			'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
590
-			'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
591
-			'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
588
+			'{'.Plugin::NS_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ? $row['synctoken'] : '0'),
589
+			'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $row['synctoken'] : '0',
590
+			'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
591
+			'{'.Plugin::NS_CALDAV.'}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent'] ? 'transparent' : 'opaque'),
592 592
 		];
593 593
 
594
-		foreach($this->propertyMap as $xmlName=>$dbName) {
594
+		foreach ($this->propertyMap as $xmlName=>$dbName) {
595 595
 			$calendar[$xmlName] = $row[$dbName];
596 596
 		}
597 597
 
@@ -624,20 +624,20 @@  discard block
 block discarded – undo
624 624
 
625 625
 		$components = [];
626 626
 		if ($row['components']) {
627
-			$components = explode(',',$row['components']);
627
+			$components = explode(',', $row['components']);
628 628
 		}
629 629
 
630 630
 		$calendar = [
631 631
 			'id' => $row['id'],
632 632
 			'uri' => $row['uri'],
633 633
 			'principaluri' => $this->convertPrincipal($row['principaluri'], !$this->legacyEndpoint),
634
-			'{' . Plugin::NS_CALENDARSERVER . '}getctag' => 'http://sabre.io/ns/sync/' . ($row['synctoken']?$row['synctoken']:'0'),
635
-			'{http://sabredav.org/ns}sync-token' => $row['synctoken']?$row['synctoken']:'0',
636
-			'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
637
-			'{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent']?'transparent':'opaque'),
634
+			'{'.Plugin::NS_CALENDARSERVER.'}getctag' => 'http://sabre.io/ns/sync/'.($row['synctoken'] ? $row['synctoken'] : '0'),
635
+			'{http://sabredav.org/ns}sync-token' => $row['synctoken'] ? $row['synctoken'] : '0',
636
+			'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet($components),
637
+			'{'.Plugin::NS_CALDAV.'}schedule-calendar-transp' => new ScheduleCalendarTransp($row['transparent'] ? 'transparent' : 'opaque'),
638 638
 		];
639 639
 
640
-		foreach($this->propertyMap as $xmlName=>$dbName) {
640
+		foreach ($this->propertyMap as $xmlName=>$dbName) {
641 641
 			$calendar[$xmlName] = $row[$dbName];
642 642
 		}
643 643
 
@@ -672,16 +672,16 @@  discard block
 block discarded – undo
672 672
 		$sccs = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
673 673
 		if (isset($properties[$sccs])) {
674 674
 			if (!($properties[$sccs] instanceof SupportedCalendarComponentSet)) {
675
-				throw new DAV\Exception('The ' . $sccs . ' property must be of type: \Sabre\CalDAV\Property\SupportedCalendarComponentSet');
675
+				throw new DAV\Exception('The '.$sccs.' property must be of type: \Sabre\CalDAV\Property\SupportedCalendarComponentSet');
676 676
 			}
677
-			$values['components'] = implode(',',$properties[$sccs]->getValue());
677
+			$values['components'] = implode(',', $properties[$sccs]->getValue());
678 678
 		}
679
-		$transp = '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp';
679
+		$transp = '{'.Plugin::NS_CALDAV.'}schedule-calendar-transp';
680 680
 		if (isset($properties[$transp])) {
681 681
 			$values['transparent'] = (int) ($properties[$transp]->getValue() === 'transparent');
682 682
 		}
683 683
 
684
-		foreach($this->propertyMap as $xmlName=>$dbName) {
684
+		foreach ($this->propertyMap as $xmlName=>$dbName) {
685 685
 			if (isset($properties[$xmlName])) {
686 686
 				$values[$dbName] = $properties[$xmlName];
687 687
 			}
@@ -689,7 +689,7 @@  discard block
 block discarded – undo
689 689
 
690 690
 		$query = $this->db->getQueryBuilder();
691 691
 		$query->insert('calendars');
692
-		foreach($values as $column => $value) {
692
+		foreach ($values as $column => $value) {
693 693
 			$query->setValue($column, $query->createNamedParameter($value));
694 694
 		}
695 695
 		$query->execute();
@@ -723,7 +723,7 @@  discard block
 block discarded – undo
723 723
 	 */
724 724
 	function updateCalendar($calendarId, PropPatch $propPatch) {
725 725
 		$supportedProperties = array_keys($this->propertyMap);
726
-		$supportedProperties[] = '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp';
726
+		$supportedProperties[] = '{'.Plugin::NS_CALDAV.'}schedule-calendar-transp';
727 727
 
728 728
 		/**
729 729
 		 * @suppress SqlInjectionChecker
@@ -733,7 +733,7 @@  discard block
 block discarded – undo
733 733
 			foreach ($mutations as $propertyName => $propertyValue) {
734 734
 
735 735
 				switch ($propertyName) {
736
-					case '{' . Plugin::NS_CALDAV . '}schedule-calendar-transp' :
736
+					case '{'.Plugin::NS_CALDAV.'}schedule-calendar-transp' :
737 737
 						$fieldName = 'transparent';
738 738
 						$newValues[$fieldName] = (int) ($propertyValue->getValue() === 'transparent');
739 739
 						break;
@@ -848,16 +848,16 @@  discard block
 block discarded – undo
848 848
 		$stmt = $query->execute();
849 849
 
850 850
 		$result = [];
851
-		foreach($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
851
+		foreach ($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
852 852
 			$result[] = [
853 853
 					'id'           => $row['id'],
854 854
 					'uri'          => $row['uri'],
855 855
 					'lastmodified' => $row['lastmodified'],
856
-					'etag'         => '"' . $row['etag'] . '"',
856
+					'etag'         => '"'.$row['etag'].'"',
857 857
 					'calendarid'   => $row['calendarid'],
858
-					'size'         => (int)$row['size'],
858
+					'size'         => (int) $row['size'],
859 859
 					'component'    => strtolower($row['componenttype']),
860
-					'classification'=> (int)$row['classification']
860
+					'classification'=> (int) $row['classification']
861 861
 			];
862 862
 		}
863 863
 
@@ -890,18 +890,18 @@  discard block
 block discarded – undo
890 890
 		$stmt = $query->execute();
891 891
 		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
892 892
 
893
-		if(!$row) return null;
893
+		if (!$row) return null;
894 894
 
895 895
 		return [
896 896
 				'id'            => $row['id'],
897 897
 				'uri'           => $row['uri'],
898 898
 				'lastmodified'  => $row['lastmodified'],
899
-				'etag'          => '"' . $row['etag'] . '"',
899
+				'etag'          => '"'.$row['etag'].'"',
900 900
 				'calendarid'    => $row['calendarid'],
901
-				'size'          => (int)$row['size'],
901
+				'size'          => (int) $row['size'],
902 902
 				'calendardata'  => $this->readBlob($row['calendardata']),
903 903
 				'component'     => strtolower($row['componenttype']),
904
-				'classification'=> (int)$row['classification']
904
+				'classification'=> (int) $row['classification']
905 905
 		];
906 906
 	}
907 907
 
@@ -940,12 +940,12 @@  discard block
 block discarded – undo
940 940
 					'id'           => $row['id'],
941 941
 					'uri'          => $row['uri'],
942 942
 					'lastmodified' => $row['lastmodified'],
943
-					'etag'         => '"' . $row['etag'] . '"',
943
+					'etag'         => '"'.$row['etag'].'"',
944 944
 					'calendarid'   => $row['calendarid'],
945
-					'size'         => (int)$row['size'],
945
+					'size'         => (int) $row['size'],
946 946
 					'calendardata' => $this->readBlob($row['calendardata']),
947 947
 					'component'    => strtolower($row['componenttype']),
948
-					'classification' => (int)$row['classification']
948
+					'classification' => (int) $row['classification']
949 949
 				];
950 950
 			}
951 951
 			$result->closeCursor();
@@ -1018,7 +1018,7 @@  discard block
 block discarded – undo
1018 1018
 		));
1019 1019
 		$this->addChange($calendarId, $objectUri, 1);
1020 1020
 
1021
-		return '"' . $extraData['etag'] . '"';
1021
+		return '"'.$extraData['etag'].'"';
1022 1022
 	}
1023 1023
 
1024 1024
 	/**
@@ -1073,7 +1073,7 @@  discard block
 block discarded – undo
1073 1073
 		}
1074 1074
 		$this->addChange($calendarId, $objectUri, 2);
1075 1075
 
1076
-		return '"' . $extraData['etag'] . '"';
1076
+		return '"'.$extraData['etag'].'"';
1077 1077
 	}
1078 1078
 
1079 1079
 	/**
@@ -1226,13 +1226,13 @@  discard block
 block discarded – undo
1226 1226
 		$stmt = $query->execute();
1227 1227
 
1228 1228
 		$result = [];
1229
-		while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
1229
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
1230 1230
 			if ($requirePostFilter) {
1231 1231
 				// validateFilterForObject will parse the calendar data
1232 1232
 				// catch parsing errors
1233 1233
 				try {
1234 1234
 					$matches = $this->validateFilterForObject($row, $filters);
1235
-				} catch(ParseException $ex) {
1235
+				} catch (ParseException $ex) {
1236 1236
 					$this->logger->logException($ex, [
1237 1237
 						'app' => 'dav',
1238 1238
 						'message' => 'Caught parsing exception for calendar data. This usually indicates invalid calendar data. calendar-id:'.$calendarId.' uri:'.$row['uri']
@@ -1265,14 +1265,14 @@  discard block
 block discarded – undo
1265 1265
 	 * @param integer|null $offset
1266 1266
 	 * @return array
1267 1267
 	 */
1268
-	public function calendarSearch($principalUri, array $filters, $limit=null, $offset=null) {
1268
+	public function calendarSearch($principalUri, array $filters, $limit = null, $offset = null) {
1269 1269
 		$calendars = $this->getCalendarsForUser($principalUri);
1270 1270
 		$ownCalendars = [];
1271 1271
 		$sharedCalendars = [];
1272 1272
 
1273 1273
 		$uriMapper = [];
1274 1274
 
1275
-		foreach($calendars as $calendar) {
1275
+		foreach ($calendars as $calendar) {
1276 1276
 			if ($calendar['{http://owncloud.org/ns}owner-principal'] === $principalUri) {
1277 1277
 				$ownCalendars[] = $calendar['id'];
1278 1278
 			} else {
@@ -1287,11 +1287,11 @@  discard block
 block discarded – undo
1287 1287
 		$query = $this->db->getQueryBuilder();
1288 1288
 		// Calendar id expressions
1289 1289
 		$calendarExpressions = [];
1290
-		foreach($ownCalendars as $id) {
1290
+		foreach ($ownCalendars as $id) {
1291 1291
 			$calendarExpressions[] = $query->expr()
1292 1292
 				->eq('c.calendarid', $query->createNamedParameter($id));
1293 1293
 		}
1294
-		foreach($sharedCalendars as $id) {
1294
+		foreach ($sharedCalendars as $id) {
1295 1295
 			$calendarExpressions[] = $query->expr()->andX(
1296 1296
 				$query->expr()->eq('c.calendarid',
1297 1297
 					$query->createNamedParameter($id)),
@@ -1308,7 +1308,7 @@  discard block
 block discarded – undo
1308 1308
 
1309 1309
 		// Component expressions
1310 1310
 		$compExpressions = [];
1311
-		foreach($filters['comps'] as $comp) {
1311
+		foreach ($filters['comps'] as $comp) {
1312 1312
 			$compExpressions[] = $query->expr()
1313 1313
 				->eq('c.componenttype', $query->createNamedParameter($comp));
1314 1314
 		}
@@ -1327,13 +1327,13 @@  discard block
 block discarded – undo
1327 1327
 		}
1328 1328
 
1329 1329
 		$propParamExpressions = [];
1330
-		foreach($filters['props'] as $prop) {
1330
+		foreach ($filters['props'] as $prop) {
1331 1331
 			$propParamExpressions[] = $query->expr()->andX(
1332 1332
 				$query->expr()->eq('i.name', $query->createNamedParameter($prop)),
1333 1333
 				$query->expr()->isNull('i.parameter')
1334 1334
 			);
1335 1335
 		}
1336
-		foreach($filters['params'] as $param) {
1336
+		foreach ($filters['params'] as $param) {
1337 1337
 			$propParamExpressions[] = $query->expr()->andX(
1338 1338
 				$query->expr()->eq('i.name', $query->createNamedParameter($param['property'])),
1339 1339
 				$query->expr()->eq('i.parameter', $query->createNamedParameter($param['parameter']))
@@ -1365,8 +1365,8 @@  discard block
 block discarded – undo
1365 1365
 		$stmt = $query->execute();
1366 1366
 
1367 1367
 		$result = [];
1368
-		while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
1369
-			$path = $uriMapper[$row['calendarid']] . '/' . $row['uri'];
1368
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
1369
+			$path = $uriMapper[$row['calendarid']].'/'.$row['uri'];
1370 1370
 			if (!in_array($path, $result)) {
1371 1371
 				$result[] = $path;
1372 1372
 			}
@@ -1404,7 +1404,7 @@  discard block
 block discarded – undo
1404 1404
 		}
1405 1405
 
1406 1406
 		$or = $innerQuery->expr()->orX();
1407
-		foreach($searchProperties as $searchProperty) {
1407
+		foreach ($searchProperties as $searchProperty) {
1408 1408
 			$or->add($innerQuery->expr()->eq('op.name',
1409 1409
 				$outerQuery->createNamedParameter($searchProperty)));
1410 1410
 		}
@@ -1412,8 +1412,8 @@  discard block
 block discarded – undo
1412 1412
 
1413 1413
 		if ($pattern !== '') {
1414 1414
 			$innerQuery->andWhere($innerQuery->expr()->iLike('op.value',
1415
-				$outerQuery->createNamedParameter('%' .
1416
-					$this->db->escapeLikeParameter($pattern) . '%')));
1415
+				$outerQuery->createNamedParameter('%'.
1416
+					$this->db->escapeLikeParameter($pattern).'%')));
1417 1417
 		}
1418 1418
 
1419 1419
 		$outerQuery->select('c.id', 'c.calendardata', 'c.componenttype', 'c.uid', 'c.uri')
@@ -1433,7 +1433,7 @@  discard block
 block discarded – undo
1433 1433
 
1434 1434
 		if (isset($options['types'])) {
1435 1435
 			$or = $outerQuery->expr()->orX();
1436
-			foreach($options['types'] as $type) {
1436
+			foreach ($options['types'] as $type) {
1437 1437
 				$or->add($outerQuery->expr()->eq('componenttype',
1438 1438
 					$outerQuery->createNamedParameter($type)));
1439 1439
 			}
@@ -1458,7 +1458,7 @@  discard block
 block discarded – undo
1458 1458
 			$comps = $calendarData->getComponents();
1459 1459
 			$objects = [];
1460 1460
 			$timezones = [];
1461
-			foreach($comps as $comp) {
1461
+			foreach ($comps as $comp) {
1462 1462
 				if ($comp instanceof VTimeZone) {
1463 1463
 					$timezones[] = $comp;
1464 1464
 				} else {
@@ -1495,7 +1495,7 @@  discard block
 block discarded – undo
1495 1495
 		});
1496 1496
 		$validationRules = $comp->getValidationRules();
1497 1497
 
1498
-		foreach($subComponents as $subComponent) {
1498
+		foreach ($subComponents as $subComponent) {
1499 1499
 			$name = $subComponent->name;
1500 1500
 			if (!isset($data[$name])) {
1501 1501
 				$data[$name] = [];
@@ -1503,7 +1503,7 @@  discard block
 block discarded – undo
1503 1503
 			$data[$name][] = $this->transformSearchData($subComponent);
1504 1504
 		}
1505 1505
 
1506
-		foreach($properties as $property) {
1506
+		foreach ($properties as $property) {
1507 1507
 			$name = $property->name;
1508 1508
 			if (!isset($validationRules[$name])) {
1509 1509
 				$validationRules[$name] = '*';
@@ -1573,7 +1573,7 @@  discard block
 block discarded – undo
1573 1573
 		$stmt = $query->execute();
1574 1574
 
1575 1575
 		if ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
1576
-			return $row['calendaruri'] . '/' . $row['objecturi'];
1576
+			return $row['calendaruri'].'/'.$row['objecturi'];
1577 1577
 		}
1578 1578
 
1579 1579
 		return null;
@@ -1638,7 +1638,7 @@  discard block
 block discarded – undo
1638 1638
 	function getChangesForCalendar($calendarId, $syncToken, $syncLevel, $limit = null) {
1639 1639
 		// Current synctoken
1640 1640
 		$stmt = $this->db->prepare('SELECT `synctoken` FROM `*PREFIX*calendars` WHERE `id` = ?');
1641
-		$stmt->execute([ $calendarId ]);
1641
+		$stmt->execute([$calendarId]);
1642 1642
 		$currentToken = $stmt->fetchColumn(0);
1643 1643
 
1644 1644
 		if (is_null($currentToken)) {
@@ -1655,8 +1655,8 @@  discard block
 block discarded – undo
1655 1655
 		if ($syncToken) {
1656 1656
 
1657 1657
 			$query = "SELECT `uri`, `operation` FROM `*PREFIX*calendarchanges` WHERE `synctoken` >= ? AND `synctoken` < ? AND `calendarid` = ? ORDER BY `synctoken`";
1658
-			if ($limit>0) {
1659
-				$query.= " LIMIT " . (int)$limit;
1658
+			if ($limit > 0) {
1659
+				$query .= " LIMIT ".(int) $limit;
1660 1660
 			}
1661 1661
 
1662 1662
 			// Fetching all changes
@@ -1667,15 +1667,15 @@  discard block
 block discarded – undo
1667 1667
 
1668 1668
 			// This loop ensures that any duplicates are overwritten, only the
1669 1669
 			// last change on a node is relevant.
1670
-			while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
1670
+			while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
1671 1671
 
1672 1672
 				$changes[$row['uri']] = $row['operation'];
1673 1673
 
1674 1674
 			}
1675 1675
 
1676
-			foreach($changes as $uri => $operation) {
1676
+			foreach ($changes as $uri => $operation) {
1677 1677
 
1678
-				switch($operation) {
1678
+				switch ($operation) {
1679 1679
 					case 1 :
1680 1680
 						$result['added'][] = $uri;
1681 1681
 						break;
@@ -1745,10 +1745,10 @@  discard block
 block discarded – undo
1745 1745
 			->from('calendarsubscriptions')
1746 1746
 			->where($query->expr()->eq('principaluri', $query->createNamedParameter($principalUri)))
1747 1747
 			->orderBy('calendarorder', 'asc');
1748
-		$stmt =$query->execute();
1748
+		$stmt = $query->execute();
1749 1749
 
1750 1750
 		$subscriptions = [];
1751
-		while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
1751
+		while ($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
1752 1752
 
1753 1753
 			$subscription = [
1754 1754
 				'id'           => $row['id'],
@@ -1757,10 +1757,10 @@  discard block
 block discarded – undo
1757 1757
 				'source'       => $row['source'],
1758 1758
 				'lastmodified' => $row['lastmodified'],
1759 1759
 
1760
-				'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
1760
+				'{'.Plugin::NS_CALDAV.'}supported-calendar-component-set' => new SupportedCalendarComponentSet(['VTODO', 'VEVENT']),
1761 1761
 			];
1762 1762
 
1763
-			foreach($this->subscriptionPropertyMap as $xmlName=>$dbName) {
1763
+			foreach ($this->subscriptionPropertyMap as $xmlName=>$dbName) {
1764 1764
 				if (!is_null($row[$dbName])) {
1765 1765
 					$subscription[$xmlName] = $row[$dbName];
1766 1766
 				}
@@ -1799,7 +1799,7 @@  discard block
 block discarded – undo
1799 1799
 
1800 1800
 		$propertiesBoolean = ['striptodos', 'stripalarms', 'stripattachments'];
1801 1801
 
1802
-		foreach($this->subscriptionPropertyMap as $xmlName=>$dbName) {
1802
+		foreach ($this->subscriptionPropertyMap as $xmlName=>$dbName) {
1803 1803
 			if (array_key_exists($xmlName, $properties)) {
1804 1804
 					$values[$dbName] = $properties[$xmlName];
1805 1805
 					if (in_array($dbName, $propertiesBoolean)) {
@@ -1850,7 +1850,7 @@  discard block
 block discarded – undo
1850 1850
 
1851 1851
 			$newValues = [];
1852 1852
 
1853
-			foreach($mutations as $propertyName=>$propertyValue) {
1853
+			foreach ($mutations as $propertyName=>$propertyValue) {
1854 1854
 				if ($propertyName === '{http://calendarserver.org/ns/}source') {
1855 1855
 					$newValues['source'] = $propertyValue->getHref();
1856 1856
 				} else {
@@ -1862,7 +1862,7 @@  discard block
 block discarded – undo
1862 1862
 			$query = $this->db->getQueryBuilder();
1863 1863
 			$query->update('calendarsubscriptions')
1864 1864
 				->set('lastmodified', $query->createNamedParameter(time()));
1865
-			foreach($newValues as $fieldName=>$value) {
1865
+			foreach ($newValues as $fieldName=>$value) {
1866 1866
 				$query->set($fieldName, $query->createNamedParameter($value));
1867 1867
 			}
1868 1868
 			$query->where($query->expr()->eq('id', $query->createNamedParameter($subscriptionId)))
@@ -1912,7 +1912,7 @@  discard block
 block discarded – undo
1912 1912
 
1913 1913
 		$row = $stmt->fetch(\PDO::FETCH_ASSOC);
1914 1914
 
1915
-		if(!$row) {
1915
+		if (!$row) {
1916 1916
 			return null;
1917 1917
 		}
1918 1918
 
@@ -1920,8 +1920,8 @@  discard block
 block discarded – undo
1920 1920
 				'uri'          => $row['uri'],
1921 1921
 				'calendardata' => $row['calendardata'],
1922 1922
 				'lastmodified' => $row['lastmodified'],
1923
-				'etag'         => '"' . $row['etag'] . '"',
1924
-				'size'         => (int)$row['size'],
1923
+				'etag'         => '"'.$row['etag'].'"',
1924
+				'size'         => (int) $row['size'],
1925 1925
 		];
1926 1926
 	}
1927 1927
 
@@ -1944,13 +1944,13 @@  discard block
 block discarded – undo
1944 1944
 				->execute();
1945 1945
 
1946 1946
 		$result = [];
1947
-		foreach($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
1947
+		foreach ($stmt->fetchAll(\PDO::FETCH_ASSOC) as $row) {
1948 1948
 			$result[] = [
1949 1949
 					'calendardata' => $row['calendardata'],
1950 1950
 					'uri'          => $row['uri'],
1951 1951
 					'lastmodified' => $row['lastmodified'],
1952
-					'etag'         => '"' . $row['etag'] . '"',
1953
-					'size'         => (int)$row['size'],
1952
+					'etag'         => '"'.$row['etag'].'"',
1953
+					'size'         => (int) $row['size'],
1954 1954
 			];
1955 1955
 		}
1956 1956
 
@@ -2042,10 +2042,10 @@  discard block
 block discarded – undo
2042 2042
 		$lastOccurrence = null;
2043 2043
 		$uid = null;
2044 2044
 		$classification = self::CLASSIFICATION_PUBLIC;
2045
-		foreach($vObject->getComponents() as $component) {
2046
-			if ($component->name!=='VTIMEZONE') {
2045
+		foreach ($vObject->getComponents() as $component) {
2046
+			if ($component->name !== 'VTIMEZONE') {
2047 2047
 				$componentType = $component->name;
2048
-				$uid = (string)$component->UID;
2048
+				$uid = (string) $component->UID;
2049 2049
 				break;
2050 2050
 			}
2051 2051
 		}
@@ -2070,13 +2070,13 @@  discard block
 block discarded – undo
2070 2070
 					$lastOccurrence = $firstOccurrence;
2071 2071
 				}
2072 2072
 			} else {
2073
-				$it = new EventIterator($vObject, (string)$component->UID);
2073
+				$it = new EventIterator($vObject, (string) $component->UID);
2074 2074
 				$maxDate = new \DateTime(self::MAX_DATE);
2075 2075
 				if ($it->isInfinite()) {
2076 2076
 					$lastOccurrence = $maxDate->getTimestamp();
2077 2077
 				} else {
2078 2078
 					$end = $it->getDtEnd();
2079
-					while($it->valid() && $end < $maxDate) {
2079
+					while ($it->valid() && $end < $maxDate) {
2080 2080
 						$end = $it->getDtEnd();
2081 2081
 						$it->next();
2082 2082
 
@@ -2295,7 +2295,7 @@  discard block
 block discarded – undo
2295 2295
 			->execute();
2296 2296
 
2297 2297
 		$ids = $result->fetchAll();
2298
-		foreach($ids as $id) {
2298
+		foreach ($ids as $id) {
2299 2299
 			$this->deleteCalendar($id['id']);
2300 2300
 		}
2301 2301
 	}
@@ -2342,10 +2342,10 @@  discard block
 block discarded – undo
2342 2342
 		$result->closeCursor();
2343 2343
 
2344 2344
 		if (!isset($objectIds['id'])) {
2345
-			throw new \InvalidArgumentException('Calendarobject does not exists: ' . $uri);
2345
+			throw new \InvalidArgumentException('Calendarobject does not exists: '.$uri);
2346 2346
 		}
2347 2347
 
2348
-		return (int)$objectIds['id'];
2348
+		return (int) $objectIds['id'];
2349 2349
 	}
2350 2350
 
2351 2351
 	private function convertPrincipal($principalUri, $toV2) {
@@ -2360,8 +2360,8 @@  discard block
 block discarded – undo
2360 2360
 	}
2361 2361
 
2362 2362
 	private function addOwnerPrincipal(&$calendarInfo) {
2363
-		$ownerPrincipalKey = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal';
2364
-		$displaynameKey = '{' . \OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD . '}owner-displayname';
2363
+		$ownerPrincipalKey = '{'.\OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD.'}owner-principal';
2364
+		$displaynameKey = '{'.\OCA\DAV\DAV\Sharing\Plugin::NS_NEXTCLOUD.'}owner-displayname';
2365 2365
 		if (isset($calendarInfo[$ownerPrincipalKey])) {
2366 2366
 			$uri = $calendarInfo[$ownerPrincipalKey];
2367 2367
 		} else {
Please login to merge, or discard this patch.
ocs/providers.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -23,18 +23,18 @@
 block discarded – undo
23 23
  *
24 24
  */
25 25
 
26
-require_once __DIR__ . '/../lib/versioncheck.php';
27
-require_once __DIR__ . '/../lib/base.php';
26
+require_once __DIR__.'/../lib/versioncheck.php';
27
+require_once __DIR__.'/../lib/base.php';
28 28
 
29 29
 header('Content-type: application/xml');
30 30
 
31 31
 $request = \OC::$server->getRequest();
32 32
 
33
-$url = $request->getServerProtocol() . '://' . substr($request->getServerHost() . $request->getRequestUri(), 0, -17).'ocs/v1.php/';
33
+$url = $request->getServerProtocol().'://'.substr($request->getServerHost().$request->getRequestUri(), 0, -17).'ocs/v1.php/';
34 34
 
35 35
 $writer = new XMLWriter();
36 36
 $writer->openURI('php://output');
37
-$writer->startDocument('1.0','UTF-8');
37
+$writer->startDocument('1.0', 'UTF-8');
38 38
 $writer->setIndent(true);
39 39
 $writer->startElement('providers');
40 40
 $writer->startElement('provider');
Please login to merge, or discard this patch.
status.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -29,11 +29,11 @@  discard block
 block discarded – undo
29 29
  *
30 30
  */
31 31
 
32
-require_once __DIR__ . '/lib/versioncheck.php';
32
+require_once __DIR__.'/lib/versioncheck.php';
33 33
 
34 34
 try {
35 35
 
36
-	require_once __DIR__ . '/lib/base.php';
36
+	require_once __DIR__.'/lib/base.php';
37 37
 
38 38
 	$systemConfig = \OC::$server->getSystemConfig();
39 39
 
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 	# see core/lib/private/legacy/defaults.php and core/themes/example/defaults.php
43 43
 	# for description and defaults
44 44
 	$defaults = new \OCP\Defaults();
45
-	$values=array(
45
+	$values = array(
46 46
 		'installed'=>$installed,
47 47
 		'maintenance' => $maintenance,
48 48
 		'needsDbUpgrade' => \OCP\Util::needUpgrade(),
Please login to merge, or discard this patch.