@@ -29,60 +29,60 @@ |
||
29 | 29 | use OCP\IURLGenerator; |
30 | 30 | |
31 | 31 | class ContactsManager { |
32 | - /** @var CardDavBackend */ |
|
33 | - private $backend; |
|
32 | + /** @var CardDavBackend */ |
|
33 | + private $backend; |
|
34 | 34 | |
35 | - /** @var IL10N */ |
|
36 | - private $l10n; |
|
35 | + /** @var IL10N */ |
|
36 | + private $l10n; |
|
37 | 37 | |
38 | - /** |
|
39 | - * ContactsManager constructor. |
|
40 | - * |
|
41 | - * @param CardDavBackend $backend |
|
42 | - * @param IL10N $l10n |
|
43 | - */ |
|
44 | - public function __construct(CardDavBackend $backend, IL10N $l10n) { |
|
45 | - $this->backend = $backend; |
|
46 | - $this->l10n = $l10n; |
|
47 | - } |
|
38 | + /** |
|
39 | + * ContactsManager constructor. |
|
40 | + * |
|
41 | + * @param CardDavBackend $backend |
|
42 | + * @param IL10N $l10n |
|
43 | + */ |
|
44 | + public function __construct(CardDavBackend $backend, IL10N $l10n) { |
|
45 | + $this->backend = $backend; |
|
46 | + $this->l10n = $l10n; |
|
47 | + } |
|
48 | 48 | |
49 | - /** |
|
50 | - * @param IManager $cm |
|
51 | - * @param string $userId |
|
52 | - * @param IURLGenerator $urlGenerator |
|
53 | - */ |
|
54 | - public function setupContactsProvider(IManager $cm, $userId, IURLGenerator $urlGenerator) { |
|
55 | - $addressBooks = $this->backend->getAddressBooksForUser("principals/users/$userId"); |
|
56 | - $this->register($cm, $addressBooks, $urlGenerator); |
|
57 | - $this->setupSystemContactsProvider($cm, $urlGenerator); |
|
58 | - } |
|
49 | + /** |
|
50 | + * @param IManager $cm |
|
51 | + * @param string $userId |
|
52 | + * @param IURLGenerator $urlGenerator |
|
53 | + */ |
|
54 | + public function setupContactsProvider(IManager $cm, $userId, IURLGenerator $urlGenerator) { |
|
55 | + $addressBooks = $this->backend->getAddressBooksForUser("principals/users/$userId"); |
|
56 | + $this->register($cm, $addressBooks, $urlGenerator); |
|
57 | + $this->setupSystemContactsProvider($cm, $urlGenerator); |
|
58 | + } |
|
59 | 59 | |
60 | - /** |
|
61 | - * @param IManager $cm |
|
62 | - * @param IURLGenerator $urlGenerator |
|
63 | - */ |
|
64 | - public function setupSystemContactsProvider(IManager $cm, IURLGenerator $urlGenerator) { |
|
65 | - $addressBooks = $this->backend->getAddressBooksForUser("principals/system/system"); |
|
66 | - $this->register($cm, $addressBooks, $urlGenerator); |
|
67 | - } |
|
60 | + /** |
|
61 | + * @param IManager $cm |
|
62 | + * @param IURLGenerator $urlGenerator |
|
63 | + */ |
|
64 | + public function setupSystemContactsProvider(IManager $cm, IURLGenerator $urlGenerator) { |
|
65 | + $addressBooks = $this->backend->getAddressBooksForUser("principals/system/system"); |
|
66 | + $this->register($cm, $addressBooks, $urlGenerator); |
|
67 | + } |
|
68 | 68 | |
69 | - /** |
|
70 | - * @param IManager $cm |
|
71 | - * @param $addressBooks |
|
72 | - * @param IURLGenerator $urlGenerator |
|
73 | - */ |
|
74 | - private function register(IManager $cm, $addressBooks, $urlGenerator) { |
|
75 | - foreach ($addressBooks as $addressBookInfo) { |
|
76 | - $addressBook = new \OCA\DAV\CardDAV\AddressBook($this->backend, $addressBookInfo, $this->l10n); |
|
77 | - $cm->registerAddressBook( |
|
78 | - new AddressBookImpl( |
|
79 | - $addressBook, |
|
80 | - $addressBookInfo, |
|
81 | - $this->backend, |
|
82 | - $urlGenerator |
|
83 | - ) |
|
84 | - ); |
|
85 | - } |
|
86 | - } |
|
69 | + /** |
|
70 | + * @param IManager $cm |
|
71 | + * @param $addressBooks |
|
72 | + * @param IURLGenerator $urlGenerator |
|
73 | + */ |
|
74 | + private function register(IManager $cm, $addressBooks, $urlGenerator) { |
|
75 | + foreach ($addressBooks as $addressBookInfo) { |
|
76 | + $addressBook = new \OCA\DAV\CardDAV\AddressBook($this->backend, $addressBookInfo, $this->l10n); |
|
77 | + $cm->registerAddressBook( |
|
78 | + new AddressBookImpl( |
|
79 | + $addressBook, |
|
80 | + $addressBookInfo, |
|
81 | + $this->backend, |
|
82 | + $urlGenerator |
|
83 | + ) |
|
84 | + ); |
|
85 | + } |
|
86 | + } |
|
87 | 87 | |
88 | 88 | } |
@@ -11,15 +11,15 @@ |
||
11 | 11 | */ |
12 | 12 | class Version1002Date20170926101419 extends BigIntMigration { |
13 | 13 | |
14 | - /** |
|
15 | - * @return array Returns an array with the following structure |
|
16 | - * ['table1' => ['column1', 'column2'], ...] |
|
17 | - * @since 13.0.0 |
|
18 | - */ |
|
19 | - protected function getColumnsByTable() { |
|
20 | - return [ |
|
21 | - 'twofactor_backupcodes' => ['id'], |
|
22 | - ]; |
|
23 | - } |
|
14 | + /** |
|
15 | + * @return array Returns an array with the following structure |
|
16 | + * ['table1' => ['column1', 'column2'], ...] |
|
17 | + * @since 13.0.0 |
|
18 | + */ |
|
19 | + protected function getColumnsByTable() { |
|
20 | + return [ |
|
21 | + 'twofactor_backupcodes' => ['id'], |
|
22 | + ]; |
|
23 | + } |
|
24 | 24 | |
25 | 25 | } |
@@ -11,25 +11,25 @@ |
||
11 | 11 | */ |
12 | 12 | class Version1004Date20170926103422 extends BigIntMigration { |
13 | 13 | |
14 | - /** |
|
15 | - * @return array Returns an array with the following structure |
|
16 | - * ['table1' => ['column1', 'column2'], ...] |
|
17 | - * @since 13.0.0 |
|
18 | - */ |
|
19 | - protected function getColumnsByTable() { |
|
20 | - return [ |
|
21 | - 'addressbooks' => ['id'], |
|
22 | - 'addressbookchanges' => ['id', 'addressbookid'], |
|
23 | - 'calendars' => ['id'], |
|
24 | - 'calendarchanges' => ['id', 'calendarid'], |
|
25 | - 'calendarobjects' => ['id', 'calendarid'], |
|
26 | - 'calendarobjects_props' => ['id', 'calendarid', 'objectid'], |
|
27 | - 'calendarsubscriptions' => ['id'], |
|
28 | - 'cards' => ['id', 'addressbookid'], |
|
29 | - 'cards_properties' => ['id', 'addressbookid', 'cardid'], |
|
30 | - 'dav_shares' => ['id', 'resourceid'], |
|
31 | - 'schedulingobjects' => ['id'], |
|
32 | - ]; |
|
33 | - } |
|
14 | + /** |
|
15 | + * @return array Returns an array with the following structure |
|
16 | + * ['table1' => ['column1', 'column2'], ...] |
|
17 | + * @since 13.0.0 |
|
18 | + */ |
|
19 | + protected function getColumnsByTable() { |
|
20 | + return [ |
|
21 | + 'addressbooks' => ['id'], |
|
22 | + 'addressbookchanges' => ['id', 'addressbookid'], |
|
23 | + 'calendars' => ['id'], |
|
24 | + 'calendarchanges' => ['id', 'calendarid'], |
|
25 | + 'calendarobjects' => ['id', 'calendarid'], |
|
26 | + 'calendarobjects_props' => ['id', 'calendarid', 'objectid'], |
|
27 | + 'calendarsubscriptions' => ['id'], |
|
28 | + 'cards' => ['id', 'addressbookid'], |
|
29 | + 'cards_properties' => ['id', 'addressbookid', 'cardid'], |
|
30 | + 'dav_shares' => ['id', 'resourceid'], |
|
31 | + 'schedulingobjects' => ['id'], |
|
32 | + ]; |
|
33 | + } |
|
34 | 34 | |
35 | 35 | } |
@@ -10,22 +10,22 @@ |
||
10 | 10 | interface IContactsStore { |
11 | 11 | |
12 | 12 | |
13 | - /** |
|
14 | - * @param IUser $user |
|
15 | - * @param $filter |
|
16 | - * @return IEntry[] |
|
17 | - * @since 13.0.0 |
|
18 | - */ |
|
19 | - public function getContacts(IUser $user, $filter); |
|
13 | + /** |
|
14 | + * @param IUser $user |
|
15 | + * @param $filter |
|
16 | + * @return IEntry[] |
|
17 | + * @since 13.0.0 |
|
18 | + */ |
|
19 | + public function getContacts(IUser $user, $filter); |
|
20 | 20 | |
21 | - /** |
|
22 | - * @brief finds a contact by specifying the property to search on ($shareType) and the value ($shareWith) |
|
23 | - * @param IUser $user |
|
24 | - * @param integer $shareType |
|
25 | - * @param string $shareWith |
|
26 | - * @return IEntry|null |
|
27 | - * @since 13.0.0 |
|
28 | - */ |
|
29 | - public function findOne(IUser $user, $shareType, $shareWith); |
|
21 | + /** |
|
22 | + * @brief finds a contact by specifying the property to search on ($shareType) and the value ($shareWith) |
|
23 | + * @param IUser $user |
|
24 | + * @param integer $shareType |
|
25 | + * @param string $shareWith |
|
26 | + * @return IEntry|null |
|
27 | + * @since 13.0.0 |
|
28 | + */ |
|
29 | + public function findOne(IUser $user, $shareType, $shareWith); |
|
30 | 30 | |
31 | 31 | } |
@@ -32,14 +32,14 @@ |
||
32 | 32 | */ |
33 | 33 | class Collection extends \Sabre\CalDAV\Principal\Collection { |
34 | 34 | |
35 | - /** |
|
36 | - * Returns a child object based on principal information |
|
37 | - * |
|
38 | - * @param array $principalInfo |
|
39 | - * @return User |
|
40 | - */ |
|
41 | - function getChildForPrincipal(array $principalInfo) { |
|
42 | - return new User($this->principalBackend, $principalInfo); |
|
43 | - } |
|
35 | + /** |
|
36 | + * Returns a child object based on principal information |
|
37 | + * |
|
38 | + * @param array $principalInfo |
|
39 | + * @return User |
|
40 | + */ |
|
41 | + function getChildForPrincipal(array $principalInfo) { |
|
42 | + return new User($this->principalBackend, $principalInfo); |
|
43 | + } |
|
44 | 44 | |
45 | 45 | } |
@@ -30,26 +30,26 @@ |
||
30 | 30 | */ |
31 | 31 | class User extends \Sabre\CalDAV\Principal\User { |
32 | 32 | |
33 | - /** |
|
34 | - * Returns a list of ACE's for this node. |
|
35 | - * |
|
36 | - * Each ACE has the following properties: |
|
37 | - * * 'privilege', a string such as {DAV:}read or {DAV:}write. These are |
|
38 | - * currently the only supported privileges |
|
39 | - * * 'principal', a url to the principal who owns the node |
|
40 | - * * 'protected' (optional), indicating that this ACE is not allowed to |
|
41 | - * be updated. |
|
42 | - * |
|
43 | - * @return array |
|
44 | - */ |
|
45 | - function getACL() { |
|
46 | - $acl = parent::getACL(); |
|
47 | - $acl[] = [ |
|
48 | - 'privilege' => '{DAV:}read', |
|
49 | - 'principal' => '{DAV:}authenticated', |
|
50 | - 'protected' => true, |
|
51 | - ]; |
|
52 | - return $acl; |
|
53 | - } |
|
33 | + /** |
|
34 | + * Returns a list of ACE's for this node. |
|
35 | + * |
|
36 | + * Each ACE has the following properties: |
|
37 | + * * 'privilege', a string such as {DAV:}read or {DAV:}write. These are |
|
38 | + * currently the only supported privileges |
|
39 | + * * 'principal', a url to the principal who owns the node |
|
40 | + * * 'protected' (optional), indicating that this ACE is not allowed to |
|
41 | + * be updated. |
|
42 | + * |
|
43 | + * @return array |
|
44 | + */ |
|
45 | + function getACL() { |
|
46 | + $acl = parent::getACL(); |
|
47 | + $acl[] = [ |
|
48 | + 'privilege' => '{DAV:}read', |
|
49 | + 'principal' => '{DAV:}authenticated', |
|
50 | + 'protected' => true, |
|
51 | + ]; |
|
52 | + return $acl; |
|
53 | + } |
|
54 | 54 | |
55 | 55 | } |
@@ -25,31 +25,31 @@ |
||
25 | 25 | use OCP\Remote\ICredentials; |
26 | 26 | |
27 | 27 | class Credentials implements ICredentials { |
28 | - /** @var string */ |
|
29 | - private $user; |
|
30 | - /** @var string */ |
|
31 | - private $password; |
|
28 | + /** @var string */ |
|
29 | + private $user; |
|
30 | + /** @var string */ |
|
31 | + private $password; |
|
32 | 32 | |
33 | - /** |
|
34 | - * @param string $user |
|
35 | - * @param string $password |
|
36 | - */ |
|
37 | - public function __construct($user, $password) { |
|
38 | - $this->user = $user; |
|
39 | - $this->password = $password; |
|
40 | - } |
|
33 | + /** |
|
34 | + * @param string $user |
|
35 | + * @param string $password |
|
36 | + */ |
|
37 | + public function __construct($user, $password) { |
|
38 | + $this->user = $user; |
|
39 | + $this->password = $password; |
|
40 | + } |
|
41 | 41 | |
42 | - /** |
|
43 | - * @return string |
|
44 | - */ |
|
45 | - public function getUsername() { |
|
46 | - return $this->user; |
|
47 | - } |
|
42 | + /** |
|
43 | + * @return string |
|
44 | + */ |
|
45 | + public function getUsername() { |
|
46 | + return $this->user; |
|
47 | + } |
|
48 | 48 | |
49 | - /** |
|
50 | - * @return string |
|
51 | - */ |
|
52 | - public function getPassword() { |
|
53 | - return $this->password; |
|
54 | - } |
|
49 | + /** |
|
50 | + * @return string |
|
51 | + */ |
|
52 | + public function getPassword() { |
|
53 | + return $this->password; |
|
54 | + } |
|
55 | 55 | } |
@@ -27,11 +27,11 @@ |
||
27 | 27 | * @since 13.0.0 |
28 | 28 | */ |
29 | 29 | interface IUserApi { |
30 | - /** |
|
31 | - * @param string $userId |
|
32 | - * @return IUser |
|
33 | - * |
|
34 | - * @since 13.0.0 |
|
35 | - */ |
|
36 | - public function getUser($userId); |
|
30 | + /** |
|
31 | + * @param string $userId |
|
32 | + * @return IUser |
|
33 | + * |
|
34 | + * @since 13.0.0 |
|
35 | + */ |
|
36 | + public function getUser($userId); |
|
37 | 37 | } |
@@ -25,10 +25,10 @@ |
||
25 | 25 | * @since 13.0.0 |
26 | 26 | */ |
27 | 27 | interface ICapabilitiesApi { |
28 | - /** |
|
29 | - * @return array The capabilities in the form of [$appId => [$capability => $value]] |
|
30 | - * |
|
31 | - * @since 13.0.0 |
|
32 | - */ |
|
33 | - public function getCapabilities(); |
|
28 | + /** |
|
29 | + * @return array The capabilities in the form of [$appId => [$capability => $value]] |
|
30 | + * |
|
31 | + * @since 13.0.0 |
|
32 | + */ |
|
33 | + public function getCapabilities(); |
|
34 | 34 | } |