Fix v-rebuild-main / v-restore-user mail part

Author: jaapmarcus

bin/v-backup-user

@@ -373,7 +373,7 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL" != '*' ]; then
         fi
 
         # Backup emails
-        cd $HOMEDIR/$user/mail/$domain_idn
+        cd $HOMEDIR/$user/mail/$domain
         accounts=()
         for account in $(ls); do
             exclusion=$(echo "$MAIL" |tr ',' '\n' |grep "$domain:")

bin/v-restore-user

@@ -505,6 +505,7 @@ if [ "$mail" != 'no' ] && [ ! -z "$MAIL_SYSTEM" ]; then
 
         # Unpacking domain container
         tar xf $BACKUP/$backup -C $tmpdir ./mail/$domain
+        echo "$domain"
         if [ "$?" -ne 0 ]; then
             rm -rf $tmpdir
             error="Can't unpack $domain mail container"
@@ -598,15 +599,13 @@ if [ "$mail" != 'no' ] && [ ! -z "$MAIL_SYSTEM" ]; then
 
         # Rebuilding mail config
         $BIN/v-rebuild-mail-domains $user
-        
-        domain_idn=$domain
-        format_domain_idn
 
         # Restoring emails
         if [ $backup_mode = 'zstd' ]; then    
             if [ -e "$tmpdir/mail/$domain/accounts.tar.zst" ]; then
-                chmod u+w "$HOMEDIR/$user/mail/$domain_idn"
-                $BIN/v-extract-fs-archive "$user" "$tmpdir/mail/$domain/accounts.tar.zst" "$HOMEDIR/$user/mail/$domain_idn/"
+                # Current Hestia store email in the $HOMEDIR/$user/mail/$domain
+                chmod u+w "$HOMEDIR/$user/mail/$domain"
+                $BIN/v-extract-fs-archive "$user" "$tmpdir/mail/$domain/accounts.tar.zst" "$HOMEDIR/$user/mail/$domain/"
                 if [ "$?" -ne 0 ]; then
                     rm -rf $tmpdir
                     error="Can't unpack $domain mail account container"
@@ -616,13 +615,13 @@ if [ "$mail" != 'no' ] && [ ! -z "$MAIL_SYSTEM" ]; then
                 fi
 
                 # Chowning as owner needs to be user:mail instead of user:user
-                find $HOMEDIR/$user/mail/$domain_idn -user $user \
+                find $HOMEDIR/$user/mail/$domain -user $user \
                    -exec chown -h $user:mail {} \;
             fi
         else
             if [ -e "$tmpdir/mail/$domain/accounts.tar.gz" ]; then
-                chmod u+w "$HOMEDIR/$user/mail/$domain_idn"
-                $BIN/v-extract-fs-archive "$user" "$tmpdir/mail/$domain/accounts.tar.gz" "$HOMEDIR/$user/mail/$domain_idn/"
+                chmod u+w "$HOMEDIR/$user/mail/$domain"
+                $BIN/v-extract-fs-archive "$user" "$tmpdir/mail/$domain/accounts.tar.gz" "$HOMEDIR/$user/mail/$domain/"
                 if [ "$?" -ne 0 ]; then
                     rm -rf $tmpdir
                     error="Can't unpack $domain mail account container"
@@ -632,12 +631,12 @@ if [ "$mail" != 'no' ] && [ ! -z "$MAIL_SYSTEM" ]; then
                 fi
 
                 # Chowning as owner needs to be user:mail instead of user:user
-                find $HOMEDIR/$user/mail/$domain_idn -user $user \
+                find $HOMEDIR/$user/mail/$domain -user $user \
                    -exec chown -h $user:mail {} \;
             fi
         fi
         # Chowning mail conf files to exim user
-        find $HOMEDIR/$user/conf/mail/$domain_idn -user root \
+        find $HOMEDIR/$user/conf/mail/$domain -user root \
             -exec chown $exim_user {} \;
 
     done

func/rebuild.sh

@@ -562,8 +562,8 @@ rebuild_mail_domain_conf() {
         fi
 
         # Adding mail directory
-        if [ ! -e $HOMEDIR/$user/mail/$domain_idn ]; then
-            mkdir "$HOMEDIR/$user/mail/$domain_idn"
+        if [ ! -e $HOMEDIR/$user/mail/$domain ]; then
+            mkdir "$HOMEDIR/$user/mail/$domain"
         fi
 
         # Adding catchall email
@@ -614,12 +614,12 @@ rebuild_mail_domain_conf() {
         chmod 771 $HOMEDIR/$user/conf/mail/$domain
         chmod 660 $HOMEDIR/$user/conf/mail/$domain/*
         chmod 771 /etc/$MAIL_SYSTEM/domains/$domain_idn
-        chmod 770 $HOMEDIR/$user/mail/$domain_idn
+        chmod 770 $HOMEDIR/$user/mail/$domain
         chown -R $MAIL_USER:mail $HOMEDIR/$user/conf/mail/$domain
         if [ "$IMAP_SYSTEM" = "dovecot" ]; then
             chown -R dovecot:mail $HOMEDIR/$user/conf/mail/$domain/passwd
         fi
-        chown $user:mail $HOMEDIR/$user/mail/$domain_idn
+        chown $user:mail $HOMEDIR/$user/mail/$domain
     fi
 
     # Add missing SSL configuration flags to existing domains