@@ -102,6 +102,9 @@ |
||
102 | 102 | return \OC_App::getAppVersions(); |
103 | 103 | } |
104 | 104 | |
105 | + /** |
|
106 | + * @param string $appId |
|
107 | + */ |
|
105 | 108 | protected function getAppInfo($appId) { |
106 | 109 | return \OC_App::getAppInfo($appId); |
107 | 110 | } |
@@ -395,7 +395,7 @@ discard block |
||
395 | 395 | |
396 | 396 | /** |
397 | 397 | * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN or failure |
398 | - * @param string $dn the dn of the user object |
|
398 | + * @param string $fdn the dn of the user object |
|
399 | 399 | * @param string $ldapName optional, the display name of the object |
400 | 400 | * @return string|false with with the name to use in ownCloud |
401 | 401 | */ |
@@ -412,7 +412,7 @@ discard block |
||
412 | 412 | |
413 | 413 | /** |
414 | 414 | * returns an internal ownCloud name for the given LDAP DN, false on DN outside of search DN |
415 | - * @param string $dn the dn of the user object |
|
415 | + * @param string $fdn the dn of the user object |
|
416 | 416 | * @param string $ldapName optional, the display name of the object |
417 | 417 | * @param bool $isUser optional, whether it is a user object (otherwise group assumed) |
418 | 418 | * @return string|false with with the name to use in ownCloud |
@@ -672,7 +672,7 @@ discard block |
||
672 | 672 | * the login filter. |
673 | 673 | * |
674 | 674 | * @param string $loginName |
675 | - * @param array $attributes optional, list of attributes to read |
|
675 | + * @param string[] $attributes optional, list of attributes to read |
|
676 | 676 | * @return array |
677 | 677 | */ |
678 | 678 | public function fetchUsersByLoginName($loginName, $attributes = array('dn')) { |
@@ -738,7 +738,7 @@ discard block |
||
738 | 738 | |
739 | 739 | /** |
740 | 740 | * @param string $filter |
741 | - * @param string|string[] $attr |
|
741 | + * @param string[] $attr |
|
742 | 742 | * @param int $limit |
743 | 743 | * @param int $offset |
744 | 744 | * @return array |
@@ -786,7 +786,7 @@ discard block |
||
786 | 786 | |
787 | 787 | /** |
788 | 788 | * @param string $filter |
789 | - * @param string|string[] $attr |
|
789 | + * @param string[] $attr |
|
790 | 790 | * @param int $limit |
791 | 791 | * @param int $offset |
792 | 792 | * @return false|int |
@@ -836,6 +836,7 @@ discard block |
||
836 | 836 | * retrieved. Results will according to the order in the array. |
837 | 837 | * @param int $limit optional, maximum results to be counted |
838 | 838 | * @param int $offset optional, a starting point |
839 | + * @param string $filter |
|
839 | 840 | * @return array|false array with the search result as first value and pagedSearchOK as |
840 | 841 | * second | false if not successful |
841 | 842 | */ |
@@ -882,7 +883,7 @@ discard block |
||
882 | 883 | * @param bool $pagedSearchOK whether a paged search has been executed |
883 | 884 | * @param bool $skipHandling required for paged search when cookies to |
884 | 885 | * prior results need to be gained |
885 | - * @return bool cookie validity, true if we have more pages, false otherwise. |
|
886 | + * @return null|boolean cookie validity, true if we have more pages, false otherwise. |
|
886 | 887 | */ |
887 | 888 | private function processPagedSearchStatus($sr, $filter, $base, $iFoundItems, $limit, $offset, $pagedSearchOK, $skipHandling) { |
888 | 889 | $cookie = null; |
@@ -1091,7 +1092,7 @@ discard block |
||
1091 | 1092 | |
1092 | 1093 | /** |
1093 | 1094 | * @param string $name |
1094 | - * @return bool|mixed|string |
|
1095 | + * @return string |
|
1095 | 1096 | */ |
1096 | 1097 | public function sanitizeUsername($name) { |
1097 | 1098 | if($this->connection->ldapIgnoreNamingRules) { |
@@ -1115,6 +1116,7 @@ discard block |
||
1115 | 1116 | * escapes (user provided) parts for LDAP filter |
1116 | 1117 | * @param string $input, the provided value |
1117 | 1118 | * @param bool $allowAsterisk whether in * at the beginning should be preserved |
1119 | + * @param string $input |
|
1118 | 1120 | * @return string the escaped string |
1119 | 1121 | */ |
1120 | 1122 | public function escapeFilterPart($input, $allowAsterisk = false) { |
@@ -1673,7 +1675,7 @@ discard block |
||
1673 | 1675 | |
1674 | 1676 | /** |
1675 | 1677 | * Check whether the most recent paged search was successful. It flushed the state var. Use it always after a possible paged search. |
1676 | - * @return boolean|null true on success, null or false otherwise |
|
1678 | + * @return boolean true on success, null or false otherwise |
|
1677 | 1679 | */ |
1678 | 1680 | public function getPagedSearchResultState() { |
1679 | 1681 | $result = $this->pagedSearchedSuccessful; |
@@ -1688,7 +1690,7 @@ discard block |
||
1688 | 1690 | * @param string[] $attr optional, when a certain attribute shall be filtered outside |
1689 | 1691 | * @param int $limit |
1690 | 1692 | * @param int $offset |
1691 | - * @return bool|true |
|
1693 | + * @return boolean |
|
1692 | 1694 | */ |
1693 | 1695 | private function initPagedSearch($filter, $bases, $attr, $limit, $offset) { |
1694 | 1696 | $pagedSearchOK = false; |
@@ -74,8 +74,6 @@ |
||
74 | 74 | /** |
75 | 75 | * save the configuration value as provided |
76 | 76 | * @param string $configID |
77 | - * @param string $configKey |
|
78 | - * @param string $configValue |
|
79 | 77 | */ |
80 | 78 | protected function setValue($configID, $key, $value) { |
81 | 79 | $configHolder = new Configuration($configID); |
@@ -77,7 +77,7 @@ |
||
77 | 77 | } |
78 | 78 | |
79 | 79 | /** |
80 | - * @return int |
|
80 | + * @return string |
|
81 | 81 | */ |
82 | 82 | static private function getRefreshInterval() { |
83 | 83 | //defaults to every hour |
@@ -867,7 +867,7 @@ discard block |
||
867 | 867 | * @param integer $filterType int, for which use case the filter shall be created |
868 | 868 | * can be any of self::LFILTER_USER_LIST, self::LFILTER_LOGIN or |
869 | 869 | * self::LFILTER_GROUP_LIST |
870 | - * @return string|false string with the filter on success, false otherwise |
|
870 | + * @return string string with the filter on success, false otherwise |
|
871 | 871 | * @throws \Exception |
872 | 872 | */ |
873 | 873 | private function composeLdapFilter($filterType) { |
@@ -1103,7 +1103,7 @@ discard block |
||
1103 | 1103 | } |
1104 | 1104 | |
1105 | 1105 | /** |
1106 | - * @param array $reqs |
|
1106 | + * @param string[] $reqs |
|
1107 | 1107 | * @return bool |
1108 | 1108 | */ |
1109 | 1109 | private function checkRequirements($reqs) { |
@@ -146,6 +146,7 @@ discard block |
||
146 | 146 | /** |
147 | 147 | * @param string $userId |
148 | 148 | * @param string $userId |
149 | + * @param string $token |
|
149 | 150 | * @throws \Exception |
150 | 151 | */ |
151 | 152 | private function checkPasswordResetToken($token, $userId) { |
@@ -167,7 +168,7 @@ discard block |
||
167 | 168 | } |
168 | 169 | |
169 | 170 | /** |
170 | - * @param $message |
|
171 | + * @param string $message |
|
171 | 172 | * @param array $additional |
172 | 173 | * @return array |
173 | 174 | */ |
@@ -96,6 +96,10 @@ |
||
96 | 96 | // TODO: dont check/enforce 2FA if a auth token is used |
97 | 97 | } |
98 | 98 | |
99 | + /** |
|
100 | + * @param Controller $controller |
|
101 | + * @param string $methodName |
|
102 | + */ |
|
99 | 103 | private function checkTwoFactor($controller, $methodName) { |
100 | 104 | // If two-factor auth is in progress disallow access to any controllers |
101 | 105 | // defined within "LoginController". |
@@ -112,7 +112,7 @@ |
||
112 | 112 | * Looks up a system wide defined value |
113 | 113 | * |
114 | 114 | * @param string $key the key of the value, under which it was saved |
115 | - * @param mixed $default the default value to be returned if the value isn't set |
|
115 | + * @param string $default the default value to be returned if the value isn't set |
|
116 | 116 | * @return mixed the value or $default |
117 | 117 | */ |
118 | 118 | public function getSystemValue($key, $default = '') { |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | /** |
118 | 118 | * List all installed apps |
119 | 119 | * |
120 | - * @return string[] |
|
120 | + * @return integer[] |
|
121 | 121 | */ |
122 | 122 | public function getInstalledApps() { |
123 | 123 | return array_keys($this->getInstalledAppsValues()); |
@@ -274,7 +274,7 @@ discard block |
||
274 | 274 | /** |
275 | 275 | * Returns a list of apps that need upgrade |
276 | 276 | * |
277 | - * @param array $version ownCloud version as array of version components |
|
277 | + * @param array $ocVersion ownCloud version as array of version components |
|
278 | 278 | * @return array list of app info from apps that need an upgrade |
279 | 279 | * |
280 | 280 | * @internal |
@@ -344,6 +344,9 @@ discard block |
||
344 | 344 | return in_array($appId, $this->shippedApps); |
345 | 345 | } |
346 | 346 | |
347 | + /** |
|
348 | + * @param string $appId |
|
349 | + */ |
|
347 | 350 | private function isAlwaysEnabled($appId) { |
348 | 351 | $alwaysEnabled = $this->getAlwaysEnabledApps(); |
349 | 352 | return in_array($appId, $alwaysEnabled); |