@@ -132,7 +132,7 @@ |
||
132 | 132 | } |
133 | 133 | |
134 | 134 | /** |
135 | - * @param $message |
|
135 | + * @param string $message |
|
136 | 136 | * @param array $additional |
137 | 137 | * @return array |
138 | 138 | */ |
@@ -361,7 +361,7 @@ discard block |
||
361 | 361 | |
362 | 362 | /** |
363 | 363 | * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN or failure |
364 | - * @param string $dn the dn of the user object |
|
364 | + * @param string $fdn the dn of the user object |
|
365 | 365 | * @param string $ldapName optional, the display name of the object |
366 | 366 | * @return string|false with with the name to use in ownCloud |
367 | 367 | */ |
@@ -378,7 +378,7 @@ discard block |
||
378 | 378 | |
379 | 379 | /** |
380 | 380 | * returns an internal ownCloud name for the given LDAP DN, false on DN outside of search DN |
381 | - * @param string $dn the dn of the user object |
|
381 | + * @param string $fdn the dn of the user object |
|
382 | 382 | * @param string $ldapName optional, the display name of the object |
383 | 383 | * @param bool $isUser optional, whether it is a user object (otherwise group assumed) |
384 | 384 | * @return string|false with with the name to use in ownCloud |
@@ -638,7 +638,7 @@ discard block |
||
638 | 638 | * the login filter. |
639 | 639 | * |
640 | 640 | * @param string $loginName |
641 | - * @param array $attributes optional, list of attributes to read |
|
641 | + * @param string[] $attributes optional, list of attributes to read |
|
642 | 642 | * @return array |
643 | 643 | */ |
644 | 644 | public function fetchUsersByLoginName($loginName, $attributes = array('dn')) { |
@@ -711,7 +711,7 @@ discard block |
||
711 | 711 | |
712 | 712 | /** |
713 | 713 | * @param string $filter |
714 | - * @param string|string[] $attr |
|
714 | + * @param string[] $attr |
|
715 | 715 | * @param int $limit |
716 | 716 | * @param int $offset |
717 | 717 | * @return array |
@@ -759,7 +759,7 @@ discard block |
||
759 | 759 | |
760 | 760 | /** |
761 | 761 | * @param string $filter |
762 | - * @param string|string[] $attr |
|
762 | + * @param string[] $attr |
|
763 | 763 | * @param int $limit |
764 | 764 | * @param int $offset |
765 | 765 | * @return false|int |
@@ -809,6 +809,7 @@ discard block |
||
809 | 809 | * retrieved. Results will according to the order in the array. |
810 | 810 | * @param int $limit optional, maximum results to be counted |
811 | 811 | * @param int $offset optional, a starting point |
812 | + * @param string $filter |
|
812 | 813 | * @return array|false array with the search result as first value and pagedSearchOK as |
813 | 814 | * second | false if not successful |
814 | 815 | */ |
@@ -1063,7 +1064,7 @@ discard block |
||
1063 | 1064 | |
1064 | 1065 | /** |
1065 | 1066 | * @param string $name |
1066 | - * @return bool|mixed|string |
|
1067 | + * @return string |
|
1067 | 1068 | */ |
1068 | 1069 | public function sanitizeUsername($name) { |
1069 | 1070 | if($this->connection->ldapIgnoreNamingRules) { |
@@ -1087,6 +1088,7 @@ discard block |
||
1087 | 1088 | * escapes (user provided) parts for LDAP filter |
1088 | 1089 | * @param string $input, the provided value |
1089 | 1090 | * @param bool $allowAsterisk whether in * at the beginning should be preserved |
1091 | + * @param string $input |
|
1090 | 1092 | * @return string the escaped string |
1091 | 1093 | */ |
1092 | 1094 | public function escapeFilterPart($input, $allowAsterisk = false) { |
@@ -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); |
@@ -21,7 +21,6 @@ |
||
21 | 21 | namespace OCA\DAV\CalDAV; |
22 | 22 | |
23 | 23 | use Sabre\DAV\Collection; |
24 | -use Sabre\DAV\Exception\NotFound; |
|
25 | 24 | |
26 | 25 | class PublicCalendarRoot extends Collection { |
27 | 26 |
@@ -2,7 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace OCA\DAV\CalDAV\Publishing\Xml; |
4 | 4 | |
5 | -use OCA\DAV\CalDAV\Publishing\PublishPlugin as Plugin; |
|
6 | 5 | use Sabre\Xml\Writer; |
7 | 6 | use Sabre\Xml\XmlSerializable; |
8 | 7 |
@@ -34,7 +34,7 @@ |
||
34 | 34 | private $webRoot; |
35 | 35 | |
36 | 36 | /** |
37 | - * @param $webRoot |
|
37 | + * @param string $webRoot |
|
38 | 38 | */ |
39 | 39 | public function __construct($webRoot) { |
40 | 40 | $this->webRoot = $webRoot; |