From e3b7c31dad33b375f6c077b18342bff6761a1ebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Peters?= Date: Sun, 30 Jun 2019 08:18:18 +0200 Subject: [PATCH 1/2] Update README.md --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 3425de00..ec500d9c 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,5 @@ # mailcow: dockerized - 🐮 + 🐋 = 💕 -## 💡 Entwickler gesucht! -Wir möchten die Kuh clustern und noch sicherererer machen, daher suchen wir dringend Entwickler, die dabei unterstützen. Bis hin zur Festanstellung alle Möglichkeiten offen. Bitte meldet euch bei info@servercow.de - ## Want to support mailcow? Donate via **PayPal** [![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JWBSYHF4SMC68) or via **Liberapay** [![Liberapay.com](https://mailcow.email/img/lp.png)](https://liberapay.com/mailcow) From 61f950b4730b503323b4f66294625df634359a74 Mon Sep 17 00:00:00 2001 From: Braintelligence Date: Mon, 1 Jul 2019 16:48:01 +0200 Subject: [PATCH 2/2] Fix issue #2718 Proposal for a fix of issue #2718 . Strip port from HTTP_HOST per @mkuron proposal: https://github.com/mailcow/mailcow-dockerized/issues/2718#issuecomment-506987422 --- data/web/user.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/web/user.php b/data/web/user.php index 7fe37310..a6bbe97d 100644 --- a/data/web/user.php +++ b/data/web/user.php @@ -77,7 +77,7 @@ elseif (isset($_SESSION['mailcow_cc_role']) && $_SESSION['mailcow_cc_role'] == ' $username = $_SESSION['mailcow_cc_username']; $mailboxdata = mailbox('get', 'mailbox_details', $username); - $clientconfigstr = "host=" . urlencode($mailcow_hostname) . "&email=" . urlencode($username) . "&name=" . urlencode($mailboxdata['name']) . "&ui=" . urlencode($_SERVER['HTTP_HOST']) . "&port=" . urlencode($autodiscover_config['caldav']['port']); + $clientconfigstr = "host=" . urlencode($mailcow_hostname) . "&email=" . urlencode($username) . "&name=" . urlencode($mailboxdata['name']) . "&ui=" . strtok(urlencode($_SERVER['HTTP_HOST']), ':') . "&port=" . urlencode($autodiscover_config['caldav']['port']); if ($autodiscover_config['useEASforOutlook'] == 'yes') $clientconfigstr .= "&outlookEAS=1"; if (file_exists('thunderbird-plugins/version.csv')) {