@@ -15,14 +15,14 @@ |
||
| 15 | 15 | <tr> |
| 16 | 16 | <th id='headerName' class="hidden column-name"> |
| 17 | 17 | <div id="headerName-container"> |
| 18 | - <a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a> |
|
| 18 | + <a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a> |
|
| 19 | 19 | </div> |
| 20 | 20 | </th> |
| 21 | 21 | <th id="headerDate" class="hidden column-mtime"> |
| 22 | - <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Share time' )); ?></span><span class="sort-indicator"></span></a> |
|
| 22 | + <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Share time')); ?></span><span class="sort-indicator"></span></a> |
|
| 23 | 23 | </th> |
| 24 | 24 | <th class="hidden column-expiration"> |
| 25 | - <a class="columntitle"><span><?php p($l->t( 'Expiration date' )); ?></span></a> |
|
| 25 | + <a class="columntitle"><span><?php p($l->t('Expiration date')); ?></span></a> |
|
| 26 | 26 | </th> |
| 27 | 27 | </tr> |
| 28 | 28 | </thead> |
@@ -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 @@ |
||
| 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 { |
@@ -23,6 +23,6 @@ |
||
| 23 | 23 | |
| 24 | 24 | namespace OCA\Files_Sharing; |
| 25 | 25 | |
| 26 | -interface ISharedStorage{ |
|
| 26 | +interface ISharedStorage { |
|
| 27 | 27 | |
| 28 | 28 | } |
@@ -37,7 +37,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 | } |
@@ -61,7 +61,7 @@ |
||
| 61 | 61 | $managerProvider = $this->managerProvider; |
| 62 | 62 | $manager = $managerProvider(); |
| 63 | 63 | $data['manager'] = $manager; |
| 64 | - $mountPoint = '/' . $user->getUID() . '/files/' . ltrim($data['mountpoint'], '/'); |
|
| 64 | + $mountPoint = '/'.$user->getUID().'/files/'.ltrim($data['mountpoint'], '/'); |
|
| 65 | 65 | $data['mountpoint'] = $mountPoint; |
| 66 | 66 | $data['cloudId'] = $this->cloudIdManager->getCloudId($data['owner'], $data['remote']); |
| 67 | 67 | $data['certificateManager'] = \OC::$server->getCertificateManager($user->getUID()); |
@@ -90,11 +90,11 @@ |
||
| 90 | 90 | */ |
| 91 | 91 | static private function renameChildren($oldPath, $newPath) { |
| 92 | 92 | |
| 93 | - $absNewPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files/' . $newPath); |
|
| 94 | - $absOldPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files/' . $oldPath); |
|
| 93 | + $absNewPath = \OC\Files\Filesystem::normalizePath('/'.\OCP\User::getUser().'/files/'.$newPath); |
|
| 94 | + $absOldPath = \OC\Files\Filesystem::normalizePath('/'.\OCP\User::getUser().'/files/'.$oldPath); |
|
| 95 | 95 | |
| 96 | 96 | $mountManager = \OC\Files\Filesystem::getMountManager(); |
| 97 | - $mountedShares = $mountManager->findIn('/' . \OCP\User::getUser() . '/files/' . $oldPath); |
|
| 97 | + $mountedShares = $mountManager->findIn('/'.\OCP\User::getUser().'/files/'.$oldPath); |
|
| 98 | 98 | foreach ($mountedShares as $mount) { |
| 99 | 99 | if ($mount->getStorage()->instanceOfStorage('OCA\Files_Sharing\ISharedStorage')) { |
| 100 | 100 | $mountPoint = $mount->getMountPoint(); |