From d3f382c5588098e8236cc442518d056cc5faf32a Mon Sep 17 00:00:00 2001
From: eXtremeSHOK <admin@extremeshok.com>
Date: Mon, 11 Feb 2019 14:50:37 +0200
Subject: [PATCH 1/2] Fix: AutoDiscover issue with Outlook 2019

Fixes #2300
---
 data/web/autodiscover-json.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/web/autodiscover-json.php b/data/web/autodiscover-json.php
index 76d9f9b0..1bc5b6c5 100644
--- a/data/web/autodiscover-json.php
+++ b/data/web/autodiscover-json.php
@@ -11,7 +11,7 @@ header('Content-type: application/json');
 if ($_GET['Protocol'] == 'ActiveSync') {
   echo '{"Protocol":"ActiveSync","Url":"' . $autodiscover_config['activesync']['url'] . '"}';
 }
-elseif ($_GET['Protocol'] == 'AutodiscoverV1') {
+elseif (($_GET['Protocol'] == 'AutodiscoverV1') || ($_GET['Protocol'] == 'Autodiscoverv1')) {
   echo '{"Protocol":"AutodiscoverV1","Url":"https://' . $_SERVER['HTTP_HOST'] . '/Autodiscover/Autodiscover.xml"}';
 }
 else {

From d29adbae0205ff6d127d430cd718323176e66f71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Peters?= <andre.peters@debinux.de>
Date: Mon, 11 Feb 2019 13:52:24 +0100
Subject: [PATCH 2/2] Update autodiscover-json.php

---
 data/web/autodiscover-json.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/web/autodiscover-json.php b/data/web/autodiscover-json.php
index 1bc5b6c5..c8bb678e 100644
--- a/data/web/autodiscover-json.php
+++ b/data/web/autodiscover-json.php
@@ -8,10 +8,10 @@ if(file_exists('inc/vars.local.inc.php')) {
 $autodiscover_config = array_merge($default_autodiscover_config, $autodiscover_config);
 
 header('Content-type: application/json');
-if ($_GET['Protocol'] == 'ActiveSync') {
+if (strtolower($_GET['Protocol']) == 'activesync') {
   echo '{"Protocol":"ActiveSync","Url":"' . $autodiscover_config['activesync']['url'] . '"}';
 }
-elseif (($_GET['Protocol'] == 'AutodiscoverV1') || ($_GET['Protocol'] == 'Autodiscoverv1')) {
+elseif (strtolower($_GET['Protocol']) == 'autodiscoverv1') {
   echo '{"Protocol":"AutodiscoverV1","Url":"https://' . $_SERVER['HTTP_HOST'] . '/Autodiscover/Autodiscover.xml"}';
 }
 else {