git subrepo commit (merge) mailcow/src/mailcow-dockerized
subrepo: subdir: "mailcow/src/mailcow-dockerized"
merged: "32243e56"
upstream: origin: "https://github.com/mailcow/mailcow-dockerized.git"
branch: "master"
commit: "e2b4b6f6"
git-subrepo: version: "0.4.3"
origin: "???"
commit: "???"
Change-Id: I51e2016ef5ab88a8b0bdc08551b18f48ceef0aa5
diff --git a/mailcow/src/mailcow-dockerized/data/web/autodiscover.php b/mailcow/src/mailcow-dockerized/data/web/autodiscover.php
index c18edbf..cc6807b 100644
--- a/mailcow/src/mailcow-dockerized/data/web/autodiscover.php
+++ b/mailcow/src/mailcow-dockerized/data/web/autodiscover.php
@@ -58,6 +58,7 @@
"time" => time(),
"ua" => $_SERVER['HTTP_USER_AGENT'],
"user" => "none",
+ "ip" => $_SERVER['REMOTE_ADDR'],
"service" => "Error: must be authenticated"
)
);
@@ -67,7 +68,7 @@
exit(0);
}
-$login_role = check_login($login_user, $login_pass);
+$login_role = check_login($login_user, $login_pass, true);
if ($login_role === "user") {
header("Content-Type: application/xml");
@@ -82,6 +83,7 @@
"time" => time(),
"ua" => $_SERVER['HTTP_USER_AGENT'],
"user" => $_SERVER['PHP_AUTH_USER'],
+ "ip" => $_SERVER['REMOTE_ADDR'],
"service" => "Error: invalid or missing request data"
)
);
@@ -136,6 +138,7 @@
"time" => time(),
"ua" => $_SERVER['HTTP_USER_AGENT'],
"user" => $_SERVER['PHP_AUTH_USER'],
+ "ip" => $_SERVER['REMOTE_ADDR'],
"service" => $autodiscover_config['autodiscoverType']
)
);