@@ -31,36 +31,36 @@ |
||
31 | 31 | */ |
32 | 32 | class DeleteOrphanedSharesJob extends TimedJob { |
33 | 33 | |
34 | - /** |
|
35 | - * Default interval in minutes |
|
36 | - * |
|
37 | - * @var int $defaultIntervalMin |
|
38 | - **/ |
|
39 | - protected $defaultIntervalMin = 15; |
|
34 | + /** |
|
35 | + * Default interval in minutes |
|
36 | + * |
|
37 | + * @var int $defaultIntervalMin |
|
38 | + **/ |
|
39 | + protected $defaultIntervalMin = 15; |
|
40 | 40 | |
41 | - /** |
|
42 | - * sets the correct interval for this timed job |
|
43 | - */ |
|
44 | - public function __construct(){ |
|
45 | - $this->interval = $this->defaultIntervalMin * 60; |
|
46 | - } |
|
41 | + /** |
|
42 | + * sets the correct interval for this timed job |
|
43 | + */ |
|
44 | + public function __construct(){ |
|
45 | + $this->interval = $this->defaultIntervalMin * 60; |
|
46 | + } |
|
47 | 47 | |
48 | - /** |
|
49 | - * Makes the background job do its work |
|
50 | - * |
|
51 | - * @param array $argument unused argument |
|
52 | - */ |
|
53 | - public function run($argument) { |
|
54 | - $connection = \OC::$server->getDatabaseConnection(); |
|
55 | - $logger = \OC::$server->getLogger(); |
|
48 | + /** |
|
49 | + * Makes the background job do its work |
|
50 | + * |
|
51 | + * @param array $argument unused argument |
|
52 | + */ |
|
53 | + public function run($argument) { |
|
54 | + $connection = \OC::$server->getDatabaseConnection(); |
|
55 | + $logger = \OC::$server->getLogger(); |
|
56 | 56 | |
57 | - $sql = |
|
58 | - 'DELETE FROM `*PREFIX*share` ' . |
|
59 | - 'WHERE `item_type` in (\'file\', \'folder\') ' . |
|
60 | - 'AND NOT EXISTS (SELECT `fileid` FROM `*PREFIX*filecache` WHERE `file_source` = `fileid`)'; |
|
57 | + $sql = |
|
58 | + 'DELETE FROM `*PREFIX*share` ' . |
|
59 | + 'WHERE `item_type` in (\'file\', \'folder\') ' . |
|
60 | + 'AND NOT EXISTS (SELECT `fileid` FROM `*PREFIX*filecache` WHERE `file_source` = `fileid`)'; |
|
61 | 61 | |
62 | - $deletedEntries = $connection->executeUpdate($sql); |
|
63 | - $logger->debug("$deletedEntries orphaned share(s) deleted", ['app' => 'DeleteOrphanedSharesJob']); |
|
64 | - } |
|
62 | + $deletedEntries = $connection->executeUpdate($sql); |
|
63 | + $logger->debug("$deletedEntries orphaned share(s) deleted", ['app' => 'DeleteOrphanedSharesJob']); |
|
64 | + } |
|
65 | 65 | |
66 | 66 | } |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | /** |
42 | 42 | * sets the correct interval for this timed job |
43 | 43 | */ |
44 | - public function __construct(){ |
|
44 | + public function __construct() { |
|
45 | 45 | $this->interval = $this->defaultIntervalMin * 60; |
46 | 46 | } |
47 | 47 | |
@@ -55,8 +55,8 @@ discard block |
||
55 | 55 | $logger = \OC::$server->getLogger(); |
56 | 56 | |
57 | 57 | $sql = |
58 | - 'DELETE FROM `*PREFIX*share` ' . |
|
59 | - 'WHERE `item_type` in (\'file\', \'folder\') ' . |
|
58 | + 'DELETE FROM `*PREFIX*share` '. |
|
59 | + 'WHERE `item_type` in (\'file\', \'folder\') '. |
|
60 | 60 | 'AND NOT EXISTS (SELECT `fileid` FROM `*PREFIX*filecache` WHERE `file_source` = `fileid`)'; |
61 | 61 | |
62 | 62 | $deletedEntries = $connection->executeUpdate($sql); |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | */ |
97 | 97 | public function generateTarget($filePath, $shareWith, $exclude = null) { |
98 | 98 | $shareFolder = \OCA\Files_Sharing\Helper::getShareFolder(); |
99 | - $target = \OC\Files\Filesystem::normalizePath($shareFolder . '/' . basename($filePath)); |
|
99 | + $target = \OC\Files\Filesystem::normalizePath($shareFolder.'/'.basename($filePath)); |
|
100 | 100 | |
101 | 101 | // for group shares we return the target right away |
102 | 102 | if ($shareWith === false) { |
@@ -104,13 +104,13 @@ discard block |
||
104 | 104 | } |
105 | 105 | |
106 | 106 | \OC\Files\Filesystem::initMountPoints($shareWith); |
107 | - $view = new \OC\Files\View('/' . $shareWith . '/files'); |
|
107 | + $view = new \OC\Files\View('/'.$shareWith.'/files'); |
|
108 | 108 | |
109 | 109 | if (!$view->is_dir($shareFolder)) { |
110 | 110 | $dir = ''; |
111 | 111 | $subdirs = explode('/', $shareFolder); |
112 | 112 | foreach ($subdirs as $subdir) { |
113 | - $dir = $dir . '/' . $subdir; |
|
113 | + $dir = $dir.'/'.$subdir; |
|
114 | 114 | if (!$view->is_dir($dir)) { |
115 | 115 | $view->mkdir($dir); |
116 | 116 | } |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | if ($share['item_type'] === 'folder' && $target !== '') { |
238 | 238 | // note: in case of ext storage mount points the path might be empty |
239 | 239 | // which would cause a leading slash to appear |
240 | - $share['path'] = ltrim($share['path'] . '/' . $target, '/'); |
|
240 | + $share['path'] = ltrim($share['path'].'/'.$target, '/'); |
|
241 | 241 | } |
242 | 242 | return self::resolveReshares($share); |
243 | 243 | } |
@@ -37,219 +37,219 @@ |
||
37 | 37 | |
38 | 38 | class File implements \OCP\Share_Backend_File_Dependent { |
39 | 39 | |
40 | - const FORMAT_SHARED_STORAGE = 0; |
|
41 | - const FORMAT_GET_FOLDER_CONTENTS = 1; |
|
42 | - const FORMAT_FILE_APP_ROOT = 2; |
|
43 | - const FORMAT_OPENDIR = 3; |
|
44 | - const FORMAT_GET_ALL = 4; |
|
45 | - const FORMAT_PERMISSIONS = 5; |
|
46 | - const FORMAT_TARGET_NAMES = 6; |
|
47 | - |
|
48 | - private $path; |
|
49 | - |
|
50 | - /** @var FederatedShareProvider */ |
|
51 | - private $federatedShareProvider; |
|
52 | - |
|
53 | - public function __construct(FederatedShareProvider $federatedShareProvider = null) { |
|
54 | - if ($federatedShareProvider) { |
|
55 | - $this->federatedShareProvider = $federatedShareProvider; |
|
56 | - } else { |
|
57 | - $federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application(); |
|
58 | - $this->federatedShareProvider = $federatedSharingApp->getFederatedShareProvider(); |
|
59 | - } |
|
60 | - } |
|
61 | - |
|
62 | - public function isValidSource($itemSource, $uidOwner) { |
|
63 | - try { |
|
64 | - $path = \OC\Files\Filesystem::getPath($itemSource); |
|
65 | - // FIXME: attributes should not be set here, |
|
66 | - // keeping this pattern for now to avoid unexpected |
|
67 | - // regressions |
|
68 | - $this->path = \OC\Files\Filesystem::normalizePath(basename($path)); |
|
69 | - return true; |
|
70 | - } catch (\OCP\Files\NotFoundException $e) { |
|
71 | - return false; |
|
72 | - } |
|
73 | - } |
|
74 | - |
|
75 | - public function getFilePath($itemSource, $uidOwner) { |
|
76 | - if (isset($this->path)) { |
|
77 | - $path = $this->path; |
|
78 | - $this->path = null; |
|
79 | - return $path; |
|
80 | - } else { |
|
81 | - try { |
|
82 | - $path = \OC\Files\Filesystem::getPath($itemSource); |
|
83 | - return $path; |
|
84 | - } catch (\OCP\Files\NotFoundException $e) { |
|
85 | - return false; |
|
86 | - } |
|
87 | - } |
|
88 | - } |
|
89 | - |
|
90 | - /** |
|
91 | - * create unique target |
|
92 | - * @param string $filePath |
|
93 | - * @param string $shareWith |
|
94 | - * @param array $exclude (optional) |
|
95 | - * @return string |
|
96 | - */ |
|
97 | - public function generateTarget($filePath, $shareWith, $exclude = null) { |
|
98 | - $shareFolder = \OCA\Files_Sharing\Helper::getShareFolder(); |
|
99 | - $target = \OC\Files\Filesystem::normalizePath($shareFolder . '/' . basename($filePath)); |
|
100 | - |
|
101 | - // for group shares we return the target right away |
|
102 | - if ($shareWith === false) { |
|
103 | - return $target; |
|
104 | - } |
|
105 | - |
|
106 | - \OC\Files\Filesystem::initMountPoints($shareWith); |
|
107 | - $view = new \OC\Files\View('/' . $shareWith . '/files'); |
|
108 | - |
|
109 | - if (!$view->is_dir($shareFolder)) { |
|
110 | - $dir = ''; |
|
111 | - $subdirs = explode('/', $shareFolder); |
|
112 | - foreach ($subdirs as $subdir) { |
|
113 | - $dir = $dir . '/' . $subdir; |
|
114 | - if (!$view->is_dir($dir)) { |
|
115 | - $view->mkdir($dir); |
|
116 | - } |
|
117 | - } |
|
118 | - } |
|
119 | - |
|
120 | - $excludeList = is_array($exclude) ? $exclude : array(); |
|
121 | - |
|
122 | - return \OCA\Files_Sharing\Helper::generateUniqueTarget($target, $excludeList, $view); |
|
123 | - } |
|
124 | - |
|
125 | - public function formatItems($items, $format, $parameters = null) { |
|
126 | - if ($format === self::FORMAT_SHARED_STORAGE) { |
|
127 | - // Only 1 item should come through for this format call |
|
128 | - $item = array_shift($items); |
|
129 | - return array( |
|
130 | - 'parent' => $item['parent'], |
|
131 | - 'path' => $item['path'], |
|
132 | - 'storage' => $item['storage'], |
|
133 | - 'permissions' => $item['permissions'], |
|
134 | - 'uid_owner' => $item['uid_owner'], |
|
135 | - ); |
|
136 | - } else if ($format === self::FORMAT_GET_FOLDER_CONTENTS) { |
|
137 | - $files = array(); |
|
138 | - foreach ($items as $item) { |
|
139 | - $file = array(); |
|
140 | - $file['fileid'] = $item['file_source']; |
|
141 | - $file['storage'] = $item['storage']; |
|
142 | - $file['path'] = $item['file_target']; |
|
143 | - $file['parent'] = $item['file_parent']; |
|
144 | - $file['name'] = basename($item['file_target']); |
|
145 | - $file['mimetype'] = $item['mimetype']; |
|
146 | - $file['mimepart'] = $item['mimepart']; |
|
147 | - $file['mtime'] = $item['mtime']; |
|
148 | - $file['encrypted'] = $item['encrypted']; |
|
149 | - $file['etag'] = $item['etag']; |
|
150 | - $file['uid_owner'] = $item['uid_owner']; |
|
151 | - $file['displayname_owner'] = $item['displayname_owner']; |
|
152 | - |
|
153 | - $storage = \OC\Files\Filesystem::getStorage('/'); |
|
154 | - $cache = $storage->getCache(); |
|
155 | - $file['size'] = $item['size']; |
|
156 | - $files[] = $file; |
|
157 | - } |
|
158 | - return $files; |
|
159 | - } else if ($format === self::FORMAT_OPENDIR) { |
|
160 | - $files = array(); |
|
161 | - foreach ($items as $item) { |
|
162 | - $files[] = basename($item['file_target']); |
|
163 | - } |
|
164 | - return $files; |
|
165 | - } else if ($format === self::FORMAT_GET_ALL) { |
|
166 | - $ids = array(); |
|
167 | - foreach ($items as $item) { |
|
168 | - $ids[] = $item['file_source']; |
|
169 | - } |
|
170 | - return $ids; |
|
171 | - } else if ($format === self::FORMAT_PERMISSIONS) { |
|
172 | - $filePermissions = array(); |
|
173 | - foreach ($items as $item) { |
|
174 | - $filePermissions[$item['file_source']] = $item['permissions']; |
|
175 | - } |
|
176 | - return $filePermissions; |
|
177 | - } else if ($format === self::FORMAT_TARGET_NAMES) { |
|
178 | - $targets = array(); |
|
179 | - foreach ($items as $item) { |
|
180 | - $targets[] = $item['file_target']; |
|
181 | - } |
|
182 | - return $targets; |
|
183 | - } |
|
184 | - return array(); |
|
185 | - } |
|
186 | - |
|
187 | - /** |
|
188 | - * check if server2server share is enabled |
|
189 | - * |
|
190 | - * @param int $shareType |
|
191 | - * @return boolean |
|
192 | - */ |
|
193 | - public function isShareTypeAllowed($shareType) { |
|
194 | - if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE) { |
|
195 | - return $this->federatedShareProvider->isOutgoingServer2serverShareEnabled(); |
|
196 | - } |
|
197 | - |
|
198 | - if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE_GROUP) { |
|
199 | - return $this->federatedShareProvider->isOutgoingServer2serverGroupShareEnabled(); |
|
200 | - } |
|
201 | - |
|
202 | - return true; |
|
203 | - } |
|
204 | - |
|
205 | - /** |
|
206 | - * resolve reshares to return the correct source item |
|
207 | - * @param array $source |
|
208 | - * @return array source item |
|
209 | - */ |
|
210 | - protected static function resolveReshares($source) { |
|
211 | - if (isset($source['parent'])) { |
|
212 | - $parent = $source['parent']; |
|
213 | - while (isset($parent)) { |
|
214 | - $qb = \OC::$server->getDatabaseConnection()->getQueryBuilder(); |
|
215 | - $qb->select('parent', 'uid_owner') |
|
216 | - ->from('share') |
|
217 | - ->where( |
|
218 | - $qb->expr()->eq('id', $qb->createNamedParameter($parent)) |
|
219 | - ); |
|
220 | - $result = $qb->execute(); |
|
221 | - $item = $result->fetch(); |
|
222 | - $result->closeCursor(); |
|
223 | - if (isset($item['parent'])) { |
|
224 | - $parent = $item['parent']; |
|
225 | - } else { |
|
226 | - $fileOwner = $item['uid_owner']; |
|
227 | - break; |
|
228 | - } |
|
229 | - } |
|
230 | - } else { |
|
231 | - $fileOwner = $source['uid_owner']; |
|
232 | - } |
|
233 | - if (isset($fileOwner)) { |
|
234 | - $source['fileOwner'] = $fileOwner; |
|
235 | - } else { |
|
236 | - \OC::$server->getLogger()->error('No owner found for reshare', ['app' => 'files_sharing']); |
|
237 | - } |
|
238 | - |
|
239 | - return $source; |
|
240 | - } |
|
241 | - |
|
242 | - /** |
|
243 | - * @param string $target |
|
244 | - * @param array $share |
|
245 | - * @return array|false source item |
|
246 | - */ |
|
247 | - public static function getSource($target, $share) { |
|
248 | - if ($share['item_type'] === 'folder' && $target !== '') { |
|
249 | - // note: in case of ext storage mount points the path might be empty |
|
250 | - // which would cause a leading slash to appear |
|
251 | - $share['path'] = ltrim($share['path'] . '/' . $target, '/'); |
|
252 | - } |
|
253 | - return self::resolveReshares($share); |
|
254 | - } |
|
40 | + const FORMAT_SHARED_STORAGE = 0; |
|
41 | + const FORMAT_GET_FOLDER_CONTENTS = 1; |
|
42 | + const FORMAT_FILE_APP_ROOT = 2; |
|
43 | + const FORMAT_OPENDIR = 3; |
|
44 | + const FORMAT_GET_ALL = 4; |
|
45 | + const FORMAT_PERMISSIONS = 5; |
|
46 | + const FORMAT_TARGET_NAMES = 6; |
|
47 | + |
|
48 | + private $path; |
|
49 | + |
|
50 | + /** @var FederatedShareProvider */ |
|
51 | + private $federatedShareProvider; |
|
52 | + |
|
53 | + public function __construct(FederatedShareProvider $federatedShareProvider = null) { |
|
54 | + if ($federatedShareProvider) { |
|
55 | + $this->federatedShareProvider = $federatedShareProvider; |
|
56 | + } else { |
|
57 | + $federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application(); |
|
58 | + $this->federatedShareProvider = $federatedSharingApp->getFederatedShareProvider(); |
|
59 | + } |
|
60 | + } |
|
61 | + |
|
62 | + public function isValidSource($itemSource, $uidOwner) { |
|
63 | + try { |
|
64 | + $path = \OC\Files\Filesystem::getPath($itemSource); |
|
65 | + // FIXME: attributes should not be set here, |
|
66 | + // keeping this pattern for now to avoid unexpected |
|
67 | + // regressions |
|
68 | + $this->path = \OC\Files\Filesystem::normalizePath(basename($path)); |
|
69 | + return true; |
|
70 | + } catch (\OCP\Files\NotFoundException $e) { |
|
71 | + return false; |
|
72 | + } |
|
73 | + } |
|
74 | + |
|
75 | + public function getFilePath($itemSource, $uidOwner) { |
|
76 | + if (isset($this->path)) { |
|
77 | + $path = $this->path; |
|
78 | + $this->path = null; |
|
79 | + return $path; |
|
80 | + } else { |
|
81 | + try { |
|
82 | + $path = \OC\Files\Filesystem::getPath($itemSource); |
|
83 | + return $path; |
|
84 | + } catch (\OCP\Files\NotFoundException $e) { |
|
85 | + return false; |
|
86 | + } |
|
87 | + } |
|
88 | + } |
|
89 | + |
|
90 | + /** |
|
91 | + * create unique target |
|
92 | + * @param string $filePath |
|
93 | + * @param string $shareWith |
|
94 | + * @param array $exclude (optional) |
|
95 | + * @return string |
|
96 | + */ |
|
97 | + public function generateTarget($filePath, $shareWith, $exclude = null) { |
|
98 | + $shareFolder = \OCA\Files_Sharing\Helper::getShareFolder(); |
|
99 | + $target = \OC\Files\Filesystem::normalizePath($shareFolder . '/' . basename($filePath)); |
|
100 | + |
|
101 | + // for group shares we return the target right away |
|
102 | + if ($shareWith === false) { |
|
103 | + return $target; |
|
104 | + } |
|
105 | + |
|
106 | + \OC\Files\Filesystem::initMountPoints($shareWith); |
|
107 | + $view = new \OC\Files\View('/' . $shareWith . '/files'); |
|
108 | + |
|
109 | + if (!$view->is_dir($shareFolder)) { |
|
110 | + $dir = ''; |
|
111 | + $subdirs = explode('/', $shareFolder); |
|
112 | + foreach ($subdirs as $subdir) { |
|
113 | + $dir = $dir . '/' . $subdir; |
|
114 | + if (!$view->is_dir($dir)) { |
|
115 | + $view->mkdir($dir); |
|
116 | + } |
|
117 | + } |
|
118 | + } |
|
119 | + |
|
120 | + $excludeList = is_array($exclude) ? $exclude : array(); |
|
121 | + |
|
122 | + return \OCA\Files_Sharing\Helper::generateUniqueTarget($target, $excludeList, $view); |
|
123 | + } |
|
124 | + |
|
125 | + public function formatItems($items, $format, $parameters = null) { |
|
126 | + if ($format === self::FORMAT_SHARED_STORAGE) { |
|
127 | + // Only 1 item should come through for this format call |
|
128 | + $item = array_shift($items); |
|
129 | + return array( |
|
130 | + 'parent' => $item['parent'], |
|
131 | + 'path' => $item['path'], |
|
132 | + 'storage' => $item['storage'], |
|
133 | + 'permissions' => $item['permissions'], |
|
134 | + 'uid_owner' => $item['uid_owner'], |
|
135 | + ); |
|
136 | + } else if ($format === self::FORMAT_GET_FOLDER_CONTENTS) { |
|
137 | + $files = array(); |
|
138 | + foreach ($items as $item) { |
|
139 | + $file = array(); |
|
140 | + $file['fileid'] = $item['file_source']; |
|
141 | + $file['storage'] = $item['storage']; |
|
142 | + $file['path'] = $item['file_target']; |
|
143 | + $file['parent'] = $item['file_parent']; |
|
144 | + $file['name'] = basename($item['file_target']); |
|
145 | + $file['mimetype'] = $item['mimetype']; |
|
146 | + $file['mimepart'] = $item['mimepart']; |
|
147 | + $file['mtime'] = $item['mtime']; |
|
148 | + $file['encrypted'] = $item['encrypted']; |
|
149 | + $file['etag'] = $item['etag']; |
|
150 | + $file['uid_owner'] = $item['uid_owner']; |
|
151 | + $file['displayname_owner'] = $item['displayname_owner']; |
|
152 | + |
|
153 | + $storage = \OC\Files\Filesystem::getStorage('/'); |
|
154 | + $cache = $storage->getCache(); |
|
155 | + $file['size'] = $item['size']; |
|
156 | + $files[] = $file; |
|
157 | + } |
|
158 | + return $files; |
|
159 | + } else if ($format === self::FORMAT_OPENDIR) { |
|
160 | + $files = array(); |
|
161 | + foreach ($items as $item) { |
|
162 | + $files[] = basename($item['file_target']); |
|
163 | + } |
|
164 | + return $files; |
|
165 | + } else if ($format === self::FORMAT_GET_ALL) { |
|
166 | + $ids = array(); |
|
167 | + foreach ($items as $item) { |
|
168 | + $ids[] = $item['file_source']; |
|
169 | + } |
|
170 | + return $ids; |
|
171 | + } else if ($format === self::FORMAT_PERMISSIONS) { |
|
172 | + $filePermissions = array(); |
|
173 | + foreach ($items as $item) { |
|
174 | + $filePermissions[$item['file_source']] = $item['permissions']; |
|
175 | + } |
|
176 | + return $filePermissions; |
|
177 | + } else if ($format === self::FORMAT_TARGET_NAMES) { |
|
178 | + $targets = array(); |
|
179 | + foreach ($items as $item) { |
|
180 | + $targets[] = $item['file_target']; |
|
181 | + } |
|
182 | + return $targets; |
|
183 | + } |
|
184 | + return array(); |
|
185 | + } |
|
186 | + |
|
187 | + /** |
|
188 | + * check if server2server share is enabled |
|
189 | + * |
|
190 | + * @param int $shareType |
|
191 | + * @return boolean |
|
192 | + */ |
|
193 | + public function isShareTypeAllowed($shareType) { |
|
194 | + if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE) { |
|
195 | + return $this->federatedShareProvider->isOutgoingServer2serverShareEnabled(); |
|
196 | + } |
|
197 | + |
|
198 | + if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE_GROUP) { |
|
199 | + return $this->federatedShareProvider->isOutgoingServer2serverGroupShareEnabled(); |
|
200 | + } |
|
201 | + |
|
202 | + return true; |
|
203 | + } |
|
204 | + |
|
205 | + /** |
|
206 | + * resolve reshares to return the correct source item |
|
207 | + * @param array $source |
|
208 | + * @return array source item |
|
209 | + */ |
|
210 | + protected static function resolveReshares($source) { |
|
211 | + if (isset($source['parent'])) { |
|
212 | + $parent = $source['parent']; |
|
213 | + while (isset($parent)) { |
|
214 | + $qb = \OC::$server->getDatabaseConnection()->getQueryBuilder(); |
|
215 | + $qb->select('parent', 'uid_owner') |
|
216 | + ->from('share') |
|
217 | + ->where( |
|
218 | + $qb->expr()->eq('id', $qb->createNamedParameter($parent)) |
|
219 | + ); |
|
220 | + $result = $qb->execute(); |
|
221 | + $item = $result->fetch(); |
|
222 | + $result->closeCursor(); |
|
223 | + if (isset($item['parent'])) { |
|
224 | + $parent = $item['parent']; |
|
225 | + } else { |
|
226 | + $fileOwner = $item['uid_owner']; |
|
227 | + break; |
|
228 | + } |
|
229 | + } |
|
230 | + } else { |
|
231 | + $fileOwner = $source['uid_owner']; |
|
232 | + } |
|
233 | + if (isset($fileOwner)) { |
|
234 | + $source['fileOwner'] = $fileOwner; |
|
235 | + } else { |
|
236 | + \OC::$server->getLogger()->error('No owner found for reshare', ['app' => 'files_sharing']); |
|
237 | + } |
|
238 | + |
|
239 | + return $source; |
|
240 | + } |
|
241 | + |
|
242 | + /** |
|
243 | + * @param string $target |
|
244 | + * @param array $share |
|
245 | + * @return array|false source item |
|
246 | + */ |
|
247 | + public static function getSource($target, $share) { |
|
248 | + if ($share['item_type'] === 'folder' && $target !== '') { |
|
249 | + // note: in case of ext storage mount points the path might be empty |
|
250 | + // which would cause a leading slash to appear |
|
251 | + $share['path'] = ltrim($share['path'] . '/' . $target, '/'); |
|
252 | + } |
|
253 | + return self::resolveReshares($share); |
|
254 | + } |
|
255 | 255 | } |
@@ -5,7 +5,7 @@ |
||
5 | 5 | use OCP\AppFramework\Http; |
6 | 6 | |
7 | 7 | class NotSubAdminException extends \Exception { |
8 | - public function __construct() { |
|
9 | - parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN); |
|
10 | - } |
|
8 | + public function __construct() { |
|
9 | + parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN); |
|
10 | + } |
|
11 | 11 | } |
12 | 12 | \ No newline at end of file |
@@ -69,7 +69,7 @@ |
||
69 | 69 | */ |
70 | 70 | protected function run($argument) { |
71 | 71 | // Delete old tokens after 2 days |
72 | - if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) { |
|
72 | + if ($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) { |
|
73 | 73 | $this->config->deleteSystemValue('updater.secret'); |
74 | 74 | } |
75 | 75 | } |
@@ -33,31 +33,31 @@ |
||
33 | 33 | * @package OCA\UpdateNotification |
34 | 34 | */ |
35 | 35 | class ResetTokenBackgroundJob extends TimedJob { |
36 | - /** @var IConfig */ |
|
37 | - private $config; |
|
38 | - /** @var ITimeFactory */ |
|
39 | - private $timeFactory; |
|
36 | + /** @var IConfig */ |
|
37 | + private $config; |
|
38 | + /** @var ITimeFactory */ |
|
39 | + private $timeFactory; |
|
40 | 40 | |
41 | - /** |
|
42 | - * @param IConfig $config |
|
43 | - * @param ITimeFactory $timeFactory |
|
44 | - */ |
|
45 | - public function __construct(IConfig $config, |
|
46 | - ITimeFactory $timeFactory) { |
|
47 | - // Run all 10 minutes |
|
48 | - $this->setInterval(60 * 10); |
|
49 | - $this->config = $config; |
|
50 | - $this->timeFactory = $timeFactory; |
|
51 | - } |
|
41 | + /** |
|
42 | + * @param IConfig $config |
|
43 | + * @param ITimeFactory $timeFactory |
|
44 | + */ |
|
45 | + public function __construct(IConfig $config, |
|
46 | + ITimeFactory $timeFactory) { |
|
47 | + // Run all 10 minutes |
|
48 | + $this->setInterval(60 * 10); |
|
49 | + $this->config = $config; |
|
50 | + $this->timeFactory = $timeFactory; |
|
51 | + } |
|
52 | 52 | |
53 | - /** |
|
54 | - * @param $argument |
|
55 | - */ |
|
56 | - protected function run($argument) { |
|
57 | - // Delete old tokens after 2 days |
|
58 | - if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) { |
|
59 | - $this->config->deleteSystemValue('updater.secret'); |
|
60 | - } |
|
61 | - } |
|
53 | + /** |
|
54 | + * @param $argument |
|
55 | + */ |
|
56 | + protected function run($argument) { |
|
57 | + // Delete old tokens after 2 days |
|
58 | + if($this->timeFactory->getTime() - $this->config->getAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()) >= 172800) { |
|
59 | + $this->config->deleteSystemValue('updater.secret'); |
|
60 | + } |
|
61 | + } |
|
62 | 62 | |
63 | 63 | } |
@@ -1,6 +1,5 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - |
|
4 | 3 | * |
5 | 4 | * @author Bjoern Schiessle <[email protected]> |
6 | 5 | * @author Jan-Christoph Borchardt <[email protected]> |
@@ -28,55 +28,55 @@ |
||
28 | 28 | use OCP\Settings\IIconSection; |
29 | 29 | |
30 | 30 | class Section implements IIconSection { |
31 | - /** @var IL10N */ |
|
32 | - private $l; |
|
33 | - /** @var IURLGenerator */ |
|
34 | - private $url; |
|
31 | + /** @var IL10N */ |
|
32 | + private $l; |
|
33 | + /** @var IURLGenerator */ |
|
34 | + private $url; |
|
35 | 35 | |
36 | - /** |
|
37 | - * @param IURLGenerator $url |
|
38 | - * @param IL10N $l |
|
39 | - */ |
|
40 | - public function __construct(IURLGenerator $url, IL10N $l) { |
|
41 | - $this->url = $url; |
|
42 | - $this->l = $l; |
|
43 | - } |
|
36 | + /** |
|
37 | + * @param IURLGenerator $url |
|
38 | + * @param IL10N $l |
|
39 | + */ |
|
40 | + public function __construct(IURLGenerator $url, IL10N $l) { |
|
41 | + $this->url = $url; |
|
42 | + $this->l = $l; |
|
43 | + } |
|
44 | 44 | |
45 | - /** |
|
46 | - * returns the ID of the section. It is supposed to be a lower case string, |
|
47 | - * e.g. 'ldap' |
|
48 | - * |
|
49 | - * @returns string |
|
50 | - */ |
|
51 | - public function getID() { |
|
52 | - return 'theming'; |
|
53 | - } |
|
45 | + /** |
|
46 | + * returns the ID of the section. It is supposed to be a lower case string, |
|
47 | + * e.g. 'ldap' |
|
48 | + * |
|
49 | + * @returns string |
|
50 | + */ |
|
51 | + public function getID() { |
|
52 | + return 'theming'; |
|
53 | + } |
|
54 | 54 | |
55 | - /** |
|
56 | - * returns the translated name as it should be displayed, e.g. 'LDAP / AD |
|
57 | - * integration'. Use the L10N service to translate it. |
|
58 | - * |
|
59 | - * @return string |
|
60 | - */ |
|
61 | - public function getName() { |
|
62 | - return $this->l->t('Theming'); |
|
63 | - } |
|
55 | + /** |
|
56 | + * returns the translated name as it should be displayed, e.g. 'LDAP / AD |
|
57 | + * integration'. Use the L10N service to translate it. |
|
58 | + * |
|
59 | + * @return string |
|
60 | + */ |
|
61 | + public function getName() { |
|
62 | + return $this->l->t('Theming'); |
|
63 | + } |
|
64 | 64 | |
65 | - /** |
|
66 | - * @return int whether the form should be rather on the top or bottom of |
|
67 | - * the settings navigation. The sections are arranged in ascending order of |
|
68 | - * the priority values. It is required to return a value between 0 and 99. |
|
69 | - * |
|
70 | - * E.g.: 70 |
|
71 | - */ |
|
72 | - public function getPriority() { |
|
73 | - return 30; |
|
74 | - } |
|
65 | + /** |
|
66 | + * @return int whether the form should be rather on the top or bottom of |
|
67 | + * the settings navigation. The sections are arranged in ascending order of |
|
68 | + * the priority values. It is required to return a value between 0 and 99. |
|
69 | + * |
|
70 | + * E.g.: 70 |
|
71 | + */ |
|
72 | + public function getPriority() { |
|
73 | + return 30; |
|
74 | + } |
|
75 | 75 | |
76 | - /** |
|
77 | - * {@inheritdoc} |
|
78 | - */ |
|
79 | - public function getIcon() { |
|
80 | - return $this->url->imagePath('theming', 'app-dark.svg'); |
|
81 | - } |
|
76 | + /** |
|
77 | + * {@inheritdoc} |
|
78 | + */ |
|
79 | + public function getIcon() { |
|
80 | + return $this->url->imagePath('theming', 'app-dark.svg'); |
|
81 | + } |
|
82 | 82 | } |
@@ -30,46 +30,46 @@ |
||
30 | 30 | |
31 | 31 | class SettingsController extends Controller { |
32 | 32 | |
33 | - /** @var BackupCodeStorage */ |
|
34 | - private $storage; |
|
33 | + /** @var BackupCodeStorage */ |
|
34 | + private $storage; |
|
35 | 35 | |
36 | - /** @var IUserSession */ |
|
37 | - private $userSession; |
|
36 | + /** @var IUserSession */ |
|
37 | + private $userSession; |
|
38 | 38 | |
39 | - /** |
|
40 | - * @param string $appName |
|
41 | - * @param IRequest $request |
|
42 | - * @param BackupCodeStorage $storage |
|
43 | - * @param IUserSession $userSession |
|
44 | - */ |
|
45 | - public function __construct($appName, IRequest $request, BackupCodeStorage $storage, IUserSession $userSession) { |
|
46 | - parent::__construct($appName, $request); |
|
47 | - $this->userSession = $userSession; |
|
48 | - $this->storage = $storage; |
|
49 | - } |
|
39 | + /** |
|
40 | + * @param string $appName |
|
41 | + * @param IRequest $request |
|
42 | + * @param BackupCodeStorage $storage |
|
43 | + * @param IUserSession $userSession |
|
44 | + */ |
|
45 | + public function __construct($appName, IRequest $request, BackupCodeStorage $storage, IUserSession $userSession) { |
|
46 | + parent::__construct($appName, $request); |
|
47 | + $this->userSession = $userSession; |
|
48 | + $this->storage = $storage; |
|
49 | + } |
|
50 | 50 | |
51 | - /** |
|
52 | - * @NoAdminRequired |
|
53 | - * @return JSONResponse |
|
54 | - */ |
|
55 | - public function state() { |
|
56 | - $user = $this->userSession->getUser(); |
|
57 | - return $this->storage->getBackupCodesState($user); |
|
58 | - } |
|
51 | + /** |
|
52 | + * @NoAdminRequired |
|
53 | + * @return JSONResponse |
|
54 | + */ |
|
55 | + public function state() { |
|
56 | + $user = $this->userSession->getUser(); |
|
57 | + return $this->storage->getBackupCodesState($user); |
|
58 | + } |
|
59 | 59 | |
60 | - /** |
|
61 | - * @NoAdminRequired |
|
62 | - * @PasswordConfirmationRequired |
|
63 | - * |
|
64 | - * @return JSONResponse |
|
65 | - */ |
|
66 | - public function createCodes() { |
|
67 | - $user = $this->userSession->getUser(); |
|
68 | - $codes = $this->storage->createCodes($user); |
|
69 | - return new JSONResponse([ |
|
70 | - 'codes' => $codes, |
|
71 | - 'state' => $this->storage->getBackupCodesState($user), |
|
72 | - ]); |
|
73 | - } |
|
60 | + /** |
|
61 | + * @NoAdminRequired |
|
62 | + * @PasswordConfirmationRequired |
|
63 | + * |
|
64 | + * @return JSONResponse |
|
65 | + */ |
|
66 | + public function createCodes() { |
|
67 | + $user = $this->userSession->getUser(); |
|
68 | + $codes = $this->storage->createCodes($user); |
|
69 | + return new JSONResponse([ |
|
70 | + 'codes' => $codes, |
|
71 | + 'state' => $this->storage->getBackupCodesState($user), |
|
72 | + ]); |
|
73 | + } |
|
74 | 74 | |
75 | 75 | } |
@@ -34,13 +34,13 @@ |
||
34 | 34 | */ |
35 | 35 | class BackupCode extends Entity { |
36 | 36 | |
37 | - /** @var string */ |
|
38 | - protected $userId; |
|
37 | + /** @var string */ |
|
38 | + protected $userId; |
|
39 | 39 | |
40 | - /** @var string */ |
|
41 | - protected $code; |
|
40 | + /** @var string */ |
|
41 | + protected $code; |
|
42 | 42 | |
43 | - /** @var int */ |
|
44 | - protected $used; |
|
43 | + /** @var int */ |
|
44 | + protected $used; |
|
45 | 45 | |
46 | 46 | } |
@@ -21,17 +21,17 @@ |
||
21 | 21 | */ |
22 | 22 | // @codeCoverageIgnoreStart |
23 | 23 | return [ |
24 | - 'routes' => [ |
|
25 | - [ |
|
26 | - 'name' => 'settings#state', |
|
27 | - 'url' => '/settings/state', |
|
28 | - 'verb' => 'GET' |
|
29 | - ], |
|
30 | - [ |
|
31 | - 'name' => 'settings#createCodes', |
|
32 | - 'url' => '/settings/create', |
|
33 | - 'verb' => 'POST' |
|
34 | - ], |
|
35 | - ] |
|
24 | + 'routes' => [ |
|
25 | + [ |
|
26 | + 'name' => 'settings#state', |
|
27 | + 'url' => '/settings/state', |
|
28 | + 'verb' => 'GET' |
|
29 | + ], |
|
30 | + [ |
|
31 | + 'name' => 'settings#createCodes', |
|
32 | + 'url' => '/settings/create', |
|
33 | + 'verb' => 'POST' |
|
34 | + ], |
|
35 | + ] |
|
36 | 36 | ]; |
37 | 37 | // @codeCoverageIgnoreEnd |