Merge pull request hestiacp#278 from Lupul/bugfix-0502

Fix backup restore was not creating webmail configs
Fix UI (edit/web) old values were shown after changing web template option

Author: Kristan Kenney

bin/v-restore-user

@@ -588,7 +588,7 @@ if [ "$mail" != 'no' ] && [ ! -z "$MAIL_SYSTEM" ]; then
         cp -f $tmpdir/mail/$domain/$backup_system/$domain.conf $USER_DATA/mail/
 
         # Rebuilding mail config
-        rebuild_mail_domain_conf
+        v-rebuild-mail-domains $user
 
         domain_idn=$domain
         format_domain_idn
@@ -617,6 +617,14 @@ if [ "$mail" != 'no' ] && [ ! -z "$MAIL_SYSTEM" ]; then
             -exec chown $exim_user {} \;
 
     done
+
+    # Restarting web server
+    $BIN/v-restart-web
+    check_result $? "Web restart failed"
+    if [ ! -z "$PROXY_SYSTEM" ]; then
+        $BIN/v-restart-proxy
+        check_result $? "Proxy restart failed"
+    fi
 fi
 
 # Restoring databases

web/edit/web/index.php

@@ -715,6 +715,7 @@
     // Set success message
     if (empty($_SESSION['error_msg'])) {
         $_SESSION['ok_msg'] = __('Changes has been saved.');
+        header("Location: /edit/web/?domain=" . $v_domain);
     }
 
 }