From e27cb833262315db9c1864e767b7f23dd504da24 Mon Sep 17 00:00:00 2001
From: FreddleSpl0it <75116288+FreddleSpl0it@users.noreply.github.com>
Date: Mon, 9 Nov 2026 23:17:55 +0100
Subject: [PATCH] [Web] Autodiscover: no ActiveSync when autodiscoverType is
 imap

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

diff --git a/data/web/autodiscover-json.php b/data/web/autodiscover-json.php
index 2fa96990e..661699293 100644
--- a/data/web/autodiscover-json.php
+++ b/data/web/autodiscover-json.php
@@ -8,7 +8,7 @@ if(file_exists('inc/vars.local.inc.php')) {
 $autodiscover_config = array_merge($default_autodiscover_config, $autodiscover_config);
 
 header('Content-type: application/json');
-if (strtolower($_GET['Protocol']) == 'activesync' && getenv('SKIP_SOGO') != "y") {
+if (strtolower($_GET['Protocol']) == 'activesync' && $autodiscover_config['autodiscoverType'] == 'activesync' && getenv('SKIP_SOGO') != "y") {
   echo '{"Protocol":"ActiveSync","Url":"' . $autodiscover_config['activesync']['url'] . '"}';
 }
 elseif (strtolower($_GET['Protocol']) == 'autodiscoverv1') {
diff --git a/data/web/autodiscover.php b/data/web/autodiscover.php
index e2d70bbae..8a9349934 100644
--- a/data/web/autodiscover.php
+++ b/data/web/autodiscover.php
@@ -31,7 +31,7 @@ error_reporting(0);
 
 $data = trim(file_get_contents("php://input"));
 
-if (strpos($data, 'autodiscover/outlook/responseschema') !== false) {
+if (strpos($data, 'autodiscover/outlook/responseschema') !== false && $autodiscover_config['autodiscoverType'] == 'activesync') {
   $autodiscover_config['autodiscoverType'] = 'imap';
   if ($autodiscover_config['useEASforOutlook'] == 'yes' &&
     // Office for macOS does not support EAS