2010 December, 20 (Guerric) (1)

// Paste PHP Code
Index: Controllers/RegistrationController.cs
===================================================================
--- Controllers/RegistrationController.cs	(revision 24306)
+++ Controllers/RegistrationController.cs	(working copy)
@@ -142,7 +142,7 @@
             string password = (string)this.TempData["password"];
             
             // setup the hostname
-            string canonicalHostname = GetFullHostName(hostname);
+            string canonicalHostname = Helpers.Common.GetFullHostName(hostname, _siteConfig.DefaultDomain);
 
             // Get default deployment server
             DeploymentBE deployment = _deploymentBL.FindOpenDeploymentsForVersion(_deploymentConfig.ActiveApiVersion, null, null).First();
@@ -179,7 +179,7 @@
             var message = "";
             var valid = false;
             var hostname = String.IsNullOrEmpty(id) ? "" : id.Trim().ToLowerInvariant();
-            var hostnameStatus = _siteBL.GetHostnameAvailability(GetFullHostName(hostname));
+            var hostnameStatus = _siteBL.GetHostnameAvailability(Helpers.Common.GetFullHostName(hostname, _siteConfig.DefaultDomain));
             
             // check name
             switch(hostnameStatus) {
@@ -228,7 +228,7 @@
                 ModelState.AddModelError("Hostname", "Host name cannot be empty");
                 errors = true;
             }
-            if(_siteBL.GetHostnameAvailability(GetFullHostName(newSite.HostName)) != HostnameAvailabilityType.AVAILABLE) {
+            if(_siteBL.GetHostnameAvailability(Helpers.Common.GetFullHostName(newSite.HostName, _siteConfig.DefaultDomain)) != HostnameAvailabilityType.AVAILABLE) {
                 ModelState.AddModelError("Hostname", "That name is not available");
                 errors = true;
             }
@@ -245,10 +245,6 @@
         
         private string GetAuthCode(string hostname) {
             return StringUtil.ComputeHashString(hostname + CREATE_SITE_SALT);
-        }
-        
-        private string GetFullHostName(string hostname) {
-            return hostname + "." + _siteConfig.DefaultDomain;
-        }
+        }       
     }
 }
Index: Controllers/SiteController.cs
===================================================================
--- Controllers/SiteController.cs	(revision 24306)
+++ Controllers/SiteController.cs	(working copy)
@@ -250,7 +250,12 @@
 
                     // TODO (kalida): Use globally configurable value (http://youtrack.developer.mindtouch.com/issue/CL-146)
                     license.SeatLimit = 100;
-                    var site = _siteBL.CreateSite(newSite.HostName, newSite.SiteTitle, siteAvailability, owner, newSite.GetAdminPassword(), license, deployment);
+
+                    // setup the hostname
+                    string canonicalHostname = Helpers.Common.GetFullHostName(newSite.HostName, _siteConfig.DefaultDomain);
+
+                    // create the site
+                    var site = _siteBL.CreateSite(canonicalHostname, newSite.SiteTitle, siteAvailability, owner, newSite.GetAdminPassword(), license, deployment);
                     return RedirectToAction("Details", new { hostname = site.CanonicalHostName.HostName });                   
                 }
             }
Index: Helpers/Helpers.cs
===================================================================
--- Helpers/Helpers.cs	(revision 24306)
+++ Helpers/Helpers.cs	(working copy)
@@ -113,5 +113,9 @@
                 HtmlTemplate = GetEmailTemplate(configuration.HtmlTemplateName),
             };
         }
+
+        public static string GetFullHostName(string hostname, string defaultDomain) {
+            return hostname + "." + defaultDomain;
+        }
     }
 }
\ No newline at end of file