Completed
Push — master ( 54b1f4...fdc61e )
by Christoph
34:11 queued 21:41
created
settings/templates/settings/admin/encryption.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 <div class="section" id='encryptionAPI'>
30 30
 	<h2><?php p($l->t('Server-side encryption')); ?></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-encryption')); ?>"></a>
34 34
 	<p class="settings-hint"><?php p($l->t('Server-side encryption makes it possible to encrypt files which are uploaded to this server. This comes with limitations like a performance penalty, so enable this only if needed.')); ?></p>
35 35
 	<p id="enable">
Please login to merge, or discard this patch.
lib/private/Files/Mount/CacheMountProvider.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -55,15 +55,15 @@
 block discarded – undo
55 55
 	public function getMountsForUser(IUser $user, IStorageFactory $loader) {
56 56
 		$cacheBaseDir = $this->config->getSystemValue('cache_path', '');
57 57
 		if ($cacheBaseDir !== '') {
58
-			$cacheDir = rtrim($cacheBaseDir, '/') . '/' . $user->getUID();
58
+			$cacheDir = rtrim($cacheBaseDir, '/').'/'.$user->getUID();
59 59
 			if (!file_exists($cacheDir)) {
60 60
 				mkdir($cacheDir, 0770, true);
61
-				mkdir($cacheDir . '/uploads', 0770, true);
61
+				mkdir($cacheDir.'/uploads', 0770, true);
62 62
 			}
63 63
 
64 64
 			return [
65
-				new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/cache', ['datadir' => $cacheDir, $loader]),
66
-				new MountPoint('\OC\Files\Storage\Local', '/' . $user->getUID() . '/uploads', ['datadir' => $cacheDir . '/uploads', $loader])
65
+				new MountPoint('\OC\Files\Storage\Local', '/'.$user->getUID().'/cache', ['datadir' => $cacheDir, $loader]),
66
+				new MountPoint('\OC\Files\Storage\Local', '/'.$user->getUID().'/uploads', ['datadir' => $cacheDir.'/uploads', $loader])
67 67
 			];
68 68
 		} else {
69 69
 			return [];
Please login to merge, or discard this patch.
core/Command/Db/ConvertFilecacheBigInt.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
 					$column->setType(Type::getType(Type::BIGINT));
80 80
 					$column->setOptions(['length' => 20]);
81 81
 
82
-					$updates[] = $tableName . '.' . $columnName;
82
+					$updates[] = $tableName.'.'.$columnName;
83 83
 				}
84 84
 			}
85 85
 		}
Please login to merge, or discard this patch.
apps/dav/lib/CalDAV/Activity/Backend.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
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
 						'actor' => $currentUser,
139 139
 						'calendar' => [
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 					$event,
187 187
 					$calendarData,
188 188
 					Calendar::SUBJECT_UNSHARE_USER,
189
-					Calendar::SUBJECT_DELETE . '_self'
189
+					Calendar::SUBJECT_DELETE.'_self'
190 190
 				);
191 191
 
192 192
 				if ($owner !== $principal[2]) {
@@ -201,15 +201,15 @@  discard block
 block discarded – undo
201 201
 					];
202 202
 
203 203
 					if ($owner === $event->getAuthor()) {
204
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_you';
204
+						$subject = Calendar::SUBJECT_UNSHARE_USER.'_you';
205 205
 					} else if ($principal[2] === $event->getAuthor()) {
206
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_self';
206
+						$subject = Calendar::SUBJECT_UNSHARE_USER.'_self';
207 207
 					} else {
208 208
 						$event->setAffectedUser($event->getAuthor())
209
-							->setSubject(Calendar::SUBJECT_UNSHARE_USER . '_you', $parameters);
209
+							->setSubject(Calendar::SUBJECT_UNSHARE_USER.'_you', $parameters);
210 210
 						$this->activityManager->publish($event);
211 211
 
212
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_by';
212
+						$subject = Calendar::SUBJECT_UNSHARE_USER.'_by';
213 213
 					}
214 214
 
215 215
 					$event->setAffectedUser($owner)
@@ -230,13 +230,13 @@  discard block
 block discarded – undo
