@@ -28,24 +28,24 @@ |
||
28 | 28 | use OCP\Remote\IInstance; |
29 | 29 | |
30 | 30 | class ApiCollection implements IApiCollection { |
31 | - /** @var IInstance */ |
|
32 | - private $instance; |
|
33 | - /** @var ICredentials */ |
|
34 | - private $credentials; |
|
35 | - /** @var IClientService */ |
|
36 | - private $clientService; |
|
31 | + /** @var IInstance */ |
|
32 | + private $instance; |
|
33 | + /** @var ICredentials */ |
|
34 | + private $credentials; |
|
35 | + /** @var IClientService */ |
|
36 | + private $clientService; |
|
37 | 37 | |
38 | - public function __construct(IInstance $instance, ICredentials $credentials, IClientService $clientService) { |
|
39 | - $this->instance = $instance; |
|
40 | - $this->credentials = $credentials; |
|
41 | - $this->clientService = $clientService; |
|
42 | - } |
|
38 | + public function __construct(IInstance $instance, ICredentials $credentials, IClientService $clientService) { |
|
39 | + $this->instance = $instance; |
|
40 | + $this->credentials = $credentials; |
|
41 | + $this->clientService = $clientService; |
|
42 | + } |
|
43 | 43 | |
44 | - public function getCapabilitiesApi() { |
|
45 | - return new OCS($this->instance, $this->credentials, $this->clientService); |
|
46 | - } |
|
44 | + public function getCapabilitiesApi() { |
|
45 | + return new OCS($this->instance, $this->credentials, $this->clientService); |
|
46 | + } |
|
47 | 47 | |
48 | - public function getUserApi() { |
|
49 | - return new OCS($this->instance, $this->credentials, $this->clientService); |
|
50 | - } |
|
48 | + public function getUserApi() { |
|
49 | + return new OCS($this->instance, $this->credentials, $this->clientService); |
|
50 | + } |
|
51 | 51 | } |
@@ -26,72 +26,72 @@ |
||
26 | 26 | use OCP\Remote\IInstance; |
27 | 27 | |
28 | 28 | class ApiBase { |
29 | - /** @var IInstance */ |
|
30 | - private $instance; |
|
31 | - /** @var ICredentials */ |
|
32 | - private $credentials; |
|
33 | - /** @var IClientService */ |
|
34 | - private $clientService; |
|
29 | + /** @var IInstance */ |
|
30 | + private $instance; |
|
31 | + /** @var ICredentials */ |
|
32 | + private $credentials; |
|
33 | + /** @var IClientService */ |
|
34 | + private $clientService; |
|
35 | 35 | |
36 | - public function __construct(IInstance $instance, ICredentials $credentials, IClientService $clientService) { |
|
37 | - $this->instance = $instance; |
|
38 | - $this->credentials = $credentials; |
|
39 | - $this->clientService = $clientService; |
|
40 | - } |
|
36 | + public function __construct(IInstance $instance, ICredentials $credentials, IClientService $clientService) { |
|
37 | + $this->instance = $instance; |
|
38 | + $this->credentials = $credentials; |
|
39 | + $this->clientService = $clientService; |
|
40 | + } |
|
41 | 41 | |
42 | - protected function getHttpClient() { |
|
43 | - return $this->clientService->newClient(); |
|
44 | - } |
|
42 | + protected function getHttpClient() { |
|
43 | + return $this->clientService->newClient(); |
|
44 | + } |
|
45 | 45 | |
46 | - protected function addDefaultHeaders(array $headers) { |
|
47 | - return array_merge([ |
|
48 | - 'OCS-APIREQUEST' => 'true', |
|
49 | - 'Accept' => 'application/json' |
|
50 | - ], $headers); |
|
51 | - } |
|
46 | + protected function addDefaultHeaders(array $headers) { |
|
47 | + return array_merge([ |
|
48 | + 'OCS-APIREQUEST' => 'true', |
|
49 | + 'Accept' => 'application/json' |
|
50 | + ], $headers); |
|
51 | + } |
|
52 | 52 | |
53 | - /** |
|
54 | - * @param string $method |
|
55 | - * @param string $url |
|
56 | - * @param array $body |
|
57 | - * @param array $query |
|
58 | - * @param array $headers |
|
59 | - * @return resource|string |
|
60 | - * @throws \InvalidArgumentException |
|
61 | - */ |
|
62 | - protected function request($method, $url, array $body = [], array $query = [], array $headers = []) { |
|
63 | - $fullUrl = trim($this->instance->getFullUrl(), '/') . '/' . $url; |
|
64 | - $options = [ |
|
65 | - 'query' => $query, |
|
66 | - 'headers' => $this->addDefaultHeaders($headers), |
|
67 | - 'auth' => [$this->credentials->getUsername(), $this->credentials->getPassword()] |
|
68 | - ]; |
|
69 | - if ($body) { |
|
70 | - $options['body'] = $body; |
|
71 | - } |
|
53 | + /** |
|
54 | + * @param string $method |
|
55 | + * @param string $url |
|
56 | + * @param array $body |
|
57 | + * @param array $query |
|
58 | + * @param array $headers |
|
59 | + * @return resource|string |
|
60 | + * @throws \InvalidArgumentException |
|
61 | + */ |
|
62 | + protected function request($method, $url, array $body = [], array $query = [], array $headers = []) { |
|
63 | + $fullUrl = trim($this->instance->getFullUrl(), '/') . '/' . $url; |
|
64 | + $options = [ |
|
65 | + 'query' => $query, |
|
66 | + 'headers' => $this->addDefaultHeaders($headers), |
|
67 | + 'auth' => [$this->credentials->getUsername(), $this->credentials->getPassword()] |
|
68 | + ]; |
|
69 | + if ($body) { |
|
70 | + $options['body'] = $body; |
|
71 | + } |
|
72 | 72 | |
73 | - $client = $this->getHttpClient(); |
|
73 | + $client = $this->getHttpClient(); |
|
74 | 74 | |
75 | - switch ($method) { |
|
76 | - case 'get': |
|
77 | - $response = $client->get($fullUrl, $options); |
|
78 | - break; |
|
79 | - case 'post': |
|
80 | - $response = $client->post($fullUrl, $options); |
|
81 | - break; |
|
82 | - case 'put': |
|
83 | - $response = $client->put($fullUrl, $options); |
|
84 | - break; |
|
85 | - case 'delete': |
|
86 | - $response = $client->delete($fullUrl, $options); |
|
87 | - break; |
|
88 | - case 'options': |
|
89 | - $response = $client->options($fullUrl, $options); |
|
90 | - break; |
|
91 | - default: |
|
92 | - throw new \InvalidArgumentException('Invalid method ' . $method); |
|
93 | - } |
|
75 | + switch ($method) { |
|
76 | + case 'get': |
|
77 | + $response = $client->get($fullUrl, $options); |
|
78 | + break; |
|
79 | + case 'post': |
|
80 | + $response = $client->post($fullUrl, $options); |
|
81 | + break; |
|
82 | + case 'put': |
|
83 | + $response = $client->put($fullUrl, $options); |
|
84 | + break; |
|
85 | + case 'delete': |
|
86 | + $response = $client->delete($fullUrl, $options); |
|
87 | + break; |
|
88 | + case 'options': |
|
89 | + $response = $client->options($fullUrl, $options); |
|
90 | + break; |
|
91 | + default: |
|
92 | + throw new \InvalidArgumentException('Invalid method ' . $method); |
|
93 | + } |
|
94 | 94 | |
95 | - return $response->getBody(); |
|
96 | - } |
|
95 | + return $response->getBody(); |
|
96 | + } |
|
97 | 97 | } |
@@ -27,17 +27,17 @@ |
||
27 | 27 | use OCP\Remote\IInstanceFactory; |
28 | 28 | |
29 | 29 | class InstanceFactory implements IInstanceFactory { |
30 | - /** @var ICache */ |
|
31 | - private $cache; |
|
32 | - /** @var IClientService */ |
|
33 | - private $clientService; |
|
30 | + /** @var ICache */ |
|
31 | + private $cache; |
|
32 | + /** @var IClientService */ |
|
33 | + private $clientService; |
|
34 | 34 | |
35 | - public function __construct(ICache $cache, IClientService $clientService) { |
|
36 | - $this->cache = $cache; |
|
37 | - $this->clientService = $clientService; |
|
38 | - } |
|
35 | + public function __construct(ICache $cache, IClientService $clientService) { |
|
36 | + $this->cache = $cache; |
|
37 | + $this->clientService = $clientService; |
|
38 | + } |
|
39 | 39 | |
40 | - public function getInstance($url) { |
|
41 | - return new Instance($url, $this->cache, $this->clientService); |
|
42 | - } |
|
40 | + public function getInstance($url) { |
|
41 | + return new Instance($url, $this->cache, $this->clientService); |
|
42 | + } |
|
43 | 43 | } |
@@ -29,19 +29,19 @@ |
||
29 | 29 | |
30 | 30 | class AddLogRotateJob implements IRepairStep { |
31 | 31 | |
32 | - /** @var IJobList */ |
|
33 | - private $jobList; |
|
32 | + /** @var IJobList */ |
|
33 | + private $jobList; |
|
34 | 34 | |
35 | - public function __construct(IJobList $jobList) { |
|
36 | - $this->jobList = $jobList; |
|
37 | - } |
|
35 | + public function __construct(IJobList $jobList) { |
|
36 | + $this->jobList = $jobList; |
|
37 | + } |
|
38 | 38 | |
39 | - public function getName() { |
|
40 | - return 'Add log rotate job'; |
|
41 | - } |
|
39 | + public function getName() { |
|
40 | + return 'Add log rotate job'; |
|
41 | + } |
|
42 | 42 | |
43 | - public function run(IOutput $output) { |
|
44 | - $this->jobList->add(Rotate::class); |
|
45 | - } |
|
43 | + public function run(IOutput $output) { |
|
44 | + $this->jobList->add(Rotate::class); |
|
45 | + } |
|
46 | 46 | |
47 | 47 | } |
@@ -31,22 +31,22 @@ |
||
31 | 31 | |
32 | 32 | class Hooks { |
33 | 33 | |
34 | - /** |
|
35 | - * clean up user specific settings if user gets deleted |
|
36 | - * @param array $params array with uid |
|
37 | - * |
|
38 | - * This function is connected to the pre_deleteUser signal of OC_Users |
|
39 | - * to remove the used space for the trash bin stored in the database |
|
40 | - */ |
|
41 | - public static function deleteUser_hook($params) { |
|
42 | - $uid = $params['uid']; |
|
43 | - Trashbin::deleteUser($uid); |
|
44 | - } |
|
34 | + /** |
|
35 | + * clean up user specific settings if user gets deleted |
|
36 | + * @param array $params array with uid |
|
37 | + * |
|
38 | + * This function is connected to the pre_deleteUser signal of OC_Users |
|
39 | + * to remove the used space for the trash bin stored in the database |
|
40 | + */ |
|
41 | + public static function deleteUser_hook($params) { |
|
42 | + $uid = $params['uid']; |
|
43 | + Trashbin::deleteUser($uid); |
|
44 | + } |
|
45 | 45 | |
46 | - public static function post_write_hook($params) { |
|
47 | - $user = \OCP\User::getUser(); |
|
48 | - if (!empty($user)) { |
|
49 | - Trashbin::resizeTrash($user); |
|
50 | - } |
|
51 | - } |
|
46 | + public static function post_write_hook($params) { |
|
47 | + $user = \OCP\User::getUser(); |
|
48 | + if (!empty($user)) { |
|
49 | + Trashbin::resizeTrash($user); |
|
50 | + } |
|
51 | + } |
|
52 | 52 | } |
@@ -34,15 +34,15 @@ discard block |
||
34 | 34 | $helper = new Helper(\OC::$server->getConfig()); |
35 | 35 | $ocConfig = \OC::$server->getConfig(); |
36 | 36 | $uBackend = new User_Proxy( |
37 | - $helper->getServerConfigurationPrefixes(true), |
|
38 | - new LDAP(), |
|
39 | - $ocConfig, |
|
40 | - \OC::$server->getNotificationManager(), |
|
41 | - \OC::$server->getUserSession(), |
|
42 | - \OC::$server->query('LDAPUserPluginManager') |
|
37 | + $helper->getServerConfigurationPrefixes(true), |
|
38 | + new LDAP(), |
|
39 | + $ocConfig, |
|
40 | + \OC::$server->getNotificationManager(), |
|
41 | + \OC::$server->getUserSession(), |
|
42 | + \OC::$server->query('LDAPUserPluginManager') |
|
43 | 43 | ); |
44 | 44 | $deletedUsersIndex = new DeletedUsersIndex( |
45 | - $ocConfig, $dbConnection, $userMapping |
|
45 | + $ocConfig, $dbConnection, $userMapping |
|
46 | 46 | ); |
47 | 47 | |
48 | 48 | $application->add(new OCA\User_LDAP\Command\ShowConfig($helper)); |
@@ -52,8 +52,8 @@ discard block |
||
52 | 52 | $application->add(new OCA\User_LDAP\Command\DeleteConfig($helper)); |
53 | 53 | $application->add(new OCA\User_LDAP\Command\Search($ocConfig)); |
54 | 54 | $application->add(new OCA\User_LDAP\Command\ShowRemnants( |
55 | - $deletedUsersIndex, \OC::$server->getDateTimeFormatter()) |
|
55 | + $deletedUsersIndex, \OC::$server->getDateTimeFormatter()) |
|
56 | 56 | ); |
57 | 57 | $application->add(new OCA\User_LDAP\Command\CheckUser( |
58 | - $uBackend, $helper, $deletedUsersIndex, $userMapping) |
|
58 | + $uBackend, $helper, $deletedUsersIndex, $userMapping) |
|
59 | 59 | ); |
@@ -27,19 +27,19 @@ |
||
27 | 27 | use OCP\IServerContainer; |
28 | 28 | |
29 | 29 | class JSSettingsHelper { |
30 | - /** @var IServerContainer */ |
|
31 | - private $c; |
|
30 | + /** @var IServerContainer */ |
|
31 | + private $c; |
|
32 | 32 | |
33 | - public function __construct(IServerContainer $c) { |
|
34 | - $this->c = $c; |
|
35 | - } |
|
33 | + public function __construct(IServerContainer $c) { |
|
34 | + $this->c = $c; |
|
35 | + } |
|
36 | 36 | |
37 | - public function extend(array $settings) { |
|
38 | - $appConfig = json_decode($settings['array']['oc_appconfig'], true); |
|
37 | + public function extend(array $settings) { |
|
38 | + $appConfig = json_decode($settings['array']['oc_appconfig'], true); |
|
39 | 39 | |
40 | - $value = (int)$this->c->getConfig()->getAppValue('comments', 'maxAutoCompleteResults', 10); |
|
41 | - $appConfig['comments']['maxAutoCompleteResults'] = $value; |
|
40 | + $value = (int)$this->c->getConfig()->getAppValue('comments', 'maxAutoCompleteResults', 10); |
|
41 | + $appConfig['comments']['maxAutoCompleteResults'] = $value; |
|
42 | 42 | |
43 | - $settings['array']['oc_appconfig'] = json_encode($appConfig); |
|
44 | - } |
|
43 | + $settings['array']['oc_appconfig'] = json_encode($appConfig); |
|
44 | + } |
|
45 | 45 | } |
@@ -31,41 +31,41 @@ |
||
31 | 31 | */ |
32 | 32 | interface ICalendar { |
33 | 33 | |
34 | - /** |
|
35 | - * @return string defining the technical unique key |
|
36 | - * @since 13.0.0 |
|
37 | - */ |
|
38 | - public function getKey(); |
|
34 | + /** |
|
35 | + * @return string defining the technical unique key |
|
36 | + * @since 13.0.0 |
|
37 | + */ |
|
38 | + public function getKey(); |
|
39 | 39 | |
40 | - /** |
|
41 | - * In comparison to getKey() this function returns a human readable (maybe translated) name |
|
42 | - * @return null|string |
|
43 | - * @since 13.0.0 |
|
44 | - */ |
|
45 | - public function getDisplayName(); |
|
40 | + /** |
|
41 | + * In comparison to getKey() this function returns a human readable (maybe translated) name |
|
42 | + * @return null|string |
|
43 | + * @since 13.0.0 |
|
44 | + */ |
|
45 | + public function getDisplayName(); |
|
46 | 46 | |
47 | - /** |
|
48 | - * Calendar color |
|
49 | - * @return null|string |
|
50 | - * @since 13.0.0 |
|
51 | - */ |
|
52 | - public function getDisplayColor(); |
|
47 | + /** |
|
48 | + * Calendar color |
|
49 | + * @return null|string |
|
50 | + * @since 13.0.0 |
|
51 | + */ |
|
52 | + public function getDisplayColor(); |
|
53 | 53 | |
54 | - /** |
|
55 | - * @param string $pattern which should match within the $searchProperties |
|
56 | - * @param array $searchProperties defines the properties within the query pattern should match |
|
57 | - * @param array $options - optional parameters: |
|
58 | - * ['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]] |
|
59 | - * @param integer|null $limit - limit number of search results |
|
60 | - * @param integer|null $offset - offset for paging of search results |
|
61 | - * @return array an array of events/journals/todos which are arrays of key-value-pairs |
|
62 | - * @since 13.0.0 |
|
63 | - */ |
|
64 | - public function search($pattern, array $searchProperties=[], array $options=[], $limit=null, $offset=null); |
|
54 | + /** |
|
55 | + * @param string $pattern which should match within the $searchProperties |
|
56 | + * @param array $searchProperties defines the properties within the query pattern should match |
|
57 | + * @param array $options - optional parameters: |
|
58 | + * ['timerange' => ['start' => new DateTime(...), 'end' => new DateTime(...)]] |
|
59 | + * @param integer|null $limit - limit number of search results |
|
60 | + * @param integer|null $offset - offset for paging of search results |
|
61 | + * @return array an array of events/journals/todos which are arrays of key-value-pairs |
|
62 | + * @since 13.0.0 |
|
63 | + */ |
|
64 | + public function search($pattern, array $searchProperties=[], array $options=[], $limit=null, $offset=null); |
|
65 | 65 | |
66 | - /** |
|
67 | - * @return integer build up using \OCP\Constants |
|
68 | - * @since 13.0.0 |
|
69 | - */ |
|
70 | - public function getPermissions(); |
|
66 | + /** |
|
67 | + * @return integer build up using \OCP\Constants |
|
68 | + * @since 13.0.0 |
|
69 | + */ |
|
70 | + public function getPermissions(); |
|
71 | 71 | } |
@@ -26,61 +26,61 @@ |
||
26 | 26 | |
27 | 27 | interface ILDAPGroupPlugin { |
28 | 28 | |
29 | - /** |
|
30 | - * Check if plugin implements actions |
|
31 | - * @return int |
|
32 | - * |
|
33 | - * Returns the supported actions as int to be |
|
34 | - * compared with OC_GROUP_BACKEND_CREATE_GROUP etc. |
|
35 | - */ |
|
36 | - public function respondToActions(); |
|
29 | + /** |
|
30 | + * Check if plugin implements actions |
|
31 | + * @return int |
|
32 | + * |
|
33 | + * Returns the supported actions as int to be |
|
34 | + * compared with OC_GROUP_BACKEND_CREATE_GROUP etc. |
|
35 | + */ |
|
36 | + public function respondToActions(); |
|
37 | 37 | |
38 | - /** |
|
39 | - * @param string $gid |
|
40 | - * @return string|null The group DN if group creation was successful. |
|
41 | - */ |
|
42 | - public function createGroup($gid); |
|
38 | + /** |
|
39 | + * @param string $gid |
|
40 | + * @return string|null The group DN if group creation was successful. |
|
41 | + */ |
|
42 | + public function createGroup($gid); |
|
43 | 43 | |
44 | - /** |
|
45 | - * delete a group |
|
46 | - * @param string $gid gid of the group to delete |
|
47 | - * @return bool |
|
48 | - */ |
|
49 | - public function deleteGroup($gid); |
|
44 | + /** |
|
45 | + * delete a group |
|
46 | + * @param string $gid gid of the group to delete |
|
47 | + * @return bool |
|
48 | + */ |
|
49 | + public function deleteGroup($gid); |
|
50 | 50 | |
51 | - /** |
|
52 | - * Add a user to a group |
|
53 | - * @param string $uid Name of the user to add to group |
|
54 | - * @param string $gid Name of the group in which add the user |
|
55 | - * @return bool |
|
56 | - * |
|
57 | - * Adds a user to a group. |
|
58 | - */ |
|
59 | - public function addToGroup($uid, $gid); |
|
51 | + /** |
|
52 | + * Add a user to a group |
|
53 | + * @param string $uid Name of the user to add to group |
|
54 | + * @param string $gid Name of the group in which add the user |
|
55 | + * @return bool |
|
56 | + * |
|
57 | + * Adds a user to a group. |
|
58 | + */ |
|
59 | + public function addToGroup($uid, $gid); |
|
60 | 60 | |
61 | - /** |
|
62 | - * Removes a user from a group |
|
63 | - * @param string $uid Name of the user to remove from group |
|
64 | - * @param string $gid Name of the group from which remove the user |
|
65 | - * @return bool |
|
66 | - * |
|
67 | - * removes the user from a group. |
|
68 | - */ |
|
69 | - public function removeFromGroup($uid, $gid); |
|
61 | + /** |
|
62 | + * Removes a user from a group |
|
63 | + * @param string $uid Name of the user to remove from group |
|
64 | + * @param string $gid Name of the group from which remove the user |
|
65 | + * @return bool |
|
66 | + * |
|
67 | + * removes the user from a group. |
|
68 | + */ |
|
69 | + public function removeFromGroup($uid, $gid); |
|
70 | 70 | |
71 | - /** |
|
72 | - * get the number of all users matching the search string in a group |
|
73 | - * @param string $gid |
|
74 | - * @param string $search |
|
75 | - * @return int|false |
|
76 | - */ |
|
77 | - public function countUsersInGroup($gid, $search = ''); |
|
71 | + /** |
|
72 | + * get the number of all users matching the search string in a group |
|
73 | + * @param string $gid |
|
74 | + * @param string $search |
|
75 | + * @return int|false |
|
76 | + */ |
|
77 | + public function countUsersInGroup($gid, $search = ''); |
|
78 | 78 | |
79 | - /** |
|
80 | - * get an array with group details |
|
81 | - * @param string $gid |
|
82 | - * @return array|false |
|
83 | - */ |
|
84 | - public function getGroupDetails($gid); |
|
79 | + /** |
|
80 | + * get an array with group details |
|
81 | + * @param string $gid |
|
82 | + * @return array|false |
|
83 | + */ |
|
84 | + public function getGroupDetails($gid); |
|
85 | 85 | |
86 | 86 | } |