@@ -35,7 +35,6 @@ |
||
35 | 35 | use OC\Core\Controller\LostController; |
36 | 36 | use OC\Core\Controller\TokenController; |
37 | 37 | use OC\Core\Controller\TwoFactorChallengeController; |
38 | -use OC\Core\Controller\UserController; |
|
39 | 38 | use OCP\AppFramework\App; |
40 | 39 | use OCP\Util; |
41 | 40 |
@@ -21,7 +21,6 @@ |
||
21 | 21 | */ |
22 | 22 | namespace OCA\DAV; |
23 | 23 | |
24 | -use OCA\DAV\CalDAV\BirthdayService; |
|
25 | 24 | use OCA\DAV\CalDAV\CalDavBackend; |
26 | 25 | use OCA\DAV\CardDAV\CardDavBackend; |
27 | 26 | use OCA\DAV\CardDAV\SyncService; |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | * |
138 | 138 | * By default this excludes the automatically generated birthday calendar |
139 | 139 | * |
140 | - * @param $principalUri |
|
140 | + * @param string $principalUri |
|
141 | 141 | * @param bool $excludeBirthday |
142 | 142 | * @return int |
143 | 143 | */ |
@@ -1114,7 +1114,7 @@ discard block |
||
1114 | 1114 | * @param string $principalUri |
1115 | 1115 | * @param string $uri |
1116 | 1116 | * @param array $properties |
1117 | - * @return mixed |
|
1117 | + * @return integer |
|
1118 | 1118 | */ |
1119 | 1119 | function createSubscription($principalUri, $uri, array $properties) { |
1120 | 1120 | |
@@ -1473,6 +1473,9 @@ discard block |
||
1473 | 1473 | return $this->sharingBackend->applyShareAcl($resourceId, $acl); |
1474 | 1474 | } |
1475 | 1475 | |
1476 | + /** |
|
1477 | + * @param boolean $toV2 |
|
1478 | + */ |
|
1476 | 1479 | private function convertPrincipal($principalUri, $toV2) { |
1477 | 1480 | if ($this->principalBackend->getPrincipalPrefix() === 'principals') { |
1478 | 1481 | list(, $name) = URLUtil::splitPath($principalUri); |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | /** |
102 | 102 | * Return the number of address books for a principal |
103 | 103 | * |
104 | - * @param $principalUri |
|
104 | + * @param string $principalUri |
|
105 | 105 | * @return int |
106 | 106 | */ |
107 | 107 | public function getAddressBooksForUserCount($principalUri) { |
@@ -234,7 +234,8 @@ discard block |
||
234 | 234 | } |
235 | 235 | |
236 | 236 | /** |
237 | - * @param $addressBookUri |
|
237 | + * @param string $addressBookUri |
|
238 | + * @param string $principal |
|
238 | 239 | * @return array|null |
239 | 240 | */ |
240 | 241 | public function getAddressBooksByUri($principal, $addressBookUri) { |
@@ -916,6 +917,7 @@ discard block |
||
916 | 917 | * * readOnly - boolean |
917 | 918 | * * summary - Optional, a description for the share |
918 | 919 | * |
920 | + * @param integer $addressBookId |
|
919 | 921 | * @return array |
920 | 922 | */ |
921 | 923 | public function getShares($addressBookId) { |
@@ -1015,7 +1017,7 @@ discard block |
||
1015 | 1017 | |
1016 | 1018 | /** |
1017 | 1019 | * For shared address books the sharee is set in the ACL of the address book |
1018 | - * @param $addressBookId |
|
1020 | + * @param integer $addressBookId |
|
1019 | 1021 | * @param $acl |
1020 | 1022 | * @return array |
1021 | 1023 | */ |
@@ -1023,6 +1025,9 @@ discard block |
||
1023 | 1025 | return $this->sharingBackend->applyShareAcl($addressBookId, $acl); |
1024 | 1026 | } |
1025 | 1027 | |
1028 | + /** |
|
1029 | + * @param boolean $toV2 |
|
1030 | + */ |
|
1026 | 1031 | private function convertPrincipal($principalUri, $toV2) { |
1027 | 1032 | if ($this->principalBackend->getPrincipalPrefix() === 'principals') { |
1028 | 1033 | list(, $name) = URLUtil::splitPath($principalUri); |