Просмотр исходного кода

Merge pull request #2848 from jaapmarcus/fix/2771-improve-output

2771 [Bug] Correct message to show if subdomains are disabled across multiple Users
Raphael 3 лет назад
Родитель
Сommit
015a55a1eb
1 измененных файлов с 4 добавлено и 4 удалено
  1. 4 4
      func/domain.sh

+ 4 - 4
func/domain.sh

@@ -983,16 +983,16 @@ is_base_domain_owner(){
                     parse_object_kv_list "$web"
                     if [ -z "$ALLOW_USERS" ] ||  [ "$ALLOW_USERS" != "yes" ]; then
                         # Don't care if $basedomain all ready exists only if the owner is of the base domain is the current user
-                        is_domain_new "" $basedomain;
+                        check=$(is_domain_new "" $basedomain)
                         if [ $? -ne 0 ]; then
-                            echo "Error: $basedomain belongs to a different user";
+                            echo "Error: Unable to add $object. $basedomain belongs to a different user";
                             exit 4;
                         fi
                     fi
                 else
-                    is_domain_new "" "$basedomain"
+                    check=$(is_domain_new "" "$basedomain")
                     if [ $? -ne 0 ]; then
-                        echo "Error: $basedomain belongs to a different user";
+                        echo "Error: Unable to add $object. $basedomain belongs to a different user";
                         exit 4;
                     fi
                 fi