From 6c2a951e51b8f1ccdea0104483d8c4f718794399 Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Sun, 13 May 2018 20:14:44 +0200
Subject: [PATCH] install_postfixadmin.sh: Documentroot changed within version
 3.2

---
 install_postfixadmin.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/install_postfixadmin.sh b/install_postfixadmin.sh
index 3f57447..8719a35 100755
--- a/install_postfixadmin.sh
+++ b/install_postfixadmin.sh
@@ -840,9 +840,14 @@ if [[ -h "${WEBSITE_BASEDIR}/htdocs" ]]; then
 else
    echo_skipped
 fi
+
 echononl "\tCreate Symlink for DocumentRoot Directory 'htdocs'.."
 if [[ ! -h "${WEBSITE_BASEDIR}/htdocs" ]]; then
-   ln -s postfixadmin-${PF_ADMIN_VERSION} ${WEBSITE_BASEDIR}/htdocs > $log_file 2>&1
+   if [[ $MAJOR_VERSION -eq 3  &&  $MINOR_VERSION -gt 1 ]] || [[ $MAJOR_VERSION -gt 3 ]] ; then
+      ln -s postfixadmin-${PF_ADMIN_VERSION}/public ${WEBSITE_BASEDIR}/htdocs > $log_file 2>&1
+   else
+      ln -s postfixadmin-${PF_ADMIN_VERSION} ${WEBSITE_BASEDIR}/htdocs > $log_file 2>&1
+   fi
    if [[ $? -eq 0 ]]; then
          echo_ok
    else
@@ -1793,7 +1798,7 @@ fi
 
 echo -e "\n\n\t\033[37m\033[1mConfigure Postfix Admin\033[m\n"
 
-if [[ $MAJOR_VERSION -eq 3 &&$MINOR_VERSION -gt 0 ]]; then
+if [[ $MAJOR_VERSION -eq 3 ]] && [[ $MINOR_VERSION -gt 0 ]]; then
    pfa_conf_file="${WEBSITE_BASEDIR}/postfixadmin-${PF_ADMIN_VERSION}/config.local.php"
    cp -a "${WEBSITE_BASEDIR}/postfixadmin-${PF_ADMIN_VERSION}/config.inc.php"  "$pfa_conf_file"
 else