bug fix: check for website existance without www.

Author: usmannasir

plogical/virtualHostUtilities.py

@@ -105,11 +105,21 @@ def createVirtualHost(virtualHostName, administratorEmail, phpVersion, virtualHo
                 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 @@ def createDomain(masterDomain, virtualHostName, phpVersion, path, ssl, dkimCheck
                                                           '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)