From 3508c2368f9e944dbfd4a70889351bdb4fb182a1 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 24 Jan 2019 16:15:24 +0100
Subject: [PATCH] Keep Calendar server settings in groupware but link mail
 server settings

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
---
 apps/dav/lib/Settings/CalDAVSettings.php            | 2 +-
 apps/dav/templates/settings-admin-caldav.php        | 2 +-
 apps/dav/tests/unit/Settings/CalDAVSettingsTest.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/dav/lib/Settings/CalDAVSettings.php b/apps/dav/lib/Settings/CalDAVSettings.php
index 36ee07d9447..f38143b5b4e 100644
--- a/apps/dav/lib/Settings/CalDAVSettings.php
+++ b/apps/dav/lib/Settings/CalDAVSettings.php
@@ -57,7 +57,7 @@ class CalDAVSettings implements ISettings {
 	 * @return string
 	 */
 	public function getSection() {
-		return 'server';
+		return 'groupware';
 	}
 
 	/**
diff --git a/apps/dav/templates/settings-admin-caldav.php b/apps/dav/templates/settings-admin-caldav.php
index 0ed53f31bca..a30d4acccf7 100644
--- a/apps/dav/templates/settings-admin-caldav.php
+++ b/apps/dav/templates/settings-admin-caldav.php
@@ -37,7 +37,7 @@ script('dav', [
 			<?php ($_['send_invitations'] === 'yes') ? print_unescaped('checked="checked"') : null ?>/>
 		<label for="caldavSendInvitations"><?php p($l->t('Send invitations to attendees')); ?></label>
 		<br>
-		<em><?php p($l->t('Please make sure to properly set up the email settings above.')); ?></em>
+		<em><?php p($l->t('Please make sure to properly set up the email server.')); ?> <a href="../admin#mail_general_settings">↗</a></em>
 	</p>
 	<p>
 		<input type="checkbox" name="caldav_generate_birthday_calendar" id="caldavGenerateBirthdayCalendar" class="checkbox"
diff --git a/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php b/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php
index 43d60038a23..a9df63a03ab 100644
--- a/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php
+++ b/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php
@@ -49,7 +49,7 @@ class CalDAVSettingsTest extends TestCase {
 	}
 
 	public function testGetSection() {
-		$this->assertEquals('server', $this->settings->getSection());
+		$this->assertEquals('groupware', $this->settings->getSection());
 	}
 
 	public function testGetPriority() {