Rename v-add/delete-sys-webmail to v-add/delete-mail-domain-webmail

Author: Kristan Kenney

bin/v-add-mail-domain

@@ -171,7 +171,7 @@ fi
 # Add webmail configuration to mail domain
 if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
     if [ ! -z "$IMAP_SYSTEM" ]; then
-        $BIN/v-add-sys-webmail $user $domain '' 'no'
+        $BIN/v-add-mail-domain-webmail $user $domain '' 'no'
     fi
 fi
 

bin/v-add-sys-webmail bin/v-add-mail-domain-webmailbin/v-add-sys-webmail renamed to bin/v-add-mail-domain-webmail

@@ -36,7 +36,7 @@ check_hestia_demo_mode
 # Delete old webmail configuration
 for user in $($HESTIA/bin/v-list-sys-users plain); do
     for domain in $($BIN/v-list-mail-domains $user plain |cut -f 1); do
-        $BIN/v-delete-sys-webmail $user $domain
+        $BIN/v-delete-mail-domain-webmail $user $domain
     done
 done
 
@@ -46,7 +46,7 @@ $BIN/v-change-sys-config-value 'WEBMAIL_ALIAS' $NEW_ALIAS
 # Add new webmail configuration
 for user in $($HESTIA/bin/v-list-sys-users plain); do
     for domain in $($BIN/v-list-mail-domains $user plain |cut -f 1); do
-        $BIN/v-add-sys-webmail $user $domain
+        $BIN/v-add-mail-domain-webmail $user $domain
     done
 done
 

bin/v-change-sys-webmail

@@ -75,7 +75,7 @@ fi
 
 # Delete webmail configuration if it exists
 if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
-    $BIN/v-delete-sys-webmail $user $domain 'yes'
+    $BIN/v-delete-mail-domain-webmail $user $domain 'yes'
 fi
 
 #----------------------------------------------------------#

bin/v-delete-mail-domain

@@ -3,7 +3,7 @@
 # options: USER DOMAIN [RESTART] [QUIET]
 # labels: hestia
 #
-# example: v-delete-sys-webmail user demo.com
+# example: v-delete-mail-domain-webmail user demo.com
 #
 # this function removes support for webmail from
 # a specified mail domain.

bin/v-delete-sys-webmail bin/v-delete-mail-domain-webmailbin/v-delete-sys-webmail renamed to bin/v-delete-mail-domain-webmail

@@ -65,8 +65,8 @@ rebuild_mail_domain_conf
 if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
     if [ ! -z "$IMAP_SYSTEM" ]; then
         WEBMAIL=$(get_object_value 'web' 'DOMAIN' "$domain" "$WEBMAIL")
-        $BIN/v-delete-sys-webmail $user $domain '' $restart 'yes'
-        $BIN/v-add-sys-webmail $user $domain $WEBMAIL '' $restart 'yes'
+        $BIN/v-delete-mail-domain-webmail $user $domain '' $restart 'yes'
+        $BIN/v-add-mail-domain-webmail $user $domain $WEBMAIL '' $restart 'yes'
     fi
 fi
 

bin/v-rebuild-mail-domain

@@ -69,10 +69,10 @@ for domain in $(search_objects 'mail' 'SUSPENDED' "*" 'DOMAIN'); do
     if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
         if [ ! -z "$IMAP_SYSTEM" ]; then
             WEBMAIL=$(get_object_value 'web' 'DOMAIN' "$domain" "$WEBMAIL")
-            $BIN/v-delete-sys-webmail $user $domain $restart 'yes'
-            $BIN/v-add-sys-webmail $user $domain $WEBMAIL $restart 'yes'
+            $BIN/v-delete-mail-domain-webmail $user $domain $restart 'yes'
+            $BIN/v-add-mail-domain-webmail $user $domain $WEBMAIL $restart 'yes'
             if [ $? -ne 0 ]; then
-                $BIN/v-add-sys-webmail $user $domain '' $restart 'yes'
+                $BIN/v-add-mail-domain-webmail $user $domain '' $restart 'yes'
             fi
         fi
     fi

bin/v-rebuild-mail-domains

@@ -57,7 +57,7 @@ if [[ "$MAIL_SYSTEM" =~ exim ]]; then
 fi
 
 # Removing webmail configuration
-$BIN/v-delete-sys-webmail $user $domain 'yes'
+$BIN/v-delete-mail-domain-webmail $user $domain 'yes'
 
 #----------------------------------------------------------#
 #                       Hestia                             #

bin/v-suspend-mail-domain

@@ -69,7 +69,7 @@ if [ ! -z "$IMAP_SYSTEM" ]; then
         for client in ${WEBMAIL_SYSTEM//,/ };do
             webmail="$client"
         done
-        $BIN/v-add-sys-webmail $user $domain $webmail 'yes'
+        $BIN/v-add-mail-domain-webmail $user $domain $webmail 'yes'
     fi   
 fi
 # Logging

bin/v-unsuspend-mail-domain

@@ -88,7 +88,7 @@
         if (empty($_SESSION['error_msg'])) {
         if (!empty($_POST['v_webmail'])) {
             $v_webmail = escapeshellarg($_POST['v_webmail']);
-            exec (HESTIA_CMD."v-add-sys-webmail ".$user." ".$v_domain." ".$v_webmail." yes", $output, $return_var);
+            exec (HESTIA_CMD."v-add-mail-domain-webmail ".$user." ".$v_domain." ".$v_webmail." yes", $output, $return_var);
             check_return_code($return_var,$output);
             unset($output);
         }
@@ -97,7 +97,7 @@
 
     if (empty($_POST['v_webmail'])) {
         if (empty($_SESSION['error_msg'])) {
-        exec (HESTIA_CMD."v-delete-sys-webmail ".$user." ".$v_domain." yes", $output, $return_var);
+        exec (HESTIA_CMD."v-delete-mail-domain-webmail ".$user." ".$v_domain." yes", $output, $return_var);
         check_return_code($return_var,$output);
         unset($output);
         }