From 7db587764410771cce9e26d82de23219fc10409b Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Sat, 7 Oct 2017 22:08:08 +0200
Subject: [PATCH] [Web] Fixes #657

---
 data/web/edit.php           |  1 +
 data/web/modals/mailbox.php |  7 ++++
 mailcow-setup-relayhost.sh  | 76 -------------------------------------
 3 files changed, 8 insertions(+), 76 deletions(-)
 delete mode 100755 mailcow-setup-relayhost.sh

diff --git a/data/web/edit.php b/data/web/edit.php
index fbbda18d..fd6682ff 100644
--- a/data/web/edit.php
+++ b/data/web/edit.php
@@ -614,6 +614,7 @@ if (isset($_SESSION['mailcow_cc_role'])) {
           <form class="form-horizontal" data-id="editsyncjob" role="form" method="post">
             <input type="hidden" value="0" name="delete2duplicates">
             <input type="hidden" value="0" name="delete1">
+            <input type="hidden" value="0" name="delete2">
             <input type="hidden" value="0" name="active">
             <div class="form-group">
               <label class="control-label col-sm-2" for="host1"><?=$lang['edit']['hostname'];?></label>
diff --git a/data/web/modals/mailbox.php b/data/web/modals/mailbox.php
index b726ca6e..c81ffcb8 100644
--- a/data/web/modals/mailbox.php
+++ b/data/web/modals/mailbox.php
@@ -406,6 +406,13 @@ if (!isset($_SESSION['mailcow_cc_role'])) {
 							</div>
 						</div>
 					</div>
+          <div class="form-group">
+						<div class="col-sm-offset-2 col-sm-10">
+							<div class="checkbox">
+							<label><input type="checkbox" value="1" name="delete2"> <?=$lang['add']['delete2'];?></label>
+							</div>
+						</div>
+					</div>
 					<div class="form-group">
 						<div class="col-sm-offset-2 col-sm-10">
 							<div class="checkbox">
diff --git a/mailcow-setup-relayhost.sh b/mailcow-setup-relayhost.sh
deleted file mode 100755
index 283590df..00000000
--- a/mailcow-setup-relayhost.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#/bin/bash
-if [[ ! -f mailcow.conf ]]; then
-        echo "Cannot find mailcow.conf, make sure this script is run from within the mailcow folder."
-        exit 1
-fi
-
-echo -n "Checking Postfix service... "
-docker-compose ps -q postfix-mailcow > /dev/null 2>&1
-
-if [[ $? -ne 0 ]]; then
-        echo "failed"
-        echo "Postfix (postifx-mailcow) is not up and running, exiting..."
-        exit 1
-fi
-
-echo "OK"
-
-if [[ -z ${1} ]]; then
-    echo "Usage:"
-	echo
-	echo "Setup a relayhost:"
-	echo "${0} relayhost port (username) (password)"
-    echo "Username and password are optional parameters."
-	echo
-	echo "Reset to defaults:"
-	echo "${0} reset"
-    exit 1
-fi
-
-if [[ ${1} == "reset" ]]; then
-	# Reset modified values to their defaults
-	sed -i "s/^relayhost\ \=.*/relayhost\ \=/" data/conf/postfix/main.cf
-	sed -i "s/^smtp\_sasl\_password\_maps.*/smtp\_sasl\_password\_maps\ \=/" data/conf/postfix/main.cf
-	sed -i "s/^smtp\_sasl\_security\_options.*/smtp\_sasl\_security\_options\ \=\ noplaintext\,\ noanonymous/" data/conf/postfix/main.cf
-	sed -i "s/^smtp\_sasl\_auth\_enable.*/smtp\_sasl\_auth\_enable\ \=\ no/" data/conf/postfix/main.cf
-	# Also delete the plaintext password file
-	rm -f data/conf/postfix/smarthost_passwd*
-	docker-compose exec postfix-mailcow postfix reload
-	# Exit with dc exit code
-	exit $?
-else
-	# Try a simple connection to host:port but don't recieve any data
-	# Abort after 3 seconds
-	if ! nc -z -v -w3 ${1} ${2} 2>/dev/null; then
-		echo "Connection to relayhost ${1} failed, aborting..."
-		exit 1
-	fi
-	# Use exact hostname as relayhost, don't lookup the MX record of relayhost
-	sed -i "s/relayhost\ \=.*/relayhost\ \=\ \[${1}\]\:${2}/" data/conf/postfix/main.cf
-	if grep -q "smtp_sasl_password_maps" data/conf/postfix/main.cf
-	then
-		sed -i "s/^smtp\_sasl\_password\_maps.*/smtp\_sasl\_password\_maps\ \=\ hash\:\/opt\/postfix\/conf\/smarthost\_passwd/" data/conf/postfix/main.cf
-	else
-		echo "smtp_sasl_password_maps = hash:/opt/postfix/conf/smarthost_passwd" >>  data/conf/postfix/main.cf
-	fi
-	if grep -q "smtp_sasl_auth_enable" data/conf/postfix/main.cf
-	then
-		sed -i "s/^smtp\_sasl\_auth\_enable.*/smtp\_sasl\_auth\_enable\ \=\ yes/" data/conf/postfix/main.cf
-	else
-		echo "smtp_sasl_auth_enable = yes" >>  data/conf/postfix/main.cf
-	fi
-	if grep -q "smtp_sasl_security_options" data/conf/postfix/main.cf
-	then
-		sed -i "s/^smtp\_sasl\_security\_options.*/smtp\_sasl\_security\_options\ \=/" data/conf/postfix/main.cf
-	else
-		echo "smtp_sasl_security_options =" >>  data/conf/postfix/main.cf
-	fi
-	if [[ ! -z ${3} ]]; then
-		echo ${1} ${3}:${4} > data/conf/postfix/smarthost_passwd
-		docker-compose exec postfix-mailcow postmap /opt/postfix/conf/smarthost_passwd
-	fi
-	docker-compose exec postfix-mailcow chown root:postfix /opt/postfix/conf/smarthost_passwd /opt/postfix/conf/smarthost_passwd.db
-	docker-compose exec postfix-mailcow chmod 660 /opt/postfix/conf/smarthost_passwd /opt/postfix/conf/smarthost_passwd.db
-	docker-compose exec postfix-mailcow postfix reload
-	exit $?
-fi