@@ -273,6 +273,10 @@ discard block |
||
273 | 273 | return '/^' . preg_quote($this->config->getSystemValue('dbtableprefix', 'oc_')) . '/'; |
274 | 274 | } |
275 | 275 | |
276 | + /** |
|
277 | + * @param integer $step |
|
278 | + * @param integer $max |
|
279 | + */ |
|
276 | 280 | protected function emit($sql, $step, $max) { |
277 | 281 | if ($this->noEmit) { |
278 | 282 | return; |
@@ -283,6 +287,10 @@ discard block |
||
283 | 287 | $this->dispatcher->dispatch('\OC\DB\Migrator::executeSql', new GenericEvent($sql, [$step+1, $max])); |
284 | 288 | } |
285 | 289 | |
290 | + /** |
|
291 | + * @param integer $step |
|
292 | + * @param integer $max |
|
293 | + */ |
|
286 | 294 | private function emitCheckStep($tableName, $step, $max) { |
287 | 295 | if(is_null($this->dispatcher)) { |
288 | 296 | return; |
@@ -300,7 +300,7 @@ discard block |
||
300 | 300 | * @param IRequest $request |
301 | 301 | * @throws LoginException |
302 | 302 | * @throws PasswordLoginForbiddenException |
303 | - * @return boolean |
|
303 | + * @return boolean|null |
|
304 | 304 | */ |
305 | 305 | public function logClientIn($user, $password, IRequest $request) { |
306 | 306 | $isTokenPassword = $this->isTokenPassword($password); |
@@ -340,6 +340,9 @@ discard block |
||
340 | 340 | return $this->config->getSystemValue('token_auth_enforced', false); |
341 | 341 | } |
342 | 342 | |
343 | + /** |
|
344 | + * @param string $username |
|
345 | + */ |
|
343 | 346 | protected function isTwoFactorEnforced($username) { |
344 | 347 | Util::emitHook( |
345 | 348 | '\OCA\Files_Sharing\API\Server2Server', |
@@ -27,13 +27,8 @@ |
||
27 | 27 | use OCA\Files_External\Lib\DefinitionParameter; |
28 | 28 | use OCA\Files_External\Service\BackendService; |
29 | 29 | use Symfony\Component\Console\Command\Command; |
30 | -use Symfony\Component\Console\Helper\Table; |
|
31 | -use Symfony\Component\Console\Helper\TableHelper; |
|
32 | -use Symfony\Component\Console\Input\ArrayInput; |
|
33 | 30 | use Symfony\Component\Console\Input\InputArgument; |
34 | 31 | use Symfony\Component\Console\Input\InputInterface; |
35 | -use Symfony\Component\Console\Input\InputOption; |
|
36 | -use Symfony\Component\Console\Input\Input; |
|
37 | 32 | use Symfony\Component\Console\Output\OutputInterface; |
38 | 33 | |
39 | 34 | class Backends extends Base { |
@@ -103,6 +103,7 @@ discard block |
||
103 | 103 | |
104 | 104 | /** |
105 | 105 | * Chceks if the ownCloud server can connect to a specific URL using both HTTPS and HTTP |
106 | + * @param string $sitename |
|
106 | 107 | * @return bool |
107 | 108 | */ |
108 | 109 | private function isSiteReachable($sitename) { |
@@ -285,7 +286,7 @@ discard block |
||
285 | 286 | |
286 | 287 | /** |
287 | 288 | * @NoCSRFRequired |
288 | - * @return DataResponse |
|
289 | + * @return DataDisplayResponse |
|
289 | 290 | */ |
290 | 291 | public function getFailedIntegrityCheckFiles() { |
291 | 292 | if(!$this->checker->isCodeCheckEnforced()) { |
@@ -29,7 +29,6 @@ |
||
29 | 29 | */ |
30 | 30 | |
31 | 31 | namespace OC; |
32 | -use OCP\Defaults; |
|
33 | 32 | use OCP\ICacheFactory; |
34 | 33 | use OCP\IConfig; |
35 | 34 | use OCP\IURLGenerator; |
@@ -35,15 +35,6 @@ |
||
35 | 35 | */ |
36 | 36 | namespace OC; |
37 | 37 | |
38 | -use Assetic\Asset\AssetCollection; |
|
39 | -use Assetic\Asset\FileAsset; |
|
40 | -use Assetic\AssetWriter; |
|
41 | -use Assetic\Filter\CssImportFilter; |
|
42 | -use Assetic\Filter\CssMinFilter; |
|
43 | -use Assetic\Filter\CssRewriteFilter; |
|
44 | -use Assetic\Filter\JSqueezeFilter; |
|
45 | -use Assetic\Filter\SeparatorFilter; |
|
46 | - |
|
47 | 38 | class TemplateLayout extends \OC_Template { |
48 | 39 | |
49 | 40 | private static $versionHash = ''; |
@@ -22,7 +22,6 @@ |
||
22 | 22 | |
23 | 23 | namespace OC\Core\Controller; |
24 | 24 | |
25 | -use OC\AppFramework\Utility\TimeFactory; |
|
26 | 25 | use OC\Authentication\TwoFactorAuth\Manager; |
27 | 26 | use OC\Security\Bruteforce\Throttler; |
28 | 27 | use OC\User\Session; |
@@ -22,13 +22,10 @@ |
||
22 | 22 | namespace OC\Core\Controller; |
23 | 23 | |
24 | 24 | use OC\AppFramework\Http; |
25 | -use OC\AppFramework\Utility\TimeFactory; |
|
26 | -use OC\Authentication\Token\DefaultTokenProvider; |
|
27 | 25 | use OC\Authentication\Token\IProvider; |
28 | 26 | use OC\Authentication\Token\IToken; |
29 | 27 | use OC\Authentication\TwoFactorAuth\Manager as TwoFactorAuthManager; |
30 | 28 | use OC\User\Manager as UserManager; |
31 | -use OCA\User_LDAP\User\Manager; |
|
32 | 29 | use OCP\AppFramework\Controller; |
33 | 30 | use OCP\AppFramework\Http\JSONResponse; |
34 | 31 | use OCP\IRequest; |
@@ -219,7 +219,7 @@ |
||
219 | 219 | * @param array $groupSharesById |
220 | 220 | * @param array $subShares |
221 | 221 | * |
222 | - * @return true if the share is valid, false if it needs repair |
|
222 | + * @return boolean if the share is valid, false if it needs repair |
|
223 | 223 | */ |
224 | 224 | private function isThisShareValid($groupSharesById, $subShares) { |
225 | 225 | $foundTargets = []; |