@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | if (!$isWritable) { |
66 | 66 | // FIXME: should not add storage wrappers outside of preSetup, need to find a better way |
67 | 67 | $previousLog = \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper(false); |
68 | - \OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) { |
|
68 | + \OC\Files\Filesystem::addStorageWrapper('readonly', function($mountPoint, $storage) { |
|
69 | 69 | return new \OC\Files\Storage\Wrapper\PermissionsMask(array('storage' => $storage, 'mask' => \OCP\Constants::PERMISSION_READ + \OCP\Constants::PERMISSION_SHARE)); |
70 | 70 | }); |
71 | 71 | \OC\Files\Filesystem::logWarningWhenAddingStorageWrapper($previousLog); |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | $rootInfo = \OC\Files\Filesystem::getFileInfo($path); |
75 | 75 | $rootView = new \OC\Files\View(''); |
76 | 76 | |
77 | -if($rootInfo === false || !($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) { |
|
77 | +if ($rootInfo === false || !($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) { |
|
78 | 78 | OCP\JSON::error(array('data' => 'Share is not readable.')); |
79 | 79 | exit(); |
80 | 80 | } |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | $formatted['children'] = getChildInfo($child, $view, $sharePermissions); |
94 | 94 | } |
95 | 95 | $formatted['mtime'] = $formatted['mtime'] / 1000; |
96 | - $formatted['permissions'] = $sharePermissions & (int)$formatted['permissions']; |
|
96 | + $formatted['permissions'] = $sharePermissions & (int) $formatted['permissions']; |
|
97 | 97 | $result[] = $formatted; |
98 | 98 | } |
99 | 99 | return $result; |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | |
102 | 102 | $result = \OCA\Files\Helper::formatFileInfo($rootInfo); |
103 | 103 | $result['mtime'] = $result['mtime'] / 1000; |
104 | -$result['permissions'] = (int)$result['permissions'] & $share->getPermissions(); |
|
104 | +$result['permissions'] = (int) $result['permissions'] & $share->getPermissions(); |
|
105 | 105 | |
106 | 106 | |
107 | 107 | if ($rootInfo->getType() === 'dir') { |
@@ -140,7 +140,7 @@ |
||
140 | 140 | return [ |
141 | 141 | 'type' => 'user', |
142 | 142 | 'id' => $remoteUser->getUser(), |
143 | - 'name' => $cloudId,// Todo display name from contacts |
|
143 | + 'name' => $cloudId, // Todo display name from contacts |
|
144 | 144 | 'server' => $remoteUser->getRemote(), |
145 | 145 | ]; |
146 | 146 | } |
@@ -68,7 +68,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
@@ -68,7 +68,7 @@ |
||
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(); |
@@ -131,15 +131,15 @@ |
||
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 { |
@@ -109,7 +109,7 @@ discard block |
||
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 |
||
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(); |
@@ -150,7 +150,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
@@ -23,6 +23,6 @@ |
||
23 | 23 | |
24 | 24 | namespace OCA\Files_Sharing; |
25 | 25 | |
26 | -interface ISharedStorage{ |
|
26 | +interface ISharedStorage { |
|
27 | 27 | |
28 | 28 | } |
@@ -50,7 +50,7 @@ discard block |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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 |
||
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( |