diff --git a/data/web/autodiscover.php b/data/web/autodiscover.php
index fd4181f6..92328e7f 100644
--- a/data/web/autodiscover.php
+++ b/data/web/autodiscover.php
@@ -1,102 +1,112 @@
PDO::ERRMODE_EXCEPTION,
- PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
- PDO::ATTR_EMULATE_PREPARES => false,
+ PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
+ PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
+ PDO::ATTR_EMULATE_PREPARES => false,
];
$pdo = new PDO($dsn, $database_user, $database_pass, $opt);
$login_user = strtolower(trim($_SERVER['PHP_AUTH_USER']));
-$as = check_login($login_user, $_SERVER['PHP_AUTH_PW']);
+$login_role = check_login($login_user, $_SERVER['PHP_AUTH_PW']);
-if (!isset($_SERVER['PHP_AUTH_USER']) OR $as !== "user") {
- header('WWW-Authenticate: Basic realm=""');
- header('HTTP/1.0 401 Unauthorized');
- exit;
+if (!isset($_SERVER['PHP_AUTH_USER']) OR $login_role !== "user") {
+ header('WWW-Authenticate: Basic realm=""');
+ header('HTTP/1.0 401 Unauthorized');
+ exit(0);
}
else {
- if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
- if ($as === "user") {
+ if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
+ if ($login_role === "user") {
header("Content-Type: application/xml");
- echo '';
-
- if (!$data) {
+ echo '' . PHP_EOL;
+?>
+
+';
- echo '';
- echo '600Invalid Request';
- echo '';
- echo '';
+?>
+
+
+ 600
+ Invalid Request
+
+
+
+
+Request->EMailAddress;
if ($autodiscover_config['autodiscoverType'] == 'imap') {
- ?>
+?>
-
-
-
-
- email
- settings
-
- IMAP
-
-
- off
-
- off
-
- on
-
-
- SMTP
-
-
- off
-
- off
-
- on
- on
- off
-
-
- CalDAV
- https:///SOGo/dav//Calendar
- off
-
-
-
- CardDAV
- https:///SOGo/dav//Contacts
- off
-
-
-
+
+ =$displayname;?>
+
+
+ email
+ settings
+
+ IMAP
+ =$autodiscover_config['imap']['server'];?>
+ =$autodiscover_config['imap']['port'];?>
+ off
+ =$email;?>
+ off
+ =$autodiscover_config['imap']['ssl'];?>
+ on
+
+
+ SMTP
+ =$autodiscover_config['smtp']['server'];?>
+ =$autodiscover_config['smtp']['port'];?>
+ off
+ =$email;?>
+ off
+ =$autodiscover_config['smtp']['ssl'];?>
+ on
+ on
+ off
+
+
+ CalDAV
+ https://=$mailcow_hostname;?>/SOGo/dav/=$email;?>/Calendar
+ off
+ =$email;?>
+
+
+ CardDAV
+ https://=$mailcow_hostname;?>/SOGo/dav/=$email;?>/Contacts
+ off
+ =$email;?>
+
+
-
+?>
- en:en
-
-
-
-
-
-
-
- MobileSync
-
-
-
-
-
+ en:en
+
+ =$displayname;?>
+ =$email;?>
+
+
+
+
+ MobileSync
+ =$autodiscover_config['activesync']['url'];?>
+ =$autodiscover_config['activesync']['url'];?>
+
+
+
-
+?>