From bbd5befedd1ee96c88a62af7c44f68bff28112b8 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Wed, 1 Jul 2015 01:36:45 +0300
Subject: [PATCH] system check for wildcard search

---
 func/domain.sh | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/func/domain.sh b/func/domain.sh
index bc5219d78..7c035e025 100644
--- a/func/domain.sh
+++ b/func/domain.sh
@@ -85,11 +85,10 @@ is_domain_new() {
     type="$1"
     dom=${2-$domain}
 
-    web=$(grep -F -H "DOMAIN='$dom'" $VESTA/data/users/*/web.conf)
-    dns=$(grep -F -H "DOMAIN='$dom'" $VESTA/data/users/*/dns.conf)
-    mail=$(grep -F -H "DOMAIN='$dom'" $VESTA/data/users/*/mail.conf)
-
     # Check web domain
+    if [ ! -z "$WEB_SYSTEM" ]; then
+        web=$(grep -F -H "DOMAIN='$dom'" $VESTA/data/users/*/web.conf)
+    fi
     if [ ! -z "$web" ] && [ "$type" == 'web' ]; then
         echo "Error: domain $dom exist"
         log_event "$E_EXISTS" "$EVENT"
@@ -105,6 +104,9 @@ is_domain_new() {
     fi
 
     # Check dns domain
+    if [ ! -z "$DNS_SYSTEM" ]; then
+        dns=$(grep -F -H "DOMAIN='$dom'" $VESTA/data/users/*/dns.conf)
+    fi
     if [ ! -z "$dns" ] && [ "$type" == 'dns' ]; then
         echo "Error: domain $dom exist"
         log_event "$E_EXISTS" "$EVENT"
@@ -120,6 +122,9 @@ is_domain_new() {
     fi
 
     # Check mail domain
+    if [ ! -z "$MAIL_SYSTEM" ]; then
+        mail=$(grep -F -H "DOMAIN='$dom'" $VESTA/data/users/*/mail.conf)
+    fi
     if [ ! -z "$mail" ] && [ "$type" == 'mail' ]; then
         echo "Error: domain $dom exist"
         log_event "$E_EXISTS" "$EVENT"
@@ -135,7 +140,9 @@ is_domain_new() {
     fi
 
     # Check web aliases
-    web_alias=$(grep -w $dom $VESTA/data/users/*/web.conf)
+    if [ ! -z "$WEB_SYSTEM" ]; then
+        web_alias=$(grep -w $dom $VESTA/data/users/*/web.conf)
+    fi
     if [ ! -z "$web_alias" ]; then
         c1=$(grep -H "'$dom'" $VESTA/data/users/*/web.conf | cut -f 7 -d /)
         c2=$(grep -H "'$dom," $VESTA/data/users/*/web.conf | cut -f 7 -d /)