@@ -30,13 +30,13 @@ |
||
| 30 | 30 | * @since 13.0.0 |
| 31 | 31 | */ |
| 32 | 32 | interface ISearchPlugin { |
| 33 | - /** |
|
| 34 | - * @param string $search |
|
| 35 | - * @param int $limit |
|
| 36 | - * @param int $offset |
|
| 37 | - * @param ISearchResult $searchResult |
|
| 38 | - * @return bool whether the plugin has more results |
|
| 39 | - * @since 13.0.0 |
|
| 40 | - */ |
|
| 41 | - public function search($search, $limit, $offset, ISearchResult $searchResult); |
|
| 33 | + /** |
|
| 34 | + * @param string $search |
|
| 35 | + * @param int $limit |
|
| 36 | + * @param int $offset |
|
| 37 | + * @param ISearchResult $searchResult |
|
| 38 | + * @return bool whether the plugin has more results |
|
| 39 | + * @since 13.0.0 |
|
| 40 | + */ |
|
| 41 | + public function search($search, $limit, $offset, ISearchResult $searchResult); |
|
| 42 | 42 | } |
@@ -30,21 +30,21 @@ |
||
| 30 | 30 | * @since 13.0.0 |
| 31 | 31 | */ |
| 32 | 32 | interface ISearch { |
| 33 | - /** |
|
| 34 | - * @param string $search |
|
| 35 | - * @param array $shareTypes |
|
| 36 | - * @param bool $lookup |
|
| 37 | - * @param int $limit |
|
| 38 | - * @param int $offset |
|
| 39 | - * @return array with two elements, 1st ISearchResult as array, 2nd a bool indicating whether more result are available |
|
| 40 | - * @since 13.0.0 |
|
| 41 | - */ |
|
| 42 | - public function search($search, array $shareTypes, $lookup, $limit, $offset); |
|
| 33 | + /** |
|
| 34 | + * @param string $search |
|
| 35 | + * @param array $shareTypes |
|
| 36 | + * @param bool $lookup |
|
| 37 | + * @param int $limit |
|
| 38 | + * @param int $offset |
|
| 39 | + * @return array with two elements, 1st ISearchResult as array, 2nd a bool indicating whether more result are available |
|
| 40 | + * @since 13.0.0 |
|
| 41 | + */ |
|
| 42 | + public function search($search, array $shareTypes, $lookup, $limit, $offset); |
|
| 43 | 43 | |
| 44 | - /** |
|
| 45 | - * @param array $pluginInfo with keys 'shareType' containing the name of a corresponding constant in \OCP\Share and |
|
| 46 | - * 'class' with the class name of the plugin |
|
| 47 | - * @since 13.0.0 |
|
| 48 | - */ |
|
| 49 | - public function registerPlugin(array $pluginInfo); |
|
| 44 | + /** |
|
| 45 | + * @param array $pluginInfo with keys 'shareType' containing the name of a corresponding constant in \OCP\Share and |
|
| 46 | + * 'class' with the class name of the plugin |
|
| 47 | + * @since 13.0.0 |
|
| 48 | + */ |
|
| 49 | + public function registerPlugin(array $pluginInfo); |
|
| 50 | 50 | } |
@@ -35,39 +35,39 @@ |
||
| 35 | 35 | */ |
| 36 | 36 | class MoveToTrashEvent extends Event { |
| 37 | 37 | |
| 38 | - /** @var bool */ |
|
| 39 | - private $moveToTrashBin; |
|
| 38 | + /** @var bool */ |
|
| 39 | + private $moveToTrashBin; |
|
| 40 | 40 | |
| 41 | - /** @var Node */ |
|
| 42 | - private $node; |
|
| 41 | + /** @var Node */ |
|
| 42 | + private $node; |
|
| 43 | 43 | |
| 44 | - public function __construct(Node $node) { |
|
| 45 | - $this->moveToTrashBin = true; |
|
| 46 | - $this->node = $node; |
|
| 47 | - } |
|
| 44 | + public function __construct(Node $node) { |
|
| 45 | + $this->moveToTrashBin = true; |
|
| 46 | + $this->node = $node; |
|
| 47 | + } |
|
| 48 | 48 | |
| 49 | - /** |
|
| 50 | - * get Node which will be deleted |
|
| 51 | - * |
|
| 52 | - * @return Node |
|
| 53 | - */ |
|
| 54 | - public function getNode() { |
|
| 55 | - return $this->node; |
|
| 56 | - } |
|
| 49 | + /** |
|
| 50 | + * get Node which will be deleted |
|
| 51 | + * |
|
| 52 | + * @return Node |
|
| 53 | + */ |
|
| 54 | + public function getNode() { |
|
| 55 | + return $this->node; |
|
| 56 | + } |
|
| 57 | 57 | |
| 58 | - /** |
|
| 59 | - * disable trash bin for this operation |
|
| 60 | - */ |
|
| 61 | - public function disableTrashBin() { |
|
| 62 | - $this->moveToTrashBin = false; |
|
| 63 | - } |
|
| 58 | + /** |
|
| 59 | + * disable trash bin for this operation |
|
| 60 | + */ |
|
| 61 | + public function disableTrashBin() { |
|
| 62 | + $this->moveToTrashBin = false; |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | - /** |
|
| 66 | - * should the file be moved to the trash bin? |
|
| 67 | - * |
|
| 68 | - * @return bool |
|
| 69 | - */ |
|
| 70 | - public function shouldMoveToTrashBin() { |
|
| 71 | - return $this->moveToTrashBin; |
|
| 72 | - } |
|
| 65 | + /** |
|
| 66 | + * should the file be moved to the trash bin? |
|
| 67 | + * |
|
| 68 | + * @return bool |
|
| 69 | + */ |
|
| 70 | + public function shouldMoveToTrashBin() { |
|
| 71 | + return $this->moveToTrashBin; |
|
| 72 | + } |
|
| 73 | 73 | } |
@@ -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 | } |