@@ -38,63 +38,63 @@ |
||
38 | 38 | use OCP\Util; |
39 | 39 | |
40 | 40 | class AdminController extends Controller { |
41 | - /** @var IJobList */ |
|
42 | - private $jobList; |
|
43 | - /** @var ISecureRandom */ |
|
44 | - private $secureRandom; |
|
45 | - /** @var IConfig */ |
|
46 | - private $config; |
|
47 | - /** @var ITimeFactory */ |
|
48 | - private $timeFactory; |
|
49 | - /** @var IL10N */ |
|
50 | - private $l10n; |
|
41 | + /** @var IJobList */ |
|
42 | + private $jobList; |
|
43 | + /** @var ISecureRandom */ |
|
44 | + private $secureRandom; |
|
45 | + /** @var IConfig */ |
|
46 | + private $config; |
|
47 | + /** @var ITimeFactory */ |
|
48 | + private $timeFactory; |
|
49 | + /** @var IL10N */ |
|
50 | + private $l10n; |
|
51 | 51 | |
52 | - /** |
|
53 | - * @param string $appName |
|
54 | - * @param IRequest $request |
|
55 | - * @param IJobList $jobList |
|
56 | - * @param ISecureRandom $secureRandom |
|
57 | - * @param IConfig $config |
|
58 | - * @param ITimeFactory $timeFactory |
|
59 | - * @param IL10N $l10n |
|
60 | - */ |
|
61 | - public function __construct($appName, |
|
62 | - IRequest $request, |
|
63 | - IJobList $jobList, |
|
64 | - ISecureRandom $secureRandom, |
|
65 | - IConfig $config, |
|
66 | - ITimeFactory $timeFactory, |
|
67 | - IL10N $l10n) { |
|
68 | - parent::__construct($appName, $request); |
|
69 | - $this->jobList = $jobList; |
|
70 | - $this->secureRandom = $secureRandom; |
|
71 | - $this->config = $config; |
|
72 | - $this->timeFactory = $timeFactory; |
|
73 | - $this->l10n = $l10n; |
|
74 | - } |
|
52 | + /** |
|
53 | + * @param string $appName |
|
54 | + * @param IRequest $request |
|
55 | + * @param IJobList $jobList |
|
56 | + * @param ISecureRandom $secureRandom |
|
57 | + * @param IConfig $config |
|
58 | + * @param ITimeFactory $timeFactory |
|
59 | + * @param IL10N $l10n |
|
60 | + */ |
|
61 | + public function __construct($appName, |
|
62 | + IRequest $request, |
|
63 | + IJobList $jobList, |
|
64 | + ISecureRandom $secureRandom, |
|
65 | + IConfig $config, |
|
66 | + ITimeFactory $timeFactory, |
|
67 | + IL10N $l10n) { |
|
68 | + parent::__construct($appName, $request); |
|
69 | + $this->jobList = $jobList; |
|
70 | + $this->secureRandom = $secureRandom; |
|
71 | + $this->config = $config; |
|
72 | + $this->timeFactory = $timeFactory; |
|
73 | + $this->l10n = $l10n; |
|
74 | + } |
|
75 | 75 | |
76 | - /** |
|
77 | - * @param string $channel |
|
78 | - * @return DataResponse |
|
79 | - */ |
|
80 | - public function setChannel(string $channel): DataResponse { |
|
81 | - Util::setChannel($channel); |
|
82 | - $this->config->setAppValue('core', 'lastupdatedat', 0); |
|
83 | - return new DataResponse(['status' => 'success', 'data' => ['message' => $this->l10n->t('Channel updated')]]); |
|
84 | - } |
|
76 | + /** |
|
77 | + * @param string $channel |
|
78 | + * @return DataResponse |
|
79 | + */ |
|
80 | + public function setChannel(string $channel): DataResponse { |
|
81 | + Util::setChannel($channel); |
|
82 | + $this->config->setAppValue('core', 'lastupdatedat', 0); |
|
83 | + return new DataResponse(['status' => 'success', 'data' => ['message' => $this->l10n->t('Channel updated')]]); |
|
84 | + } |
|
85 | 85 | |
86 | - /** |
|
87 | - * @return DataResponse |
|
88 | - */ |
|
89 | - public function createCredentials(): DataResponse { |
|
90 | - // Create a new job and store the creation date |
|
91 | - $this->jobList->add(ResetTokenBackgroundJob::class); |
|
92 | - $this->config->setAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()); |
|
86 | + /** |
|
87 | + * @return DataResponse |
|
88 | + */ |
|
89 | + public function createCredentials(): DataResponse { |
|
90 | + // Create a new job and store the creation date |
|
91 | + $this->jobList->add(ResetTokenBackgroundJob::class); |
|
92 | + $this->config->setAppValue('core', 'updater.secret.created', $this->timeFactory->getTime()); |
|
93 | 93 | |
94 | - // Create a new token |
|
95 | - $newToken = $this->secureRandom->generate(64); |
|
96 | - $this->config->setSystemValue('updater.secret', password_hash($newToken, PASSWORD_DEFAULT)); |
|
94 | + // Create a new token |
|
95 | + $newToken = $this->secureRandom->generate(64); |
|
96 | + $this->config->setSystemValue('updater.secret', password_hash($newToken, PASSWORD_DEFAULT)); |
|
97 | 97 | |
98 | - return new DataResponse($newToken); |
|
99 | - } |
|
98 | + return new DataResponse($newToken); |
|
99 | + } |
|
100 | 100 | } |
@@ -31,45 +31,45 @@ |
||
31 | 31 | * @package OCA\AdminAudit\Actions |
32 | 32 | */ |
33 | 33 | class Security extends Action { |
34 | - /** |
|
35 | - * Log twofactor auth enabled |
|
36 | - * |
|
37 | - * @param IUser $user |
|
38 | - * @param array $params |
|
39 | - */ |
|
40 | - public function twofactorFailed(IUser $user, array $params) { |
|
41 | - $params['uid'] = $user->getUID(); |
|
42 | - $params['displayName'] = $user->getDisplayName(); |
|
34 | + /** |
|
35 | + * Log twofactor auth enabled |
|
36 | + * |
|
37 | + * @param IUser $user |
|
38 | + * @param array $params |
|
39 | + */ |
|
40 | + public function twofactorFailed(IUser $user, array $params) { |
|
41 | + $params['uid'] = $user->getUID(); |
|
42 | + $params['displayName'] = $user->getDisplayName(); |
|
43 | 43 | |
44 | - $this->log( |
|
45 | - 'Failed two factor attempt by user %s (%s) with provider %s', |
|
46 | - $params, |
|
47 | - [ |
|
48 | - 'displayName', |
|
49 | - 'uid', |
|
50 | - 'provider', |
|
51 | - ] |
|
52 | - ); |
|
53 | - } |
|
44 | + $this->log( |
|
45 | + 'Failed two factor attempt by user %s (%s) with provider %s', |
|
46 | + $params, |
|
47 | + [ |
|
48 | + 'displayName', |
|
49 | + 'uid', |
|
50 | + 'provider', |
|
51 | + ] |
|
52 | + ); |
|
53 | + } |
|
54 | 54 | |
55 | - /** |
|
56 | - * Logs unsharing of data |
|
57 | - * |
|
58 | - * @param IUser $user |
|
59 | - * @param array $params |
|
60 | - */ |
|
61 | - public function twofactorSuccess(IUser $user, array $params) { |
|
62 | - $params['uid'] = $user->getUID(); |
|
63 | - $params['displayName'] = $user->getDisplayName(); |
|
55 | + /** |
|
56 | + * Logs unsharing of data |
|
57 | + * |
|
58 | + * @param IUser $user |
|
59 | + * @param array $params |
|
60 | + */ |
|
61 | + public function twofactorSuccess(IUser $user, array $params) { |
|
62 | + $params['uid'] = $user->getUID(); |
|
63 | + $params['displayName'] = $user->getDisplayName(); |
|
64 | 64 | |
65 | - $this->log( |
|
66 | - 'Successful two factor attempt by user %s (%s) with provider %s', |
|
67 | - $params, |
|
68 | - [ |
|
69 | - 'displayName', |
|
70 | - 'uid', |
|
71 | - 'provider', |
|
72 | - ] |
|
73 | - ); |
|
74 | - } |
|
65 | + $this->log( |
|
66 | + 'Successful two factor attempt by user %s (%s) with provider %s', |
|
67 | + $params, |
|
68 | + [ |
|
69 | + 'displayName', |
|
70 | + 'uid', |
|
71 | + 'provider', |
|
72 | + ] |
|
73 | + ); |
|
74 | + } |
|
75 | 75 | } |
@@ -36,47 +36,47 @@ |
||
36 | 36 | */ |
37 | 37 | class OwncloudGuestShareType implements IRepairStep { |
38 | 38 | |
39 | - /** @var IDBConnection */ |
|
40 | - private $connection; |
|
39 | + /** @var IDBConnection */ |
|
40 | + private $connection; |
|
41 | 41 | |
42 | - /** @var IConfig */ |
|
43 | - private $config; |
|
42 | + /** @var IConfig */ |
|
43 | + private $config; |
|
44 | 44 | |
45 | 45 | |
46 | - public function __construct(IDBConnection $connection, IConfig $config) { |
|
47 | - $this->connection = $connection; |
|
48 | - $this->config = $config; |
|
49 | - } |
|
46 | + public function __construct(IDBConnection $connection, IConfig $config) { |
|
47 | + $this->connection = $connection; |
|
48 | + $this->config = $config; |
|
49 | + } |
|
50 | 50 | |
51 | - /** |
|
52 | - * Returns the step's name |
|
53 | - * |
|
54 | - * @return string |
|
55 | - * @since 9.1.0 |
|
56 | - */ |
|
57 | - public function getName() { |
|
58 | - return 'Fix the share type of guest shares when migrating from ownCloud'; |
|
59 | - } |
|
51 | + /** |
|
52 | + * Returns the step's name |
|
53 | + * |
|
54 | + * @return string |
|
55 | + * @since 9.1.0 |
|
56 | + */ |
|
57 | + public function getName() { |
|
58 | + return 'Fix the share type of guest shares when migrating from ownCloud'; |
|
59 | + } |
|
60 | 60 | |
61 | - /** |
|
62 | - * @param IOutput $output |
|
63 | - */ |
|
64 | - public function run(IOutput $output) { |
|
65 | - if (!$this->shouldRun()) { |
|
66 | - return; |
|
67 | - } |
|
61 | + /** |
|
62 | + * @param IOutput $output |
|
63 | + */ |
|
64 | + public function run(IOutput $output) { |
|
65 | + if (!$this->shouldRun()) { |
|
66 | + return; |
|
67 | + } |
|
68 | 68 | |
69 | - $query = $this->connection->getQueryBuilder(); |
|
70 | - $query->update('share') |
|
71 | - ->set('share_type', $query->createNamedParameter(Share::SHARE_TYPE_GUEST)) |
|
72 | - ->where($query->expr()->eq('share_type', $query->createNamedParameter(Share::SHARE_TYPE_EMAIL))); |
|
73 | - $query->execute(); |
|
74 | - } |
|
69 | + $query = $this->connection->getQueryBuilder(); |
|
70 | + $query->update('share') |
|
71 | + ->set('share_type', $query->createNamedParameter(Share::SHARE_TYPE_GUEST)) |
|
72 | + ->where($query->expr()->eq('share_type', $query->createNamedParameter(Share::SHARE_TYPE_EMAIL))); |
|
73 | + $query->execute(); |
|
74 | + } |
|
75 | 75 | |
76 | - protected function shouldRun() { |
|
77 | - $appVersion = $this->config->getAppValue('files_sharing', 'installed_version', '0.0.0'); |
|
78 | - return $appVersion === '0.10.0' || |
|
79 | - $this->config->getAppValue('core', 'vendor', '') === 'owncloud'; |
|
80 | - } |
|
76 | + protected function shouldRun() { |
|
77 | + $appVersion = $this->config->getAppValue('files_sharing', 'installed_version', '0.0.0'); |
|
78 | + return $appVersion === '0.10.0' || |
|
79 | + $this->config->getAppValue('core', 'vendor', '') === 'owncloud'; |
|
80 | + } |
|
81 | 81 | |
82 | 82 | } |
@@ -23,63 +23,63 @@ |
||
23 | 23 | namespace OC\App\CodeChecker; |
24 | 24 | |
25 | 25 | class PrivateCheck extends AbstractCheck { |
26 | - /** |
|
27 | - * @return string |
|
28 | - */ |
|
29 | - protected function getLocalDescription() { |
|
30 | - return 'private'; |
|
31 | - } |
|
26 | + /** |
|
27 | + * @return string |
|
28 | + */ |
|
29 | + protected function getLocalDescription() { |
|
30 | + return 'private'; |
|
31 | + } |
|
32 | 32 | |
33 | - /** |
|
34 | - * @return array |
|
35 | - */ |
|
36 | - public function getLocalClasses() { |
|
37 | - return [ |
|
38 | - // classes replaced by the public api |
|
39 | - 'OC_API' => '6.0.0', |
|
40 | - 'OC_App' => '6.0.0', |
|
41 | - 'OC_AppConfig' => '6.0.0', |
|
42 | - 'OC_Avatar' => '6.0.0', |
|
43 | - 'OC_BackgroundJob' => '6.0.0', |
|
44 | - 'OC_Config' => '6.0.0', |
|
45 | - 'OC_DB' => '6.0.0', |
|
46 | - 'OC_Files' => '6.0.0', |
|
47 | - 'OC_Helper' => '6.0.0', |
|
48 | - 'OC_Hook' => '6.0.0', |
|
49 | - 'OC_Image' => '6.0.0', |
|
50 | - 'OC_JSON' => '6.0.0', |
|
51 | - 'OC_L10N' => '6.0.0', |
|
52 | - 'OC_Log' => '6.0.0', |
|
53 | - 'OC_Mail' => '6.0.0', |
|
54 | - 'OC_Preferences' => '6.0.0', |
|
55 | - 'OC_Search_Provider' => '6.0.0', |
|
56 | - 'OC_Search_Result' => '6.0.0', |
|
57 | - 'OC_Request' => '6.0.0', |
|
58 | - 'OC_Response' => '6.0.0', |
|
59 | - 'OC_Template' => '6.0.0', |
|
60 | - 'OC_User' => '6.0.0', |
|
61 | - 'OC_Util' => '6.0.0', |
|
62 | - ]; |
|
63 | - } |
|
33 | + /** |
|
34 | + * @return array |
|
35 | + */ |
|
36 | + public function getLocalClasses() { |
|
37 | + return [ |
|
38 | + // classes replaced by the public api |
|
39 | + 'OC_API' => '6.0.0', |
|
40 | + 'OC_App' => '6.0.0', |
|
41 | + 'OC_AppConfig' => '6.0.0', |
|
42 | + 'OC_Avatar' => '6.0.0', |
|
43 | + 'OC_BackgroundJob' => '6.0.0', |
|
44 | + 'OC_Config' => '6.0.0', |
|
45 | + 'OC_DB' => '6.0.0', |
|
46 | + 'OC_Files' => '6.0.0', |
|
47 | + 'OC_Helper' => '6.0.0', |
|
48 | + 'OC_Hook' => '6.0.0', |
|
49 | + 'OC_Image' => '6.0.0', |
|
50 | + 'OC_JSON' => '6.0.0', |
|
51 | + 'OC_L10N' => '6.0.0', |
|
52 | + 'OC_Log' => '6.0.0', |
|
53 | + 'OC_Mail' => '6.0.0', |
|
54 | + 'OC_Preferences' => '6.0.0', |
|
55 | + 'OC_Search_Provider' => '6.0.0', |
|
56 | + 'OC_Search_Result' => '6.0.0', |
|
57 | + 'OC_Request' => '6.0.0', |
|
58 | + 'OC_Response' => '6.0.0', |
|
59 | + 'OC_Template' => '6.0.0', |
|
60 | + 'OC_User' => '6.0.0', |
|
61 | + 'OC_Util' => '6.0.0', |
|
62 | + ]; |
|
63 | + } |
|
64 | 64 | |
65 | - /** |
|
66 | - * @return array |
|
67 | - */ |
|
68 | - public function getLocalConstants() { |
|
69 | - return []; |
|
70 | - } |
|
65 | + /** |
|
66 | + * @return array |
|
67 | + */ |
|
68 | + public function getLocalConstants() { |
|
69 | + return []; |
|
70 | + } |
|
71 | 71 | |
72 | - /** |
|
73 | - * @return array |
|
74 | - */ |
|
75 | - public function getLocalFunctions() { |
|
76 | - return []; |
|
77 | - } |
|
72 | + /** |
|
73 | + * @return array |
|
74 | + */ |
|
75 | + public function getLocalFunctions() { |
|
76 | + return []; |
|
77 | + } |
|
78 | 78 | |
79 | - /** |
|
80 | - * @return array |
|
81 | - */ |
|
82 | - public function getLocalMethods() { |
|
83 | - return []; |
|
84 | - } |
|
79 | + /** |
|
80 | + * @return array |
|
81 | + */ |
|
82 | + public function getLocalMethods() { |
|
83 | + return []; |
|
84 | + } |
|
85 | 85 | } |
@@ -26,27 +26,27 @@ |
||
26 | 26 | |
27 | 27 | class RequestTime extends Controller { |
28 | 28 | |
29 | - /** |
|
30 | - * @NoAdminRequired |
|
31 | - * |
|
32 | - * @param string $search |
|
33 | - * @return JSONResponse |
|
34 | - */ |
|
35 | - public function getTimezones($search = '') { |
|
36 | - $timezones = \DateTimeZone::listIdentifiers(); |
|
29 | + /** |
|
30 | + * @NoAdminRequired |
|
31 | + * |
|
32 | + * @param string $search |
|
33 | + * @return JSONResponse |
|
34 | + */ |
|
35 | + public function getTimezones($search = '') { |
|
36 | + $timezones = \DateTimeZone::listIdentifiers(); |
|
37 | 37 | |
38 | - if ($search !== '') { |
|
39 | - $timezones = array_filter($timezones, function ($timezone) use ($search) { |
|
40 | - return stripos($timezone, $search) !== false; |
|
41 | - }); |
|
42 | - } |
|
38 | + if ($search !== '') { |
|
39 | + $timezones = array_filter($timezones, function ($timezone) use ($search) { |
|
40 | + return stripos($timezone, $search) !== false; |
|
41 | + }); |
|
42 | + } |
|
43 | 43 | |
44 | - $timezones = array_slice($timezones, 0, 10); |
|
44 | + $timezones = array_slice($timezones, 0, 10); |
|
45 | 45 | |
46 | - $response = []; |
|
47 | - foreach ($timezones as $timezone) { |
|
48 | - $response[$timezone] = $timezone; |
|
49 | - } |
|
50 | - return new JSONResponse($response); |
|
51 | - } |
|
46 | + $response = []; |
|
47 | + foreach ($timezones as $timezone) { |
|
48 | + $response[$timezone] = $timezone; |
|
49 | + } |
|
50 | + return new JSONResponse($response); |
|
51 | + } |
|
52 | 52 | } |
@@ -30,44 +30,44 @@ |
||
30 | 30 | * @since 13.0.0 |
31 | 31 | */ |
32 | 32 | class SearchResultType { |
33 | - /** @var string */ |
|
34 | - protected $label; |
|
33 | + /** @var string */ |
|
34 | + protected $label; |
|
35 | 35 | |
36 | - /** |
|
37 | - * SearchResultType constructor. |
|
38 | - * |
|
39 | - * @param string $label |
|
40 | - * @since 13.0.0 |
|
41 | - */ |
|
42 | - public function __construct($label) { |
|
43 | - $this->label = $this->getValidatedType($label); |
|
44 | - } |
|
36 | + /** |
|
37 | + * SearchResultType constructor. |
|
38 | + * |
|
39 | + * @param string $label |
|
40 | + * @since 13.0.0 |
|
41 | + */ |
|
42 | + public function __construct($label) { |
|
43 | + $this->label = $this->getValidatedType($label); |
|
44 | + } |
|
45 | 45 | |
46 | - /** |
|
47 | - * @return string |
|
48 | - * @since 13.0.0 |
|
49 | - */ |
|
50 | - public function getLabel() { |
|
51 | - return $this->label; |
|
52 | - } |
|
46 | + /** |
|
47 | + * @return string |
|
48 | + * @since 13.0.0 |
|
49 | + */ |
|
50 | + public function getLabel() { |
|
51 | + return $this->label; |
|
52 | + } |
|
53 | 53 | |
54 | - /** |
|
55 | - * @param $type |
|
56 | - * @return string |
|
57 | - * @throws \InvalidArgumentException |
|
58 | - * @since 13.0.0 |
|
59 | - */ |
|
60 | - protected function getValidatedType($type) { |
|
61 | - $type = trim((string)$type); |
|
54 | + /** |
|
55 | + * @param $type |
|
56 | + * @return string |
|
57 | + * @throws \InvalidArgumentException |
|
58 | + * @since 13.0.0 |
|
59 | + */ |
|
60 | + protected function getValidatedType($type) { |
|
61 | + $type = trim((string)$type); |
|
62 | 62 | |
63 | - if($type === '') { |
|
64 | - throw new \InvalidArgumentException('Type must not be empty'); |
|
65 | - } |
|
63 | + if($type === '') { |
|
64 | + throw new \InvalidArgumentException('Type must not be empty'); |
|
65 | + } |
|
66 | 66 | |
67 | - if($type === 'exact') { |
|
68 | - throw new \InvalidArgumentException('Provided type is a reserved word'); |
|
69 | - } |
|
67 | + if($type === 'exact') { |
|
68 | + throw new \InvalidArgumentException('Provided type is a reserved word'); |
|
69 | + } |
|
70 | 70 | |
71 | - return $type; |
|
72 | - } |
|
71 | + return $type; |
|
72 | + } |
|
73 | 73 | } |
@@ -32,70 +32,70 @@ |
||
32 | 32 | |
33 | 33 | class UUIDFixInsert implements IRepairStep { |
34 | 34 | |
35 | - /** @var IConfig */ |
|
36 | - protected $config; |
|
35 | + /** @var IConfig */ |
|
36 | + protected $config; |
|
37 | 37 | |
38 | - /** @var UserMapping */ |
|
39 | - protected $userMapper; |
|
38 | + /** @var UserMapping */ |
|
39 | + protected $userMapper; |
|
40 | 40 | |
41 | - /** @var GroupMapping */ |
|
42 | - protected $groupMapper; |
|
41 | + /** @var GroupMapping */ |
|
42 | + protected $groupMapper; |
|
43 | 43 | |
44 | - /** @var IJobList */ |
|
45 | - protected $jobList; |
|
44 | + /** @var IJobList */ |
|
45 | + protected $jobList; |
|
46 | 46 | |
47 | - public function __construct(IConfig $config, UserMapping $userMapper, GroupMapping $groupMapper, IJobList $jobList) { |
|
48 | - $this->config = $config; |
|
49 | - $this->userMapper = $userMapper; |
|
50 | - $this->groupMapper = $groupMapper; |
|
51 | - $this->jobList = $jobList; |
|
52 | - } |
|
47 | + public function __construct(IConfig $config, UserMapping $userMapper, GroupMapping $groupMapper, IJobList $jobList) { |
|
48 | + $this->config = $config; |
|
49 | + $this->userMapper = $userMapper; |
|
50 | + $this->groupMapper = $groupMapper; |
|
51 | + $this->jobList = $jobList; |
|
52 | + } |
|
53 | 53 | |
54 | - /** |
|
55 | - * Returns the step's name |
|
56 | - * |
|
57 | - * @return string |
|
58 | - * @since 9.1.0 |
|
59 | - */ |
|
60 | - public function getName() { |
|
61 | - return 'Insert UUIDFix background job for user and group in batches'; |
|
62 | - } |
|
54 | + /** |
|
55 | + * Returns the step's name |
|
56 | + * |
|
57 | + * @return string |
|
58 | + * @since 9.1.0 |
|
59 | + */ |
|
60 | + public function getName() { |
|
61 | + return 'Insert UUIDFix background job for user and group in batches'; |
|
62 | + } |
|
63 | 63 | |
64 | - /** |
|
65 | - * Run repair step. |
|
66 | - * Must throw exception on error. |
|
67 | - * |
|
68 | - * @param IOutput $output |
|
69 | - * @throws \Exception in case of failure |
|
70 | - * @since 9.1.0 |
|
71 | - */ |
|
72 | - public function run(IOutput $output) { |
|
73 | - $installedVersion = $this->config->getAppValue('user_ldap', 'installed_version', '1.2.1'); |
|
74 | - if(version_compare($installedVersion, '1.2.1') !== -1) { |
|
75 | - return; |
|
76 | - } |
|
64 | + /** |
|
65 | + * Run repair step. |
|
66 | + * Must throw exception on error. |
|
67 | + * |
|
68 | + * @param IOutput $output |
|
69 | + * @throws \Exception in case of failure |
|
70 | + * @since 9.1.0 |
|
71 | + */ |
|
72 | + public function run(IOutput $output) { |
|
73 | + $installedVersion = $this->config->getAppValue('user_ldap', 'installed_version', '1.2.1'); |
|
74 | + if(version_compare($installedVersion, '1.2.1') !== -1) { |
|
75 | + return; |
|
76 | + } |
|
77 | 77 | |
78 | - foreach ([$this->userMapper, $this->groupMapper] as $mapper) { |
|
79 | - $offset = 0; |
|
80 | - $batchSize = 50; |
|
81 | - $jobClass = $mapper instanceof UserMapping ? UUIDFixUser::class : UUIDFixGroup::class; |
|
82 | - do { |
|
83 | - $retry = false; |
|
84 | - $records = $mapper->getList($offset, $batchSize); |
|
85 | - if(count($records) === 0){ |
|
86 | - continue; |
|
87 | - } |
|
88 | - try { |
|
89 | - $this->jobList->add($jobClass, ['records' => $records]); |
|
90 | - $offset += $batchSize; |
|
91 | - } catch (\InvalidArgumentException $e) { |
|
92 | - if(strpos($e->getMessage(), 'Background job arguments can\'t exceed 4000') !== false) { |
|
93 | - $batchSize = (int)floor(count($records) * 0.8); |
|
94 | - $retry = true; |
|
95 | - } |
|
96 | - } |
|
97 | - } while (count($records) === $batchSize || $retry); |
|
98 | - } |
|
78 | + foreach ([$this->userMapper, $this->groupMapper] as $mapper) { |
|
79 | + $offset = 0; |
|
80 | + $batchSize = 50; |
|
81 | + $jobClass = $mapper instanceof UserMapping ? UUIDFixUser::class : UUIDFixGroup::class; |
|
82 | + do { |
|
83 | + $retry = false; |
|
84 | + $records = $mapper->getList($offset, $batchSize); |
|
85 | + if(count($records) === 0){ |
|
86 | + continue; |
|
87 | + } |
|
88 | + try { |
|
89 | + $this->jobList->add($jobClass, ['records' => $records]); |
|
90 | + $offset += $batchSize; |
|
91 | + } catch (\InvalidArgumentException $e) { |
|
92 | + if(strpos($e->getMessage(), 'Background job arguments can\'t exceed 4000') !== false) { |
|
93 | + $batchSize = (int)floor(count($records) * 0.8); |
|
94 | + $retry = true; |
|
95 | + } |
|
96 | + } |
|
97 | + } while (count($records) === $batchSize || $retry); |
|
98 | + } |
|
99 | 99 | |
100 | - } |
|
100 | + } |
|
101 | 101 | } |
@@ -37,14 +37,14 @@ |
||
37 | 37 | $appContainer = \OC_Mount_Config::$app->getContainer(); |
38 | 38 | |
39 | 39 | \OCA\Files\App::getNavigationManager()->add(function () { |
40 | - $l = \OC::$server->getL10N('files_external'); |
|
41 | - return [ |
|
42 | - 'id' => 'extstoragemounts', |
|
43 | - 'appname' => 'files_external', |
|
44 | - 'script' => 'list.php', |
|
45 | - 'order' => 30, |
|
46 | - 'name' => $l->t('External storages'), |
|
47 | - ]; |
|
40 | + $l = \OC::$server->getL10N('files_external'); |
|
41 | + return [ |
|
42 | + 'id' => 'extstoragemounts', |
|
43 | + 'appname' => 'files_external', |
|
44 | + 'script' => 'list.php', |
|
45 | + 'order' => 30, |
|
46 | + 'name' => $l->t('External storages'), |
|
47 | + ]; |
|
48 | 48 | }); |
49 | 49 | |
50 | 50 | $mountProvider = $appContainer->query(ConfigAdapter::class); |
@@ -27,10 +27,10 @@ |
||
27 | 27 | |
28 | 28 | class DefaultTokenCleanupJob extends Job { |
29 | 29 | |
30 | - protected function run($argument) { |
|
31 | - /* @var $provider IProvider */ |
|
32 | - $provider = OC::$server->query(IProvider::class); |
|
33 | - $provider->invalidateOldTokens(); |
|
34 | - } |
|
30 | + protected function run($argument) { |
|
31 | + /* @var $provider IProvider */ |
|
32 | + $provider = OC::$server->query(IProvider::class); |
|
33 | + $provider->invalidateOldTokens(); |
|
34 | + } |
|
35 | 35 | |
36 | 36 | } |