230 230
 				];
231 231
 
232 232
 				if ($owner === $event->getAuthor()) {
233
-					$subject = Calendar::SUBJECT_UNSHARE_GROUP . '_you';
233
+					$subject = Calendar::SUBJECT_UNSHARE_GROUP.'_you';
234 234
 				} else {
235 235
 					$event->setAffectedUser($event->getAuthor())
236
-						->setSubject(Calendar::SUBJECT_UNSHARE_GROUP . '_you', $parameters);
236
+						->setSubject(Calendar::SUBJECT_UNSHARE_GROUP.'_you', $parameters);
237 237
 					$this->activityManager->publish($event);
238 238
 
239
-					$subject = Calendar::SUBJECT_UNSHARE_GROUP . '_by';
239
+					$subject = Calendar::SUBJECT_UNSHARE_GROUP.'_by';
240 240
 				}
241 241
 
242 242
 				$event->setAffectedUser($owner)
@@ -272,13 +272,13 @@  discard block
 block discarded – undo
272 272
 					];
273 273
 
274 274
 					if ($owner === $event->getAuthor()) {
275
-						$subject = Calendar::SUBJECT_SHARE_USER . '_you';
275
+						$subject = Calendar::SUBJECT_SHARE_USER.'_you';
276 276
 					} else {
277 277
 						$event->setAffectedUser($event->getAuthor())
278
-							->setSubject(Calendar::SUBJECT_SHARE_USER . '_you', $parameters);
278
+							->setSubject(Calendar::SUBJECT_SHARE_USER.'_you', $parameters);
279 279
 						$this->activityManager->publish($event);
280 280
 
281
-						$subject = Calendar::SUBJECT_SHARE_USER . '_by';
281
+						$subject = Calendar::SUBJECT_SHARE_USER.'_by';
282 282
 					}
283 283
 
284 284
 					$event->setAffectedUser($owner)
@@ -299,13 +299,13 @@  discard block
 block discarded – undo
299 299
 				];
300 300
 
301 301
 				if ($owner === $event->getAuthor()) {
302
-					$subject = Calendar::SUBJECT_SHARE_GROUP . '_you';
302
+					$subject = Calendar::SUBJECT_SHARE_GROUP.'_you';
303 303
 				} else {
304 304
 					$event->setAffectedUser($event->getAuthor())
305
-						->setSubject(Calendar::SUBJECT_SHARE_GROUP . '_you', $parameters);
305
+						->setSubject(Calendar::SUBJECT_SHARE_GROUP.'_you', $parameters);
306 306
 					$this->activityManager->publish($event);
307 307
 
308
-					$subject = Calendar::SUBJECT_SHARE_GROUP . '_by';
308
+					$subject = Calendar::SUBJECT_SHARE_GROUP.'_by';
309 309
 				}
310 310
 
311 311
 				$event->setAffectedUser($owner)
@@ -403,7 +403,7 @@  discard block
 block discarded – undo
403 403
 		}
404 404
 
405 405
 		$object = $this->getObjectNameAndType($objectData);
406
-		$action = $action . '_' . $object['type'];
406
+		$action = $action.'_'.$object['type'];
407 407
 
