Skip to content

Commit da5d80d

Browse files
fix: remove wrongly used system address book flag
Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>
1 parent fc16767 commit da5d80d

2 files changed

Lines changed: 2 additions & 9 deletions

File tree

apps/dav/lib/CardDAV/ContactsManager.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88

99
namespace OCA\DAV\CardDAV;
1010

11-
use OCA\DAV\AppInfo\Application;
12-
use OCA\DAV\ConfigLexicon;
1311
use OCA\DAV\Db\PropertyMapper;
1412
use OCP\Contacts\IManager;
1513
use OCP\IAppConfig;
@@ -48,11 +46,6 @@ public function setupContactsProvider(IManager $cm, $userId, IURLGenerator $urlG
4846
* @param IURLGenerator $urlGenerator
4947
*/
5048
public function setupSystemContactsProvider(IManager $cm, ?string $userId, IURLGenerator $urlGenerator) {
51-
$systemAddressBookExposed = $this->appConfig->getValueBool(Application::APP_ID, ConfigLexicon::SYSTEM_ADDRESSBOOK_EXPOSED);
52-
if (!$systemAddressBookExposed) {
53-
return;
54-
}
55-
5649
$addressBooks = $this->backend->getAddressBooksForUser('principals/system/system');
5750
$this->register($cm, $addressBooks, $urlGenerator, $userId);
5851
}

apps/dav/lib/Settings/Admin/SystemAddressBookSettings.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ public function getSchema(): array {
2828
'section_id' => 'groupware',
2929
'storage_type' => DeclarativeSettingsTypes::STORAGE_TYPE_EXTERNAL,
3030
'title' => $this->l->t('System Address Book'),
31-
'description' => $this->l->t('The system address book contains contact information for all users in your instance.'),
31+
'description' => $this->l->t('The system address book contains contact information for all users in your instance. The system address book is required for the searching and auto-completion of users.'),
3232

3333
'fields' => [
3434
[
3535
'id' => 'system_addressbook_enabled',
36-
'title' => $this->l->t('Enable System Address Book'),
36+
'title' => $this->l->t('Enable System Address Book in DAV clients'),
3737
'type' => DeclarativeSettingsTypes::CHECKBOX,
3838
'default' => false,
3939
'options' => [],

0 commit comments

Comments
 (0)