@@ -116,8 +116,8 @@ |
||
| 116 | 116 | * Looks up a system wide defined value |
| 117 | 117 | * |
| 118 | 118 | * @param string $key the key of the value, under which it was saved |
| 119 | - * @param mixed $default the default value to be returned if the value isn't set |
|
| 120 | - * @return mixed the value or $default |
|
| 119 | + * @param string|false $default the default value to be returned if the value isn't set |
|
| 120 | + * @return string the value or $default |
|
| 121 | 121 | */ |
| 122 | 122 | public function getSystemValue($key, $default = '') { |
| 123 | 123 | return $this->systemConfig->getValue($key, $default); |
@@ -22,7 +22,6 @@ |
||
| 22 | 22 | use OC\Files\Cache\CacheEntry; |
| 23 | 23 | use OCP\Constants; |
| 24 | 24 | use OCP\Files\Cache\ICache; |
| 25 | -use OCP\Files\Cache\ICacheEntry; |
|
| 26 | 25 | use OCP\Files\FileInfo; |
| 27 | 26 | |
| 28 | 27 | class NullCache implements ICache { |
@@ -334,7 +334,7 @@ |
||
| 334 | 334 | * |
| 335 | 335 | * @param int $size file size in bytes |
| 336 | 336 | * @param array $files override '.htaccess' and '.user.ini' locations |
| 337 | - * @return bool false on failure, size on success |
|
| 337 | + * @return integer false on failure, size on success |
|
| 338 | 338 | */ |
| 339 | 339 | public static function setUploadLimit($size, $files = []) { |
| 340 | 340 | //don't allow user to break his config |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | * |
| 73 | 73 | * @NoAdminRequired |
| 74 | 74 | * @NoSubadminRequired |
| 75 | - * @return array |
|
| 75 | + * @return DataResponse |
|
| 76 | 76 | */ |
| 77 | 77 | public function addPersonalRootCertificate() { |
| 78 | 78 | return $this->addCertificate($this->userCertificateManager); |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | /** |
| 161 | 161 | * Add a new personal root certificate to the system's trust store |
| 162 | 162 | * |
| 163 | - * @return array |
|
| 163 | + * @return DataResponse |
|
| 164 | 164 | */ |
| 165 | 165 | public function addSystemRootCertificate() { |
| 166 | 166 | return $this->addCertificate($this->systemCertificateManager); |
@@ -95,7 +95,7 @@ |
||
| 95 | 95 | * @param string $key |
| 96 | 96 | * @param mixed $value |
| 97 | 97 | * @param int $ttl |
| 98 | - * @return bool|mixed |
|
| 98 | + * @return boolean |
|
| 99 | 99 | * @throws \OC\ForbiddenException |
| 100 | 100 | */ |
| 101 | 101 | public function set($key, $value, $ttl = 0) { |
@@ -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 | */ |
@@ -30,7 +30,6 @@ |
||
| 30 | 30 | |
| 31 | 31 | namespace OC\Core\Controller; |
| 32 | 32 | |
| 33 | -use OCA\Encryption\Exceptions\PrivateKeyMissingException; |
|
| 34 | 33 | use \OCP\AppFramework\Controller; |
| 35 | 34 | use \OCP\AppFramework\Http\TemplateResponse; |
| 36 | 35 | use OCP\AppFramework\Utility\ITimeFactory; |
@@ -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) { |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | /** |
| 53 | 53 | * get color for on-page elements: |
| 54 | 54 | * theme color by default, grey if theme color is to bright |
| 55 | - * @param $color |
|
| 55 | + * @param string $color |
|
| 56 | 56 | * @return string |
| 57 | 57 | */ |
| 58 | 58 | public function elementColor($color) { |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | /** |
| 86 | - * @param $color |
|
| 86 | + * @param string $color |
|
| 87 | 87 | * @return string base64 encoded radio button svg |
| 88 | 88 | */ |
| 89 | 89 | public function generateRadioButton($color) { |
@@ -152,8 +152,8 @@ discard block |
||
| 152 | 152 | /** |
| 153 | 153 | * replace default color with a custom one |
| 154 | 154 | * |
| 155 | - * @param $svg string content of a svg file |
|
| 156 | - * @param $color string color to match |
|
| 155 | + * @param string $svg string content of a svg file |
|
| 156 | + * @param string $color string color to match |
|
| 157 | 157 | * @return string |
| 158 | 158 | */ |
| 159 | 159 | public function colorizeSvg($svg, $color) { |
@@ -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); |