@@ -37,45 +37,45 @@ |
||
37 | 37 | class CreateVersionEvent extends Event { |
38 | 38 | |
39 | 39 | |
40 | - /** @var bool */ |
|
41 | - private $createVersion; |
|
40 | + /** @var bool */ |
|
41 | + private $createVersion; |
|
42 | 42 | |
43 | - /** @var Node */ |
|
44 | - private $node; |
|
43 | + /** @var Node */ |
|
44 | + private $node; |
|
45 | 45 | |
46 | - /** |
|
47 | - * CreateVersionEvent constructor. |
|
48 | - * |
|
49 | - * @param Node $node |
|
50 | - */ |
|
51 | - public function __construct(Node $node) { |
|
52 | - $this->createVersion = true; |
|
53 | - $this->node = $node; |
|
54 | - } |
|
46 | + /** |
|
47 | + * CreateVersionEvent constructor. |
|
48 | + * |
|
49 | + * @param Node $node |
|
50 | + */ |
|
51 | + public function __construct(Node $node) { |
|
52 | + $this->createVersion = true; |
|
53 | + $this->node = $node; |
|
54 | + } |
|
55 | 55 | |
56 | - /** |
|
57 | - * get Node of the file which should be versioned |
|
58 | - * |
|
59 | - * @return Node |
|
60 | - */ |
|
61 | - public function getNode() { |
|
62 | - return $this->node; |
|
63 | - } |
|
56 | + /** |
|
57 | + * get Node of the file which should be versioned |
|
58 | + * |
|
59 | + * @return Node |
|
60 | + */ |
|
61 | + public function getNode() { |
|
62 | + return $this->node; |
|
63 | + } |
|
64 | 64 | |
65 | - /** |
|
66 | - * disable versions for this file |
|
67 | - */ |
|
68 | - public function disableVersions() { |
|
69 | - $this->createVersion = false; |
|
70 | - } |
|
65 | + /** |
|
66 | + * disable versions for this file |
|
67 | + */ |
|
68 | + public function disableVersions() { |
|
69 | + $this->createVersion = false; |
|
70 | + } |
|
71 | 71 | |
72 | - /** |
|
73 | - * should a version be created for this file? |
|
74 | - * |
|
75 | - * @return bool |
|
76 | - */ |
|
77 | - public function shouldCreateVersion() { |
|
78 | - return $this->createVersion; |
|
79 | - } |
|
72 | + /** |
|
73 | + * should a version be created for this file? |
|
74 | + * |
|
75 | + * @return bool |
|
76 | + */ |
|
77 | + public function shouldCreateVersion() { |
|
78 | + return $this->createVersion; |
|
79 | + } |
|
80 | 80 | |
81 | 81 | } |
@@ -32,7 +32,7 @@ |
||
32 | 32 | * @package OC\AppFramework\Middleware\Security\Exceptions |
33 | 33 | */ |
34 | 34 | class LaxSameSiteCookieFailedException extends SecurityException { |
35 | - public function __construct() { |
|
36 | - parent::__construct('Lax Same Site Cookie is invalid in request.', Http::STATUS_PRECONDITION_FAILED); |
|
37 | - } |
|
35 | + public function __construct() { |
|
36 | + parent::__construct('Lax Same Site Cookie is invalid in request.', Http::STATUS_PRECONDITION_FAILED); |
|
37 | + } |
|
38 | 38 | } |
@@ -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 | } |
@@ -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 | } |
@@ -30,17 +30,17 @@ |
||
30 | 30 | * @since 13.0.0 |
31 | 31 | */ |
32 | 32 | interface IManager { |
33 | - /** |
|
34 | - * @param string $className – class name of the ISorter implementation |
|
35 | - * @since 13.0.0 |
|
36 | - */ |
|
37 | - public function registerSorter($className); |
|
33 | + /** |
|
34 | + * @param string $className – class name of the ISorter implementation |
|
35 | + * @since 13.0.0 |
|
36 | + */ |
|
37 | + public function registerSorter($className); |
|
38 | 38 | |
39 | - /** |
|
40 | - * @param array $sorters list of sorter IDs, seperated by "|" |
|
41 | - * @param array $sortArray array representation of OCP\Collaboration\Collaborators\ISearchResult |
|
42 | - * @param array $context context info of the search, keys: itemType, itemId |
|
43 | - * @since 13.0.0 |
|
44 | - */ |
|
45 | - public function runSorters(array $sorters, array &$sortArray, array $context); |
|
39 | + /** |
|
40 | + * @param array $sorters list of sorter IDs, seperated by "|" |
|
41 | + * @param array $sortArray array representation of OCP\Collaboration\Collaborators\ISearchResult |
|
42 | + * @param array $context context info of the search, keys: itemType, itemId |
|
43 | + * @since 13.0.0 |
|
44 | + */ |
|
45 | + public function runSorters(array $sorters, array &$sortArray, array $context); |
|
46 | 46 | } |
@@ -1,11 +1,11 @@ |
||
1 | 1 | <div class="ldapSettingControls"> |
2 | 2 | <button type="button" class="ldap_action_test_connection" name="ldap_action_test_connection"> |
3 | - <?php p($l->t('Test Configuration'));?> |
|
3 | + <?php p($l->t('Test Configuration')); ?> |
|
4 | 4 | </button> |
5 | 5 | <a href="<?php p(link_to_docs('admin-ldap')); ?>" |
6 | 6 | target="_blank" rel="noreferrer noopener"> |
7 | 7 | <img src="<?php print_unescaped(image_path('', 'actions/info.svg')); ?>" |
8 | 8 | style="height:1.75ex" /> |
9 | - <?php p($l->t('Help'));?> |
|
9 | + <?php p($l->t('Help')); ?> |
|
10 | 10 | </a> |
11 | 11 | </div> |
@@ -2,10 +2,10 @@ |
||
2 | 2 | <div id="nojavascript"> |
3 | 3 | <div> |
4 | 4 | <?php print_unescaped(str_replace( |
5 | - ['{linkstart}', '{linkend}'], |
|
6 | - ['<a href="https://www.enable-javascript.com/" target="_blank" rel="noreferrer noopener">', '</a>'], |
|
7 | - $l->t('This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page.') |
|
8 | - )); ?> |
|
5 | + ['{linkstart}', '{linkend}'], |
|
6 | + ['<a href="https://www.enable-javascript.com/" target="_blank" rel="noreferrer noopener">', '</a>'], |
|
7 | + $l->t('This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page.') |
|
8 | + )); ?> |
|
9 | 9 | </div> |
10 | 10 | </div> |
11 | 11 | </noscript> |