Completed
Pull Request — master (#3813)
by Maxence
55:24
created
apps/files_sharing/lib/Migration.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 		$stmt = $this->getReShares();
69 69
 
70 70
 		$owners = [];
71
-		while($share = $stmt->fetch()) {
71
+		while ($share = $stmt->fetch()) {
72 72
 
73 73
 			$this->shareCache[$share['id']] = $share;
74 74
 
@@ -131,11 +131,11 @@  discard block
 block discarded – undo
131 131
 	 */
132 132
 	private function findOwner($share) {
133 133
 		$currentShare = $share;
134
-		while(!is_null($currentShare['parent'])) {
134
+		while (!is_null($currentShare['parent'])) {
135 135
 			if (isset($this->shareCache[$currentShare['parent']])) {
136 136
 				$currentShare = $this->shareCache[$currentShare['parent']];
137 137
 			} else {
138
-				$currentShare = $this->getShare((int)$currentShare['parent']);
138
+				$currentShare = $this->getShare((int) $currentShare['parent']);
139 139
 				$this->shareCache[$currentShare['id']] = $currentShare;
140 140
 			}
141 141
 		}
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
 
183 183
 		$ordered = [];
184 184
 		foreach ($shares as $share) {
185
-			$ordered[(int)$share['id']] = $share;
185
+			$ordered[(int) $share['id']] = $share;
186 186
 		}
187 187
 
188 188
 		return $ordered;
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 
227 227
 		$ordered = [];
228 228
 		foreach ($shares as $share) {
229
-			$ordered[(int)$share['id']] = $share;
229
+			$ordered[(int) $share['id']] = $share;
230 230
 		}
231 231
 
232 232
 		return $ordered;
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
 					->set('uid_initiator', $query->createNamedParameter($owner['initiator']));
270 270
 
271 271
 
272
-				if ((int)$owner['type'] !== \OCP\Share::SHARE_TYPE_LINK) {
272
+				if ((int) $owner['type'] !== \OCP\Share::SHARE_TYPE_LINK) {
273 273
 					$query->set('parent', $query->createNamedParameter(null));
274 274
 				}
275 275
 
Please login to merge, or discard this patch.
apps/files_sharing/lib/ExpireSharesJob.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@
 block discarded – undo
68 68
 			);
69 69
 
70 70
 		$shares = $qb->execute();
71
-		while($share = $shares->fetch()) {
71
+		while ($share = $shares->fetch()) {
72 72
 			\OCP\Share::unshare($share['item_type'], $share['file_source'], \OCP\Share::SHARE_TYPE_LINK, null, $share['uid_owner']);
73 73
 		}
74 74
 		$shares->closeCursor();
Please login to merge, or discard this patch.
apps/files_sharing/lib/Controller/ExternalSharesController.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -131,15 +131,15 @@
 block discarded – undo
131 131
 	 */
132 132
 	public function testRemote($remote) {
133 133
 		if (
134
-			$this->testUrl('https://' . $remote . '/ocs-provider/') ||
135
-			$this->testUrl('https://' . $remote . '/ocs-provider/index.php') ||
136
-			$this->testUrl('https://' . $remote . '/status.php', true)
134
+			$this->testUrl('https://'.$remote.'/ocs-provider/') ||
135
+			$this->testUrl('https://'.$remote.'/ocs-provider/index.php') ||
136
+			$this->testUrl('https://'.$remote.'/status.php', true)
137 137
 		) {
138 138
 			return new DataResponse('https');
139 139
 		} elseif (
140
-			$this->testUrl('http://' . $remote . '/ocs-provider/') ||
141
-			$this->testUrl('http://' . $remote . '/ocs-provider/index.php') ||
142
-			$this->testUrl('http://' . $remote . '/status.php', true)
140
+			$this->testUrl('http://'.$remote.'/ocs-provider/') ||
141
+			$this->testUrl('http://'.$remote.'/ocs-provider/index.php') ||
142
+			$this->testUrl('http://'.$remote.'/status.php', true)
143 143
 		) {
144 144
 			return new DataResponse('http');
145 145
 		} else {
Please login to merge, or discard this patch.
apps/files_sharing/lib/Controller/RemoteController.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 	 * @return array enriched share info with data from the filecache
110 110
 	 */
111 111
 	private static function extendShareInfo($share) {
112
-		$view = new \OC\Files\View('/' . \OC_User::getUser() . '/files/');
112
+		$view = new \OC\Files\View('/'.\OC_User::getUser().'/files/');
113 113
 		$info = $view->getFileInfo($share['mountpoint']);
114 114
 
115 115
 		$share['mimetype'] = $info->getMimetype();
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 			throw new OCSNotFoundException('Share does not exist');
173 173
 		}
174 174
 
175
-		$mountPoint = '/' . \OC_User::getUser() . '/files' . $shareInfo['mountpoint'];
175
+		$mountPoint = '/'.\OC_User::getUser().'/files'.$shareInfo['mountpoint'];
176 176
 
177 177
 		if ($this->externalManager->removeShare($mountPoint) === true) {
178 178
 			return new DataResponse();
Please login to merge, or discard this patch.
apps/files_sharing/lib/Controller/ShareController.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 	public function showAuthenticate($token) {
151 151
 		$share = $this->shareManager->getShareByToken($token);
152 152
 
153
-		if($this->linkShareAuth($share)) {
153
+		if ($this->linkShareAuth($share)) {
154 154
 			return new RedirectResponse($this->urlGenerator->linkToRoute('files_sharing.sharecontroller.showShare', array('token' => $token)));
155 155
 		}
156 156
 
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 
179 179
 		$authenticate = $this->linkShareAuth($share, $password);
180 180
 
181
-		if($authenticate === true) {
181
+		if ($authenticate === true) {
182 182
 			return new RedirectResponse($this->urlGenerator->linkToRoute('files_sharing.sharecontroller.showShare', array('token' => $token)));
183 183
 		}
184 184
 
@@ -199,15 +199,15 @@  discard block
 block discarded – undo
199 199
 	private function linkShareAuth(\OCP\Share\IShare $share, $password = null) {
200 200
 		if ($password !== null) {
201 201
 			if ($this->shareManager->checkPassword($share, $password)) {
202
-				$this->session->set('public_link_authenticated', (string)$share->getId());
202
+				$this->session->set('public_link_authenticated', (string) $share->getId());
203 203
 			} else {
204 204
 				$this->emitAccessShareHook($share, 403, 'Wrong password');
205 205
 				return false;
206 206
 			}
207 207
 		} else {
208 208
 			// not authenticated ?
209
-			if ( ! $this->session->exists('public_link_authenticated')
210
-				|| $this->session->get('public_link_authenticated') !== (string)$share->getId()) {
209
+			if (!$this->session->exists('public_link_authenticated')
210
+				|| $this->session->get('public_link_authenticated') !== (string) $share->getId()) {
211 211
 				return false;
212 212
 			}
213 213
 		}
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
 		$itemType = $itemSource = $uidOwner = '';
229 229
 		$token = $share;
230 230
 		$exception = null;
231
-		if($share instanceof \OCP\Share\IShare) {
231
+		if ($share instanceof \OCP\Share\IShare) {
232 232
 			try {
233 233
 				$token = $share->getToken();
234 234
 				$uidOwner = $share->getSharedBy();
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
 			'errorCode' => $errorCode,
248 248
 			'errorMessage' => $errorMessage,
249 249
 		]);
250
-		if(!is_null($exception)) {
250
+		if (!is_null($exception)) {
251 251
 			throw $exception;
252 252
 		}
253 253
 	}
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
340 340
 			if ($freeSpace < \OCP\Files\FileInfo::SPACE_UNLIMITED) {
341 341
 				$freeSpace = max($freeSpace, 0);
342 342
 			} else {
343
-				$freeSpace = (INF > 0) ? INF: PHP_INT_MAX; // work around https://bugs.php.net/bug.php?id=69188
343
+				$freeSpace = (INF > 0) ? INF : PHP_INT_MAX; // work around https://bugs.php.net/bug.php?id=69188
344 344
 			}
345 345
 
346 346
 			$hideFileList = $share->getPermissions() & \OCP\Constants::PERMISSION_READ ? false : true;
@@ -371,7 +371,7 @@  discard block
 block discarded – undo
371 371
 		$shareTmpl['previewMaxY'] = $this->config->getSystemValue('preview_max_y', 1024);
372 372
 		$shareTmpl['disclaimer'] = $this->config->getAppValue('core', 'shareapi_public_link_disclaimertext', null);
373 373
 		if ($shareTmpl['previewSupported']) {
374
-			$shareTmpl['previewImage'] = $this->urlGenerator->linkToRouteAbsolute( 'files_sharing.PublicPreview.getPreview',
374
+			$shareTmpl['previewImage'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.PublicPreview.getPreview',
375 375
 				['x' => 200, 'y' => 200, 'file' => $shareTmpl['directory_path'], 't' => $shareTmpl['dirToken']]);
376 376
 		} else {
377 377
 			$shareTmpl['previewImage'] = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'favicon-fb.png'));
@@ -401,7 +401,7 @@  discard block
 block discarded – undo
401 401
 		}
402 402
 
403 403
 		// OpenGraph Support: http://ogp.me/
404
-		\OCP\Util::addHeader('meta', ['property' => "og:title", 'content' => $this->defaults->getName() . ' - ' . $this->defaults->getSlogan()]);
404
+		\OCP\Util::addHeader('meta', ['property' => "og:title", 'content' => $this->defaults->getName().' - '.$this->defaults->getSlogan()]);
405 405
 		\OCP\Util::addHeader('meta', ['property' => "og:description", 'content' => $this->l10n->t('%s is publicly shared', [$shareTmpl['filename']])]);
406 406
 		\OCP\Util::addHeader('meta', ['property' => "og:site_name", 'content' => $this->defaults->getName()]);
407 407
 		\OCP\Util::addHeader('meta', ['property' => "og:url", 'content' => $shareTmpl['shareUrl']]);
@@ -436,7 +436,7 @@  discard block
 block discarded – undo
436 436
 
437 437
 		$share = $this->shareManager->getShareByToken($token);
438 438
 
439
-		if(!($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
439
+		if (!($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) {
440 440
 			return new \OCP\AppFramework\Http\DataResponse('Share is read-only');
441 441
 		}
442 442
 
@@ -514,7 +514,7 @@  discard block
 block discarded – undo
514 514
 
515 515
 		$this->emitAccessShareHook($share);
516 516
 
517
-		$server_params = array( 'head' => $this->request->getMethod() == 'HEAD' );
517
+		$server_params = array('head' => $this->request->getMethod() == 'HEAD');
518 518
 
519 519
 		/**
520 520
 		 * Http range requests support
Please login to merge, or discard this patch.
apps/files_sharing/lib/ISharedStorage.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,6 +23,6 @@
 block discarded – undo
23 23
 
24 24
 namespace OCA\Files_Sharing;
25 25
 
26
-interface ISharedStorage{
26
+interface ISharedStorage {
27 27
 
28 28
 }
Please login to merge, or discard this patch.
apps/files_sharing/lib/AppInfo/Application.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 		/**
51 51
 		 * Controllers
52 52
 		 */
53
-		$container->registerService('ShareController', function (SimpleContainer $c) use ($server) {
53
+		$container->registerService('ShareController', function(SimpleContainer $c) use ($server) {
54 54
 			$federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application();
55 55
 			return new ShareController(
56 56
 				$c->query('AppName'),
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 				$server->getThemingDefaults()
71 71
 			);
72 72
 		});
73
-		$container->registerService('ExternalSharesController', function (SimpleContainer $c) {
73
+		$container->registerService('ExternalSharesController', function(SimpleContainer $c) {
74 74
 			return new ExternalSharesController(
75 75
 				$c->query('AppName'),
76 76
 				$c->query('Request'),
@@ -82,13 +82,13 @@  discard block
 block discarded – undo
82 82
 		/**
83 83
 		 * Core class wrappers
84 84
 		 */
85
-		$container->registerService('HttpClientService', function (SimpleContainer $c) use ($server) {
85
+		$container->registerService('HttpClientService', function(SimpleContainer $c) use ($server) {
86 86
 			return $server->getHTTPClientService();
87 87
 		});
88
-		$container->registerService(ICloudIdManager::class, function (SimpleContainer $c) use ($server) {
88
+		$container->registerService(ICloudIdManager::class, function(SimpleContainer $c) use ($server) {
89 89
 			return $server->getCloudIdManager();
90 90
 		});
91
-		$container->registerService('ExternalManager', function (SimpleContainer $c) use ($server) {
91
+		$container->registerService('ExternalManager', function(SimpleContainer $c) use ($server) {
92 92
 			$user = $server->getUserSession()->getUser();
93 93
 			$uid = $user ? $user->getUID() : null;
94 94
 			$discoveryManager = new DiscoveryManager(
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 		/**
111 111
 		 * Middleware
112 112
 		 */
113
-		$container->registerService('SharingCheckMiddleware', function (SimpleContainer $c) use ($server) {
113
+		$container->registerService('SharingCheckMiddleware', function(SimpleContainer $c) use ($server) {
114 114
 			return new SharingCheckMiddleware(
115 115
 				$c->query('AppName'),
116 116
 				$server->getConfig(),
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 			);
122 122
 		});
123 123
 
124
-		$container->registerService('OCSShareAPIMiddleware', function (SimpleContainer $c) use ($server) {
124
+		$container->registerService('OCSShareAPIMiddleware', function(SimpleContainer $c) use ($server) {
125 125
 			return new OCSShareAPIMiddleware(
126 126
 				$server->getShareManager(),
127 127
 				$server->getL10N($c->query('AppName'))
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 		$container->registerMiddleWare('SharingCheckMiddleware');
133 133
 		$container->registerMiddleWare('OCSShareAPIMiddleware');
134 134
 
135
-		$container->registerService('MountProvider', function (IContainer $c) {
135
+		$container->registerService('MountProvider', function(IContainer $c) {
136 136
 			/** @var \OCP\IServerContainer $server */
137 137
 			$server = $c->query('ServerContainer');
138 138
 			return new MountProvider(
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
 			);
143 143
 		});
144 144
 
145
-		$container->registerService('ExternalMountProvider', function (IContainer $c) {
145
+		$container->registerService('ExternalMountProvider', function(IContainer $c) {
146 146
 			/** @var \OCP\IServerContainer $server */
147 147
 			$server = $c->query('ServerContainer');
148 148
 			return new \OCA\Files_Sharing\External\MountProvider(
Please login to merge, or discard this patch.
apps/files_sharing/lib/External/Scanner.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 
38 38
 	/** {@inheritDoc} */
39 39
 	public function scan($path, $recursive = self::SCAN_RECURSIVE, $reuse = -1, $lock = true) {
40
-		if(!$this->storage->remoteIsOwnCloud()) {
40
+		if (!$this->storage->remoteIsOwnCloud()) {
41 41
 			return parent::scan($path, $recursive, $recursive, $lock);
42 42
 		}
43 43
 
@@ -88,8 +88,8 @@  discard block
 block discarded – undo
88 88
 		} catch (\Exception $e) {
89 89
 			$this->storage->checkStorageAvailability();
90 90
 			throw new \Exception(
91
-				'Error while scanning remote share: "' .
92
-				$this->storage->getRemote() . '" ' .
91
+				'Error while scanning remote share: "'.
92
+				$this->storage->getRemote().'" '.
93 93
 				$e->getMessage()
94 94
 			);
95 95
 		}
@@ -97,8 +97,8 @@  discard block
 block discarded – undo
97 97
 			$this->addResult($data['data'], '');
98 98
 		} else {
99 99
 			throw new \Exception(
100
-				'Error while scanning remote share: "' .
101
-				$this->storage->getRemote() . '"'
100
+				'Error while scanning remote share: "'.
101
+				$this->storage->getRemote().'"'
102 102
 			);
103 103
 		}
104 104
 	}
@@ -113,14 +113,14 @@  discard block
 block discarded – undo
113 113
 			$children = [];
114 114
 			foreach ($data['children'] as $child) {
115 115
 				$children[$child['name']] = true;
116
-				$this->addResult($child, ltrim($path . '/' . $child['name'], '/'));
116
+				$this->addResult($child, ltrim($path.'/'.$child['name'], '/'));
117 117
 			}
118 118
 
119 119
 			$existingCache = $this->cache->getFolderContentsById($id);
120 120
 			foreach ($existingCache as $existingChild) {
121 121
 				// if an existing child is not in the new data, remove it
122 122
 				if (!isset($children[$existingChild['name']])) {
123
-					$this->cache->remove(ltrim($path . '/' . $existingChild['name'], '/'));
123
+					$this->cache->remove(ltrim($path.'/'.$existingChild['name'], '/'));
124 124
 				}
125 125
 			}
126 126
 		}
Please login to merge, or discard this patch.
apps/files_sharing/lib/External/Storage.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 			$root = '';
81 81
 		}
82 82
 		$secure = $protocol === 'https';
83
-		$root = rtrim($root, '/') . $discoveryManager->getWebDavEndpoint($this->cloudId->getRemote());
83
+		$root = rtrim($root, '/').$discoveryManager->getWebDavEndpoint($this->cloudId->getRemote());
84 84
 		$this->mountPoint = $options['mountpoint'];
85 85
 		$this->token = $options['token'];
86 86
 		parent::__construct(array(
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 			'host' => $host,
89 89
 			'root' => $root,
90 90
 			'user' => $options['token'],
91
-			'password' => (string)$options['password']
91
+			'password' => (string) $options['password']
92 92
 		));
93 93
 	}
94 94
 
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 	 * @return string
129 129
 	 */
130 130
 	public function getId() {
131
-		return 'shared::' . md5($this->token . '@' . $this->getRemote());
131
+		return 'shared::'.md5($this->token.'@'.$this->getRemote());
132 132
 	}
133 133
 
134 134
 	public function getCache($path = '', $storage = null) {
@@ -249,9 +249,9 @@  discard block
 block discarded – undo
249 249
 	 */
250 250
 	protected function testRemote() {
251 251
 		try {
252
-			return $this->testRemoteUrl($this->getRemote() . '/ocs-provider/index.php')
253
-				|| $this->testRemoteUrl($this->getRemote() . '/ocs-provider/')
254
-				|| $this->testRemoteUrl($this->getRemote() . '/status.php');
252
+			return $this->testRemoteUrl($this->getRemote().'/ocs-provider/index.php')
253
+				|| $this->testRemoteUrl($this->getRemote().'/ocs-provider/')
254
+				|| $this->testRemoteUrl($this->getRemote().'/status.php');
255 255
 		} catch (\Exception $e) {
256 256
 			return false;
257 257
 		}
@@ -263,8 +263,8 @@  discard block
 block discarded – undo
263 263
 	 */
264 264
 	private function testRemoteUrl($url) {
265 265
 		$cache = $this->memcacheFactory->create('files_sharing_remote_url');
266
-		if($cache->hasKey($url)) {
267
-			return (bool)$cache->get($url);
266
+		if ($cache->hasKey($url)) {
267
+			return (bool) $cache->get($url);
268 268
 		}
269 269
 
270 270
 		$client = $this->httpClient->newClient();
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
 	 * @return bool
293 293
 	 */
294 294
 	public function remoteIsOwnCloud() {
295
-		if(defined('PHPUNIT_RUN') || !$this->testRemoteUrl($this->getRemote() . '/status.php')) {
295
+		if (defined('PHPUNIT_RUN') || !$this->testRemoteUrl($this->getRemote().'/status.php')) {
296 296
 			return false;
297 297
 		}
298 298
 		return true;
@@ -310,11 +310,11 @@  discard block
 block discarded – undo
310 310
 		$password = $this->getPassword();
311 311
 
312 312
 		// If remote is not an ownCloud do not try to get any share info
313
-		if(!$this->remoteIsOwnCloud()) {
313
+		if (!$this->remoteIsOwnCloud()) {
314 314
 			return ['status' => 'unsupported'];
315 315
 		}
316 316
 
317
-		$url = rtrim($remote, '/') . '/index.php/apps/files_sharing/shareinfo?t=' . $token;
317
+		$url = rtrim($remote, '/').'/index.php/apps/files_sharing/shareinfo?t='.$token;
318 318
 
319 319
 		// TODO: DI
320 320
 		$client = \OC::$server->getHTTPClientService()->newClient();
Please login to merge, or discard this patch.