@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | * @param string $wrongPath wrong path of the entry to fix |
96 | 96 | * @param int $correctStorageNumericId numeric idea of the correct storage |
97 | 97 | * @param string $correctPath value to which to set the path of the entry |
98 | - * @return bool true for success |
|
98 | + * @return boolean|null true for success |
|
99 | 99 | */ |
100 | 100 | private function fixEntryPath(IOutput $out, $fileId, $wrongPath, $correctStorageNumericId, $correctPath) { |
101 | 101 | // delete target if exists |
@@ -125,6 +125,9 @@ discard block |
||
125 | 125 | $out->advance(1, $text); |
126 | 126 | } |
127 | 127 | |
128 | + /** |
|
129 | + * @param \OCP\DB\QueryBuilder\IQueryBuilder $qb |
|
130 | + */ |
|
128 | 131 | private function addQueryConditionsParentIdWrongPath($qb) { |
129 | 132 | // thanks, VicDeo! |
130 | 133 | if ($this->connection->getDatabasePlatform() instanceof MySqlPlatform) { |
@@ -164,6 +167,9 @@ discard block |
||
164 | 167 | } |
165 | 168 | } |
166 | 169 | |
170 | + /** |
|
171 | + * @param \OCP\DB\QueryBuilder\IQueryBuilder $qb |
|
172 | + */ |
|
167 | 173 | private function addQueryConditionsNonExistingParentIdEntry($qb, $storageNumericId = null) { |
168 | 174 | // Subquery for parent existence |
169 | 175 | $qbe = $this->connection->getQueryBuilder(); |
@@ -193,6 +199,9 @@ discard block |
||
193 | 199 | } |
194 | 200 | } |
195 | 201 | |
202 | + /** |
|
203 | + * @param integer $storageNumericId |
|
204 | + */ |
|
196 | 205 | private function countResultsToProcessParentIdWrongPath($storageNumericId = null) { |
197 | 206 | $qb = $this->connection->getQueryBuilder(); |
198 | 207 | $qb->select($qb->createFunction('COUNT(*)')); |
@@ -203,6 +212,9 @@ discard block |
||
203 | 212 | return $count; |
204 | 213 | } |
205 | 214 | |
215 | + /** |
|
216 | + * @param integer $storageNumericId |
|
217 | + */ |
|
206 | 218 | private function countResultsToProcessNonExistingParentIdEntry($storageNumericId = null) { |
207 | 219 | $qb = $this->connection->getQueryBuilder(); |
208 | 220 | $qb->select($qb->createFunction('COUNT(*)')); |
@@ -353,6 +365,7 @@ discard block |
||
353 | 365 | * |
354 | 366 | * @param int $storageId storage id |
355 | 367 | * @param string $path path for which to create the parent entry |
368 | + * @param integer $reuseFileId |
|
356 | 369 | * @return int file id of the newly created parent |
357 | 370 | */ |
358 | 371 | private function getOrCreateEntry($storageId, $path, $reuseFileId = null) { |
@@ -278,7 +278,7 @@ |
||
278 | 278 | } |
279 | 279 | |
280 | 280 | /** |
281 | - * @param string[] $subTree |
|
281 | + * @param string[] $subTrees |
|
282 | 282 | * @return bool |
283 | 283 | */ |
284 | 284 | private function isRequestForSubtree(array $subTrees) { |
@@ -284,6 +284,9 @@ discard block |
||
284 | 284 | return $this->leave(__FUNCTION__, $result); |
285 | 285 | } |
286 | 286 | |
287 | + /** |
|
288 | + * @param string $path |
|
289 | + */ |
|
287 | 290 | private function removeFromCache($path) { |
288 | 291 | $path = trim($path, '/'); |
289 | 292 | // TODO The CappedCache does not really clear by prefix. It just clears all. |
@@ -673,7 +676,7 @@ discard block |
||
673 | 676 | * if smb.logging.enable is set to true in the config will log a leave line |
674 | 677 | * with the given function, the return value or the exception |
675 | 678 | * |
676 | - * @param $function |
|
679 | + * @param string $function |
|
677 | 680 | * @param mixed $result an exception will be logged and then returned |
678 | 681 | * @return mixed |
679 | 682 | */ |
@@ -700,6 +703,9 @@ discard block |
||
700 | 703 | return $result; |
701 | 704 | } |
702 | 705 | |
706 | + /** |
|
707 | + * @param string $function |
|
708 | + */ |
|
703 | 709 | private function swallow($function, \Exception $exception) { |
704 | 710 | if (\OC::$server->getConfig()->getSystemValue('smb.logging.enable', false) === true) { |
705 | 711 | Util::writeLog('smb', "$function swallowing ".get_class($exception) |
@@ -180,10 +180,10 @@ |
||
180 | 180 | * inform recipient about public link share |
181 | 181 | * |
182 | 182 | * @param string $recipient recipient email address |
183 | - * @param string $filename the shared file |
|
184 | - * @param string $link the public link |
|
185 | 183 | * @param array $options allows ['cc'] and ['bcc'] recipients |
186 | - * @param int $expiration expiration date (timestamp) |
|
184 | + * @param string $subject |
|
185 | + * @param boolean|string $htmlBody |
|
186 | + * @param boolean|string $textBody |
|
187 | 187 | * @return string[] $result of failed recipients |
188 | 188 | */ |
189 | 189 | public function sendLinkShareMailFromBody($recipient, $subject, $htmlBody, $textBody, $options = array()) { |
@@ -270,6 +270,9 @@ discard block |
||
270 | 270 | return array_values($calendars); |
271 | 271 | } |
272 | 272 | |
273 | + /** |
|
274 | + * @param string $principalUri |
|
275 | + */ |
|
273 | 276 | public function getUsersOwnCalendars($principalUri) { |
274 | 277 | $principalUri = $this->convertPrincipal($principalUri, true); |
275 | 278 | $fields = array_values($this->propertyMap); |
@@ -1279,7 +1282,7 @@ discard block |
||
1279 | 1282 | * @param string $principalUri |
1280 | 1283 | * @param string $uri |
1281 | 1284 | * @param array $properties |
1282 | - * @return mixed |
|
1285 | + * @return integer |
|
1283 | 1286 | * @throws Forbidden |
1284 | 1287 | */ |
1285 | 1288 | function createSubscription($principalUri, $uri, array $properties) { |
@@ -1685,6 +1688,9 @@ discard block |
||
1685 | 1688 | return $this->sharingBackend->applyShareAcl($resourceId, $acl); |
1686 | 1689 | } |
1687 | 1690 | |
1691 | + /** |
|
1692 | + * @param boolean $toV2 |
|
1693 | + */ |
|
1688 | 1694 | private function convertPrincipal($principalUri, $toV2 = null) { |
1689 | 1695 | if ($this->principalBackend->getPrincipalPrefix() === 'principals') { |
1690 | 1696 | list(, $name) = URLUtil::splitPath($principalUri); |