Merge branch 'main' into feature/logging

bin/v-restore-user

@@ -595,10 +595,7 @@ if [ "$mail" != 'no' ] && [ ! -z "$MAIL_SYSTEM" ]; then
 
         # Restoring email accounts
         cp -f $tmpdir/mail/$domain/$backup_system/$domain.conf $USER_DATA/mail/
-
-        # Rebuilding mail config
-        $BIN/v-rebuild-mail-domains $user
-        
+       
         domain_idn=$domain
         format_domain_idn
 

func/rebuild.sh

@@ -123,7 +123,7 @@ rebuild_user_conf() {
         chmod 751 $HOMEDIR/$user/web
         chmod 771 $HOMEDIR/$user/tmp
         chown --no-dereference $user:$user $HOMEDIR/$user/web
-        if [ -z "$create_user" ]; then
+        if [ "$create_user" = "yes" ]; then
             $BIN/v-rebuild-web-domains $user $restart
         fi
     fi
@@ -137,7 +137,7 @@ rebuild_user_conf() {
 
         mkdir -p $HOMEDIR/$user/conf/dns
         chmod 751 $HOMEDIR/$user/conf/dns
-        if [ -z "$create_user" ]; then
+        if [ "$create_user" = "yes" ]; then
             $BIN/v-rebuild-dns-domains $user $restart
         fi
     fi
@@ -157,7 +157,7 @@ rebuild_user_conf() {
         mkdir -p $HOMEDIR/$user/mail
         chmod 751 $HOMEDIR/$user/mail
         chmod 751 $HOMEDIR/$user/conf/mail
-        if [ -z "$create_user" ]; then
+        if [ "$create_user" = "yes" ]; then
             $BIN/v-rebuild-mail-domains $user
         fi
     fi
@@ -168,7 +168,7 @@ rebuild_user_conf() {
         chmod 660 $USER_DATA/db.conf
         echo "$BIN/v-update-databases-disk $user" >> $HESTIA/data/queue/disk.pipe
 
-        if [ -z "$create_user" ]; then
+        if [ "$create_user" = "yes" ]; then
             $BIN/v-rebuild-databases $user
         fi
     fi
@@ -177,7 +177,7 @@ rebuild_user_conf() {
         touch $USER_DATA/cron.conf
         chmod 660 $USER_DATA/cron.conf
 
-        if [ -z "$create_user" ]; then
+        if [ "$create_user" = "yes" ]; then
             $BIN/v-rebuild-cron-jobs $user $restart
         fi
     fi

web/bulk/user/index.php

@@ -27,6 +27,8 @@ if ($_SESSION['user'] == 'admin') {
             break;
         case 'rebuild': $cmd='v-rebuild-all'; $restart = 'no';
             break;
+        case 'rebuild user': $cmd='v-rebuild-user'; $restart = 'no';
+            break;
         case 'rebuild web': $cmd='v-rebuild-web-domains'; $restart = 'no';
             break;
         case 'rebuild dns': $cmd='v-rebuild-dns-domains'; $restart = 'no';

web/templates/admin/list_user.html

@@ -36,6 +36,7 @@
                     <select class="" name="action">
                       <option value=""><?=_('apply to selected')?></option>
                       <option value="rebuild"><?=_('rebuild')?></option>
+                      <option value="rebuild user"><?=_('rebuild user')?></option>
                       <option value="rebuild web"><?=_('rebuild web')?></option>
                       <option value="rebuild dns"><?=_('rebuild dns')?></option>
                       <option value="rebuild mail"><?=_('rebuild mail')?></option>