From 74c7922ccfc7cc4293f03679db0f1e33d7c23d08 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Mon, 11 Nov 2019 20:04:17 +0500 Subject: [PATCH] bug fix: check for website existance without www. --- plogical/virtualHostUtilities.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/plogical/virtualHostUtilities.py b/plogical/virtualHostUtilities.py index a016ab138..bbf6da9fa 100755 --- a/plogical/virtualHostUtilities.py +++ b/plogical/virtualHostUtilities.py @@ -105,11 +105,21 @@ class virtualHostUtilities: logging.CyberCPLogFileWriter.statusWriter(tempStatusPath, 'This website already exists. [404]') return 0, "This website already exists." + + if Websites.objects.filter(domain=virtualHostName.lstrip('www.')).count() > 0: + logging.CyberCPLogFileWriter.statusWriter(tempStatusPath, 'This website already exists. [404]') + return 0, "This website already exists." + if ChildDomains.objects.filter(domain=virtualHostName).count() > 0: logging.CyberCPLogFileWriter.statusWriter(tempStatusPath, 'This website already exists as child domain. [404]') return 0, "This website already exists as child domain." + if ChildDomains.objects.filter(domain=virtualHostName.lstrip('www.')).count() > 0: + logging.CyberCPLogFileWriter.statusWriter(tempStatusPath, + 'This website already exists as child domain. [404]') + return 0, "This website already exists as child domain." + ####### Limitations Check End logging.CyberCPLogFileWriter.statusWriter(tempStatusPath, 'Creating DNS records..,10') @@ -1040,11 +1050,22 @@ class virtualHostUtilities: 'This Domain already exists as a website. [404]') return 0, "This Domain already exists as a website." + if Websites.objects.filter(domain=virtualHostName.lstrip('www.')).count() > 0: + logging.CyberCPLogFileWriter.statusWriter(tempStatusPath, + 'This Domain already exists as a website. [404]') + return 0, "This Domain already exists as a website." + if ChildDomains.objects.filter(domain=virtualHostName).count() > 0: logging.CyberCPLogFileWriter.statusWriter(tempStatusPath, 'This domain already exists as child domain. [404]') return 0, "This domain already exists as child domain." + + if ChildDomains.objects.filter(domain=virtualHostName.lstrip('www.')).count() > 0: + logging.CyberCPLogFileWriter.statusWriter(tempStatusPath, + 'This domain already exists as child domain. [404]') + return 0, "This domain already exists as child domain." + ####### Limitations check master = Websites.objects.get(domain=masterDomain)