@@ -30,41 +30,41 @@ |
||
30 | 30 | * @var $this \OCP\Route\IRouter |
31 | 31 | **/ |
32 | 32 | \OC_Mount_Config::$app->registerRoutes( |
33 | - $this, |
|
34 | - [ |
|
35 | - 'resources' => [ |
|
36 | - 'global_storages' => ['url' => '/globalstorages'], |
|
37 | - 'user_storages' => ['url' => '/userstorages'], |
|
38 | - 'user_global_storages' => ['url' => '/userglobalstorages'], |
|
39 | - ], |
|
40 | - 'routes' => [ |
|
41 | - [ |
|
42 | - 'name' => 'Ajax#getSshKeys', |
|
43 | - 'url' => '/ajax/public_key.php', |
|
44 | - 'verb' => 'POST', |
|
45 | - 'requirements' => [], |
|
46 | - ], |
|
47 | - [ |
|
48 | - 'name' => 'Ajax#saveGlobalCredentials', |
|
49 | - 'url' => '/globalcredentials', |
|
50 | - 'verb' => 'POST', |
|
51 | - ], |
|
52 | - ], |
|
53 | - 'ocs' => [ |
|
54 | - [ |
|
55 | - 'name' => 'Api#getUserMounts', |
|
56 | - 'url' => '/api/v1/mounts', |
|
57 | - 'verb' => 'GET', |
|
58 | - ], |
|
59 | - ], |
|
60 | - ] |
|
33 | + $this, |
|
34 | + [ |
|
35 | + 'resources' => [ |
|
36 | + 'global_storages' => ['url' => '/globalstorages'], |
|
37 | + 'user_storages' => ['url' => '/userstorages'], |
|
38 | + 'user_global_storages' => ['url' => '/userglobalstorages'], |
|
39 | + ], |
|
40 | + 'routes' => [ |
|
41 | + [ |
|
42 | + 'name' => 'Ajax#getSshKeys', |
|
43 | + 'url' => '/ajax/public_key.php', |
|
44 | + 'verb' => 'POST', |
|
45 | + 'requirements' => [], |
|
46 | + ], |
|
47 | + [ |
|
48 | + 'name' => 'Ajax#saveGlobalCredentials', |
|
49 | + 'url' => '/globalcredentials', |
|
50 | + 'verb' => 'POST', |
|
51 | + ], |
|
52 | + ], |
|
53 | + 'ocs' => [ |
|
54 | + [ |
|
55 | + 'name' => 'Api#getUserMounts', |
|
56 | + 'url' => '/api/v1/mounts', |
|
57 | + 'verb' => 'GET', |
|
58 | + ], |
|
59 | + ], |
|
60 | + ] |
|
61 | 61 | ); |
62 | 62 | |
63 | 63 | $this->create('files_external_oauth1', 'ajax/oauth1.php') |
64 | - ->actionInclude('files_external/ajax/oauth1.php'); |
|
64 | + ->actionInclude('files_external/ajax/oauth1.php'); |
|
65 | 65 | $this->create('files_external_oauth2', 'ajax/oauth2.php') |
66 | - ->actionInclude('files_external/ajax/oauth2.php'); |
|
66 | + ->actionInclude('files_external/ajax/oauth2.php'); |
|
67 | 67 | |
68 | 68 | |
69 | 69 | $this->create('files_external_list_applicable', '/applicable') |
70 | - ->actionInclude('files_external/ajax/applicable.php'); |
|
70 | + ->actionInclude('files_external/ajax/applicable.php'); |
@@ -31,41 +31,41 @@ |
||
31 | 31 | * @since 7.0.0 |
32 | 32 | */ |
33 | 33 | interface IAppConfig { |
34 | - /** |
|
35 | - * check if a key is set in the appconfig |
|
36 | - * @param string $app |
|
37 | - * @param string $key |
|
38 | - * @return bool |
|
39 | - * @since 7.0.0 |
|
40 | - */ |
|
41 | - public function hasKey($app, $key); |
|
34 | + /** |
|
35 | + * check if a key is set in the appconfig |
|
36 | + * @param string $app |
|
37 | + * @param string $key |
|
38 | + * @return bool |
|
39 | + * @since 7.0.0 |
|
40 | + */ |
|
41 | + public function hasKey($app, $key); |
|
42 | 42 | |
43 | - /** |
|
44 | - * get multiply values, either the app or key can be used as wildcard by setting it to false |
|
45 | - * |
|
46 | - * @param string|false $key |
|
47 | - * @param string|false $app |
|
48 | - * @return array|false |
|
49 | - * @since 7.0.0 |
|
50 | - */ |
|
51 | - public function getValues($app, $key); |
|
43 | + /** |
|
44 | + * get multiply values, either the app or key can be used as wildcard by setting it to false |
|
45 | + * |
|
46 | + * @param string|false $key |
|
47 | + * @param string|false $app |
|
48 | + * @return array|false |
|
49 | + * @since 7.0.0 |
|
50 | + */ |
|
51 | + public function getValues($app, $key); |
|
52 | 52 | |
53 | - /** |
|
54 | - * get all values of the app or and filters out sensitive data |
|
55 | - * |
|
56 | - * @param string $app |
|
57 | - * @return array |
|
58 | - * @since 12.0.0 |
|
59 | - */ |
|
60 | - public function getFilteredValues($app); |
|
53 | + /** |
|
54 | + * get all values of the app or and filters out sensitive data |
|
55 | + * |
|
56 | + * @param string $app |
|
57 | + * @return array |
|
58 | + * @since 12.0.0 |
|
59 | + */ |
|
60 | + public function getFilteredValues($app); |
|
61 | 61 | |
62 | - /** |
|
63 | - * Get all apps using the config |
|
64 | - * @return array an array of app ids |
|
65 | - * |
|
66 | - * This function returns a list of all apps that have at least one |
|
67 | - * entry in the appconfig table. |
|
68 | - * @since 7.0.0 |
|
69 | - */ |
|
70 | - public function getApps(); |
|
62 | + /** |
|
63 | + * Get all apps using the config |
|
64 | + * @return array an array of app ids |
|
65 | + * |
|
66 | + * This function returns a list of all apps that have at least one |
|
67 | + * entry in the appconfig table. |
|
68 | + * @since 7.0.0 |
|
69 | + */ |
|
70 | + public function getApps(); |
|
71 | 71 | } |
@@ -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 | } |
@@ -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 | } |
@@ -36,7 +36,7 @@ |
||
36 | 36 | $timezones = \DateTimeZone::listIdentifiers(); |
37 | 37 | |
38 | 38 | if ($search !== '') { |
39 | - $timezones = array_filter($timezones, function ($timezone) use ($search) { |
|
39 | + $timezones = array_filter($timezones, function($timezone) use ($search) { |
|
40 | 40 | return stripos($timezone, $search) !== false; |
41 | 41 | }); |
42 | 42 | } |
@@ -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); |
@@ -30,13 +30,13 @@ |
||
30 | 30 | |
31 | 31 | OC::$CLASSPATH['OC_Mount_Config'] = 'files_external/lib/config.php'; |
32 | 32 | |
33 | -require_once __DIR__ . '/../3rdparty/autoload.php'; |
|
33 | +require_once __DIR__.'/../3rdparty/autoload.php'; |
|
34 | 34 | |
35 | 35 | // register Application object singleton |
36 | 36 | \OC_Mount_Config::$app = \OC::$server->query(\OCA\Files_External\AppInfo\Application::class); |
37 | 37 | $appContainer = \OC_Mount_Config::$app->getContainer(); |
38 | 38 | |
39 | -\OCA\Files\App::getNavigationManager()->add(function () { |
|
39 | +\OCA\Files\App::getNavigationManager()->add(function() { |
|
40 | 40 | $l = \OC::$server->getL10N('files_external'); |
41 | 41 | return [ |
42 | 42 | 'id' => 'extstoragemounts', |
@@ -40,104 +40,104 @@ |
||
40 | 40 | * (aka personal storages) |
41 | 41 | */ |
42 | 42 | class UserStoragesService extends StoragesService { |
43 | - use UserTrait; |
|
43 | + use UserTrait; |
|
44 | 44 | |
45 | - /** |
|
46 | - * Create a user storages service |
|
47 | - * |
|
48 | - * @param BackendService $backendService |
|
49 | - * @param DBConfigService $dbConfig |
|
50 | - * @param IUserSession $userSession user session |
|
51 | - * @param IUserMountCache $userMountCache |
|
52 | - */ |
|
53 | - public function __construct( |
|
54 | - BackendService $backendService, |
|
55 | - DBConfigService $dbConfig, |
|
56 | - IUserSession $userSession, |
|
57 | - IUserMountCache $userMountCache |
|
58 | - ) { |
|
59 | - $this->userSession = $userSession; |
|
60 | - parent::__construct($backendService, $dbConfig, $userMountCache); |
|
61 | - } |
|
45 | + /** |
|
46 | + * Create a user storages service |
|
47 | + * |
|
48 | + * @param BackendService $backendService |
|
49 | + * @param DBConfigService $dbConfig |
|
50 | + * @param IUserSession $userSession user session |
|
51 | + * @param IUserMountCache $userMountCache |
|
52 | + */ |
|
53 | + public function __construct( |
|
54 | + BackendService $backendService, |
|
55 | + DBConfigService $dbConfig, |
|
56 | + IUserSession $userSession, |
|
57 | + IUserMountCache $userMountCache |
|
58 | + ) { |
|
59 | + $this->userSession = $userSession; |
|
60 | + parent::__construct($backendService, $dbConfig, $userMountCache); |
|
61 | + } |
|
62 | 62 | |
63 | - protected function readDBConfig() { |
|
64 | - return $this->dbConfig->getUserMountsFor(DBConfigService::APPLICABLE_TYPE_USER, $this->getUser()->getUID()); |
|
65 | - } |
|
63 | + protected function readDBConfig() { |
|
64 | + return $this->dbConfig->getUserMountsFor(DBConfigService::APPLICABLE_TYPE_USER, $this->getUser()->getUID()); |
|
65 | + } |
|
66 | 66 | |
67 | - /** |
|
68 | - * Triggers $signal for all applicable users of the given |
|
69 | - * storage |
|
70 | - * |
|
71 | - * @param StorageConfig $storage storage data |
|
72 | - * @param string $signal signal to trigger |
|
73 | - */ |
|
74 | - protected function triggerHooks(StorageConfig $storage, $signal) { |
|
75 | - $user = $this->getUser()->getUID(); |
|
67 | + /** |
|
68 | + * Triggers $signal for all applicable users of the given |
|
69 | + * storage |
|
70 | + * |
|
71 | + * @param StorageConfig $storage storage data |
|
72 | + * @param string $signal signal to trigger |
|
73 | + */ |
|
74 | + protected function triggerHooks(StorageConfig $storage, $signal) { |
|
75 | + $user = $this->getUser()->getUID(); |
|
76 | 76 | |
77 | - // trigger hook for the current user |
|
78 | - $this->triggerApplicableHooks( |
|
79 | - $signal, |
|
80 | - $storage->getMountPoint(), |
|
81 | - \OC_Mount_Config::MOUNT_TYPE_USER, |
|
82 | - [$user] |
|
83 | - ); |
|
84 | - } |
|
77 | + // trigger hook for the current user |
|
78 | + $this->triggerApplicableHooks( |
|
79 | + $signal, |
|
80 | + $storage->getMountPoint(), |
|
81 | + \OC_Mount_Config::MOUNT_TYPE_USER, |
|
82 | + [$user] |
|
83 | + ); |
|
84 | + } |
|
85 | 85 | |
86 | - /** |
|
87 | - * Triggers signal_create_mount or signal_delete_mount to |
|
88 | - * accommodate for additions/deletions in applicableUsers |
|
89 | - * and applicableGroups fields. |
|
90 | - * |
|
91 | - * @param StorageConfig $oldStorage old storage data |
|
92 | - * @param StorageConfig $newStorage new storage data |
|
93 | - */ |
|
94 | - protected function triggerChangeHooks(StorageConfig $oldStorage, StorageConfig $newStorage) { |
|
95 | - // if mount point changed, it's like a deletion + creation |
|
96 | - if ($oldStorage->getMountPoint() !== $newStorage->getMountPoint()) { |
|
97 | - $this->triggerHooks($oldStorage, Filesystem::signal_delete_mount); |
|
98 | - $this->triggerHooks($newStorage, Filesystem::signal_create_mount); |
|
99 | - } |
|
100 | - } |
|
86 | + /** |
|
87 | + * Triggers signal_create_mount or signal_delete_mount to |
|
88 | + * accommodate for additions/deletions in applicableUsers |
|
89 | + * and applicableGroups fields. |
|
90 | + * |
|
91 | + * @param StorageConfig $oldStorage old storage data |
|
92 | + * @param StorageConfig $newStorage new storage data |
|
93 | + */ |
|
94 | + protected function triggerChangeHooks(StorageConfig $oldStorage, StorageConfig $newStorage) { |
|
95 | + // if mount point changed, it's like a deletion + creation |
|
96 | + if ($oldStorage->getMountPoint() !== $newStorage->getMountPoint()) { |
|
97 | + $this->triggerHooks($oldStorage, Filesystem::signal_delete_mount); |
|
98 | + $this->triggerHooks($newStorage, Filesystem::signal_create_mount); |
|
99 | + } |
|
100 | + } |
|
101 | 101 | |
102 | - protected function getType() { |
|
103 | - return DBConfigService::MOUNT_TYPE_PERSONAl; |
|
104 | - } |
|
102 | + protected function getType() { |
|
103 | + return DBConfigService::MOUNT_TYPE_PERSONAl; |
|
104 | + } |
|
105 | 105 | |
106 | - /** |
|
107 | - * Add new storage to the configuration |
|
108 | - * |
|
109 | - * @param StorageConfig $newStorage storage attributes |
|
110 | - * |
|
111 | - * @return StorageConfig storage config, with added id |
|
112 | - */ |
|
113 | - public function addStorage(StorageConfig $newStorage) { |
|
114 | - $newStorage->setApplicableUsers([$this->getUser()->getUID()]); |
|
115 | - return parent::addStorage($newStorage); |
|
116 | - } |
|
106 | + /** |
|
107 | + * Add new storage to the configuration |
|
108 | + * |
|
109 | + * @param StorageConfig $newStorage storage attributes |
|
110 | + * |
|
111 | + * @return StorageConfig storage config, with added id |
|
112 | + */ |
|
113 | + public function addStorage(StorageConfig $newStorage) { |
|
114 | + $newStorage->setApplicableUsers([$this->getUser()->getUID()]); |
|
115 | + return parent::addStorage($newStorage); |
|
116 | + } |
|
117 | 117 | |
118 | - /** |
|
119 | - * Update storage to the configuration |
|
120 | - * |
|
121 | - * @param StorageConfig $updatedStorage storage attributes |
|
122 | - * |
|
123 | - * @return StorageConfig storage config |
|
124 | - * @throws NotFoundException if the given storage does not exist in the config |
|
125 | - */ |
|
126 | - public function updateStorage(StorageConfig $updatedStorage) { |
|
127 | - $updatedStorage->setApplicableUsers([$this->getUser()->getUID()]); |
|
128 | - return parent::updateStorage($updatedStorage); |
|
129 | - } |
|
118 | + /** |
|
119 | + * Update storage to the configuration |
|
120 | + * |
|
121 | + * @param StorageConfig $updatedStorage storage attributes |
|
122 | + * |
|
123 | + * @return StorageConfig storage config |
|
124 | + * @throws NotFoundException if the given storage does not exist in the config |
|
125 | + */ |
|
126 | + public function updateStorage(StorageConfig $updatedStorage) { |
|
127 | + $updatedStorage->setApplicableUsers([$this->getUser()->getUID()]); |
|
128 | + return parent::updateStorage($updatedStorage); |
|
129 | + } |
|
130 | 130 | |
131 | - /** |
|
132 | - * Get the visibility type for this controller, used in validation |
|
133 | - * |
|
134 | - * @return string BackendService::VISIBILITY_* constants |
|
135 | - */ |
|
136 | - public function getVisibilityType() { |
|
137 | - return BackendService::VISIBILITY_PERSONAL; |
|
138 | - } |
|
131 | + /** |
|
132 | + * Get the visibility type for this controller, used in validation |
|
133 | + * |
|
134 | + * @return string BackendService::VISIBILITY_* constants |
|
135 | + */ |
|
136 | + public function getVisibilityType() { |
|
137 | + return BackendService::VISIBILITY_PERSONAL; |
|
138 | + } |
|
139 | 139 | |
140 | - protected function isApplicable(StorageConfig $config) { |
|
141 | - return ($config->getApplicableUsers() === [$this->getUser()->getUID()]) && $config->getType() === StorageConfig::MOUNT_TYPE_PERSONAl; |
|
142 | - } |
|
140 | + protected function isApplicable(StorageConfig $config) { |
|
141 | + return ($config->getApplicableUsers() === [$this->getUser()->getUID()]) && $config->getType() === StorageConfig::MOUNT_TYPE_PERSONAl; |
|
142 | + } |
|
143 | 143 | } |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | |
79 | 79 | $server->on('report', [$this, 'report']); |
80 | 80 | |
81 | - $server->xml->elementMap['{' . self::NS_Nextcloud . '}calendar-search'] = |
|
81 | + $server->xml->elementMap['{'.self::NS_Nextcloud.'}calendar-search'] = |
|
82 | 82 | CalendarSearchReport::class; |
83 | 83 | } |
84 | 84 | |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | */ |
93 | 93 | public function report($reportName, $report, $path) { |
94 | 94 | switch ($reportName) { |
95 | - case '{' . self::NS_Nextcloud . '}calendar-search': |
|
95 | + case '{'.self::NS_Nextcloud.'}calendar-search': |
|
96 | 96 | $this->server->transactionType = 'report-nc-calendar-search'; |
97 | 97 | $this->calendarSearch($report); |
98 | 98 | return false; |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | |
115 | 115 | $reports = []; |
116 | 116 | if ($node instanceof CalendarHome) { |
117 | - $reports[] = '{' . self::NS_Nextcloud . '}calendar-search'; |
|
117 | + $reports[] = '{'.self::NS_Nextcloud.'}calendar-search'; |
|
118 | 118 | } |
119 | 119 | |
120 | 120 | return $reports; |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | |
145 | 145 | foreach ($nodePaths as $path) { |
146 | 146 | list($properties) = $this->server->getPropertiesForPath( |
147 | - $this->server->getRequestUri() . '/' . $path, |
|
147 | + $this->server->getRequestUri().'/'.$path, |
|
148 | 148 | $report->properties); |
149 | 149 | $result[] = $properties; |
150 | 150 | } |
@@ -32,134 +32,134 @@ |
||
32 | 32 | use Sabre\DAV\ServerPlugin; |
33 | 33 | |
34 | 34 | class SearchPlugin extends ServerPlugin { |
35 | - public const NS_Nextcloud = 'http://nextcloud.com/ns'; |
|
36 | - |
|
37 | - /** |
|
38 | - * Reference to SabreDAV server object. |
|
39 | - * |
|
40 | - * @var \Sabre\DAV\Server |
|
41 | - */ |
|
42 | - protected $server; |
|
43 | - |
|
44 | - /** |
|
45 | - * This method should return a list of server-features. |
|
46 | - * |
|
47 | - * This is for example 'versioning' and is added to the DAV: header |
|
48 | - * in an OPTIONS response. |
|
49 | - * |
|
50 | - * @return string[] |
|
51 | - */ |
|
52 | - public function getFeatures() { |
|
53 | - // May have to be changed to be detected |
|
54 | - return ['nc-calendar-search']; |
|
55 | - } |
|
56 | - |
|
57 | - /** |
|
58 | - * Returns a plugin name. |
|
59 | - * |
|
60 | - * Using this name other plugins will be able to access other plugins |
|
61 | - * using Sabre\DAV\Server::getPlugin |
|
62 | - * |
|
63 | - * @return string |
|
64 | - */ |
|
65 | - public function getPluginName() { |
|
66 | - return 'nc-calendar-search'; |
|
67 | - } |
|
68 | - |
|
69 | - /** |
|
70 | - * This initializes the plugin. |
|
71 | - * |
|
72 | - * This function is called by Sabre\DAV\Server, after |
|
73 | - * addPlugin is called. |
|
74 | - * |
|
75 | - * This method should set up the required event subscriptions. |
|
76 | - * |
|
77 | - * @param Server $server |
|
78 | - */ |
|
79 | - public function initialize(Server $server) { |
|
80 | - $this->server = $server; |
|
81 | - |
|
82 | - $server->on('report', [$this, 'report']); |
|
83 | - |
|
84 | - $server->xml->elementMap['{' . self::NS_Nextcloud . '}calendar-search'] = |
|
85 | - CalendarSearchReport::class; |
|
86 | - } |
|
87 | - |
|
88 | - /** |
|
89 | - * This functions handles REPORT requests specific to CalDAV |
|
90 | - * |
|
91 | - * @param string $reportName |
|
92 | - * @param mixed $report |
|
93 | - * @param mixed $path |
|
94 | - * @return bool |
|
95 | - */ |
|
96 | - public function report($reportName, $report, $path) { |
|
97 | - switch ($reportName) { |
|
98 | - case '{' . self::NS_Nextcloud . '}calendar-search': |
|
99 | - $this->server->transactionType = 'report-nc-calendar-search'; |
|
100 | - $this->calendarSearch($report); |
|
101 | - return false; |
|
102 | - } |
|
103 | - } |
|
104 | - |
|
105 | - /** |
|
106 | - * Returns a list of reports this plugin supports. |
|
107 | - * |
|
108 | - * This will be used in the {DAV:}supported-report-set property. |
|
109 | - * Note that you still need to subscribe to the 'report' event to actually |
|
110 | - * implement them |
|
111 | - * |
|
112 | - * @param string $uri |
|
113 | - * @return array |
|
114 | - */ |
|
115 | - public function getSupportedReportSet($uri) { |
|
116 | - $node = $this->server->tree->getNodeForPath($uri); |
|
117 | - |
|
118 | - $reports = []; |
|
119 | - if ($node instanceof CalendarHome) { |
|
120 | - $reports[] = '{' . self::NS_Nextcloud . '}calendar-search'; |
|
121 | - } |
|
122 | - |
|
123 | - return $reports; |
|
124 | - } |
|
125 | - |
|
126 | - /** |
|
127 | - * This function handles the calendar-query REPORT |
|
128 | - * |
|
129 | - * This report is used by clients to request calendar objects based on |
|
130 | - * complex conditions. |
|
131 | - * |
|
132 | - * @param Xml\Request\CalendarSearchReport $report |
|
133 | - * @return void |
|
134 | - */ |
|
135 | - private function calendarSearch($report) { |
|
136 | - $node = $this->server->tree->getNodeForPath($this->server->getRequestUri()); |
|
137 | - $depth = $this->server->getHTTPDepth(2); |
|
138 | - |
|
139 | - // The default result is an empty array |
|
140 | - $result = []; |
|
141 | - |
|
142 | - // If we're dealing with the calendar home, the calendar home itself is |
|
143 | - // responsible for the calendar-query |
|
144 | - if ($node instanceof CalendarHome && $depth === 2) { |
|
145 | - $nodePaths = $node->calendarSearch($report->filters, $report->limit, $report->offset); |
|
146 | - |
|
147 | - foreach ($nodePaths as $path) { |
|
148 | - list($properties) = $this->server->getPropertiesForPath( |
|
149 | - $this->server->getRequestUri() . '/' . $path, |
|
150 | - $report->properties); |
|
151 | - $result[] = $properties; |
|
152 | - } |
|
153 | - } |
|
154 | - |
|
155 | - $prefer = $this->server->getHTTPPrefer(); |
|
156 | - |
|
157 | - $this->server->httpResponse->setStatus(207); |
|
158 | - $this->server->httpResponse->setHeader('Content-Type', |
|
159 | - 'application/xml; charset=utf-8'); |
|
160 | - $this->server->httpResponse->setHeader('Vary', 'Brief,Prefer'); |
|
161 | - $this->server->httpResponse->setBody( |
|
162 | - $this->server->generateMultiStatus($result, |
|
163 | - $prefer['return'] === 'minimal')); |
|
164 | - } |
|
35 | + public const NS_Nextcloud = 'http://nextcloud.com/ns'; |
|
36 | + |
|
37 | + /** |
|
38 | + * Reference to SabreDAV server object. |
|
39 | + * |
|
40 | + * @var \Sabre\DAV\Server |
|
41 | + */ |
|
42 | + protected $server; |
|
43 | + |
|
44 | + /** |
|
45 | + * This method should return a list of server-features. |
|
46 | + * |
|
47 | + * This is for example 'versioning' and is added to the DAV: header |
|
48 | + * in an OPTIONS response. |
|
49 | + * |
|
50 | + * @return string[] |
|
51 | + */ |
|
52 | + public function getFeatures() { |
|
53 | + // May have to be changed to be detected |
|
54 | + return ['nc-calendar-search']; |
|
55 | + } |
|
56 | + |
|
57 | + /** |
|
58 | + * Returns a plugin name. |
|
59 | + * |
|
60 | + * Using this name other plugins will be able to access other plugins |
|
61 | + * using Sabre\DAV\Server::getPlugin |
|
62 | + * |
|
63 | + * @return string |
|
64 | + */ |
|
65 | + public function getPluginName() { |
|
66 | + return 'nc-calendar-search'; |
|
67 | + } |
|
68 | + |
|
69 | + /** |
|
70 | + * This initializes the plugin. |
|
71 | + * |
|
72 | + * This function is called by Sabre\DAV\Server, after |
|
73 | + * addPlugin is called. |
|
74 | + * |
|
75 | + * This method should set up the required event subscriptions. |
|
76 | + * |
|
77 | + * @param Server $server |
|
78 | + */ |
|
79 | + public function initialize(Server $server) { |
|
80 | + $this->server = $server; |
|
81 | + |
|
82 | + $server->on('report', [$this, 'report']); |
|
83 | + |
|
84 | + $server->xml->elementMap['{' . self::NS_Nextcloud . '}calendar-search'] = |
|
85 | + CalendarSearchReport::class; |
|
86 | + } |
|
87 | + |
|
88 | + /** |
|
89 | + * This functions handles REPORT requests specific to CalDAV |
|
90 | + * |
|
91 | + * @param string $reportName |
|
92 | + * @param mixed $report |
|
93 | + * @param mixed $path |
|
94 | + * @return bool |
|
95 | + */ |
|
96 | + public function report($reportName, $report, $path) { |
|
97 | + switch ($reportName) { |
|
98 | + case '{' . self::NS_Nextcloud . '}calendar-search': |
|
99 | + $this->server->transactionType = 'report-nc-calendar-search'; |
|
100 | + $this->calendarSearch($report); |
|
101 | + return false; |
|
102 | + } |
|
103 | + } |
|
104 | + |
|
105 | + /** |
|
106 | + * Returns a list of reports this plugin supports. |
|
107 | + * |
|
108 | + * This will be used in the {DAV:}supported-report-set property. |
|
109 | + * Note that you still need to subscribe to the 'report' event to actually |
|
110 | + * implement them |
|
111 | + * |
|
112 | + * @param string $uri |
|
113 | + * @return array |
|
114 | + */ |
|
115 | + public function getSupportedReportSet($uri) { |
|
116 | + $node = $this->server->tree->getNodeForPath($uri); |
|
117 | + |
|
118 | + $reports = []; |
|
119 | + if ($node instanceof CalendarHome) { |
|
120 | + $reports[] = '{' . self::NS_Nextcloud . '}calendar-search'; |
|
121 | + } |
|
122 | + |
|
123 | + return $reports; |
|
124 | + } |
|
125 | + |
|
126 | + /** |
|
127 | + * This function handles the calendar-query REPORT |
|
128 | + * |
|
129 | + * This report is used by clients to request calendar objects based on |
|
130 | + * complex conditions. |
|
131 | + * |
|
132 | + * @param Xml\Request\CalendarSearchReport $report |
|
133 | + * @return void |
|
134 | + */ |
|
135 | + private function calendarSearch($report) { |
|
136 | + $node = $this->server->tree->getNodeForPath($this->server->getRequestUri()); |
|
137 | + $depth = $this->server->getHTTPDepth(2); |
|
138 | + |
|
139 | + // The default result is an empty array |
|
140 | + $result = []; |
|
141 | + |
|
142 | + // If we're dealing with the calendar home, the calendar home itself is |
|
143 | + // responsible for the calendar-query |
|
144 | + if ($node instanceof CalendarHome && $depth === 2) { |
|
145 | + $nodePaths = $node->calendarSearch($report->filters, $report->limit, $report->offset); |
|
146 | + |
|
147 | + foreach ($nodePaths as $path) { |
|
148 | + list($properties) = $this->server->getPropertiesForPath( |
|
149 | + $this->server->getRequestUri() . '/' . $path, |
|
150 | + $report->properties); |
|
151 | + $result[] = $properties; |
|
152 | + } |
|
153 | + } |
|
154 | + |
|
155 | + $prefer = $this->server->getHTTPPrefer(); |
|
156 | + |
|
157 | + $this->server->httpResponse->setStatus(207); |
|
158 | + $this->server->httpResponse->setHeader('Content-Type', |
|
159 | + 'application/xml; charset=utf-8'); |
|
160 | + $this->server->httpResponse->setHeader('Vary', 'Brief,Prefer'); |
|
161 | + $this->server->httpResponse->setBody( |
|
162 | + $this->server->generateMultiStatus($result, |
|
163 | + $prefer['return'] === 'minimal')); |
|
164 | + } |
|
165 | 165 | } |