408 408
 		if ($object['type'] === 'todo' && strpos($action, Event::SUBJECT_OBJECT_UPDATE) === 0 && $object['status'] === 'COMPLETED') {
409 409
 			$action .= '_completed';
@@ -423,7 +423,7 @@  discard block
 block discarded – undo
423 423
 		foreach ($users as $user) {
424 424
 			$event->setAffectedUser($user)
425 425
 				->setSubject(
426
-					$user === $currentUser ? $action . '_self' : $action,
426
+					$user === $currentUser ? $action.'_self' : $action,
427 427
 					[
428 428
 						'actor' => $event->getAuthor(),
429 429
 						'calendar' => [
@@ -448,7 +448,7 @@  discard block
 block discarded – undo
448 448
 	protected function getObjectNameAndType(array $objectData) {
449 449
 		$vObject = Reader::read($objectData['calendardata']);
450 450
 		$component = $componentType = null;
451
-		foreach($vObject->getComponents() as $component) {
451
+		foreach ($vObject->getComponents() as $component) {
452 452
 			if (in_array($component->name, ['VEVENT', 'VTODO'])) {
453 453
 				$componentType = $component->name;
454 454
 				break;
Please login to merge, or discard this patch.
apps/files_sharing/composer/composer/autoload_psr4.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,5 +6,5 @@
 block discarded – undo
6 6
 $baseDir = $vendorDir;
7 7
 
8 8
 return array(
9
-    'OCA\\Files_Sharing\\' => array($baseDir . '/../lib'),
9
+    'OCA\\Files_Sharing\\' => array($baseDir.'/../lib'),
10 10
 );
Please login to merge, or discard this patch.
apps/admin_audit/composer/composer/autoload_psr4.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,5 +6,5 @@
 block discarded – undo
6 6
 $baseDir = $vendorDir;
7 7
 
8 8
 return array(
9
-    'OCA\\AdminAudit\\' => array($baseDir . '/../lib'),
9
+    'OCA\\AdminAudit\\' => array($baseDir.'/../lib'),
10 10
 );
Please login to merge, or discard this patch.
apps/dav/composer/composer/autoload_psr4.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,5 +6,5 @@
 block discarded – undo
6 6
 $baseDir = $vendorDir;
7 7
 
8 8
 return array(
9
-    'OCA\\DAV\\' => array($baseDir . '/../lib'),
9
+    'OCA\\DAV\\' => array($baseDir.'/../lib'),
10 10
 );
Please login to merge, or discard this patch.
apps/comments/composer/composer/autoload_psr4.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,5 +6,5 @@
 block discarded – undo
6 6
 $baseDir = $vendorDir;
7 7
 
8 8
 return array(
9
-    'OCA\\Comments\\' => array($baseDir . '/../lib'),
9
+    'OCA\\Comments\\' => array($baseDir.'/../lib'),
10 10
 );
Please login to merge, or discard this patch.
lib/private/Remote/Instance.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 	 * @return string The of of the remote server with protocol
66 66
 	 */
67 67
 	public function getFullUrl() {
68
-		return $this->getProtocol() . '://' . $this->getUrl();
68
+		return $this->getProtocol().'://'.$this->getUrl();
69 69
 	}
70 70
 
71 71
 	/**
@@ -103,17 +103,17 @@  discard block
 block discarded – undo
103 103
 		if ($this->status) {
104 104
 			return $this->status;
105 105
 		}
106
-		$key = 'remote/' . $this->url . '/status';
107
-		$httpsKey = 'remote/' . $this->url . '/https';
106
+		$key = 'remote/'.$this->url.'/status';
107
+		$httpsKey = 'remote/'.$this->url.'/https';
108 108
 		$status = $this->cache->get($key);
109 109
 		if (!$status) {
110
-			$response = $this->downloadStatus('https://' . $this->getUrl() . '/status.php');
110
+			$response = $this->downloadStatus('https://'.$this->getUrl().'/status.php');
111 111
 			$protocol = 'https';
112 112
 			if (!$response) {
113 113
 				if ($status = $this->cache->get($httpsKey)) {
114
-					throw new \Exception('refusing to connect to remote instance(' . $this->url . ') over http that was previously accessible over https');
114
+					throw new \Exception('refusing to connect to remote instance('.$this->url.') over http that was previously accessible over https');
115 115
 				}
116
-				$response = $this->downloadStatus('http://' . $this->getUrl() . '/status.php');
116
+				$response = $this->downloadStatus('http://'.$this->getUrl().'/status.php');
117 117
 				$protocol = 'http';
118 118
 			} else {
119 119
 				$this->cache->set($httpsKey, true, 60 * 60 * 24 * 365);
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 				$this->cache->set($key, $status, 5 * 60);
127 127
 				$this->status = $status;
128 128
 			} else {
129
-				throw new NotFoundException('Remote server not found at address ' . $this->url);
129
+				throw new NotFoundException('Remote server not found at address '.$this->url);
130 130
 			}
131 131
 		}
132 132
 		return $status;
Please login to merge, or discard this patch.