2010 December, 15 (Guerric)

// Paste PHP Code

Index: RegistrationController.cs

===================================================================

--- RegistrationController.cs(revision 24238)

+++ RegistrationController.cs(working copy)

@@ -45,6 +45,9 @@

 namespace MindTouch.Portal.Site.Controllers {

     public class RegistrationController : Controller {

 

+        //--- Constants ---

+        protected const string DEFAULT_ADMIN_USERNAME = "Admin";

+

         //--- Class Fields ---

         protected static readonly ILog _log = LogUtils.CreateLog();

 

@@ -126,23 +129,23 @@

                 return View(newSite);

             }

 

-            // TODO (kalida): Global setting for default admin name (http://youtrack.developer.mindtouch.com/issue/CL-146)

+            // setup the hostname

+            string canonicalHostname = newSite.HostName + _siteConfig.DefaultDomain;

+

+            // create the new user

             var password = newSite.AdminPassword;

-            var username = "admin";

-            UserBE user;

-            user = _userBL.Create(newSite.AdminFirstName, newSite.AdminLastName, newSite.AdminEmail, password, UserType.Customer);

+            var user = _userBL.Create(newSite.AdminFirstName, newSite.AdminLastName, newSite.AdminEmail, password, UserType.Customer);

 

             // Get default deployment server

             DeploymentBE deployment = _deploymentBL.FindOpenDeploymentsForVersion(_deploymentConfig.ActiveApiVersion, null, null).First();

             var license = _licenseBL.CreateLicense("tcs-trial");

-            license.Hosts.Add(newSite.HostName);

-            SiteBE siteBE;

-            siteBE = _siteBL.CreateSite(newSite.HostName, newSite.SiteTitle, SiteAvailabilityType.Public, user, password, license, deployment);

+            license.Hosts.Add(canonicalHostname);

+            var siteBE = _siteBL.CreateSite(canonicalHostname, newSite.SiteTitle, SiteAvailabilityType.Public, user, password, license, deployment);

 

             // send registration email

             var email = new WelcomeEmail {

                 FirstName = user.FirstName,

-                UserName = username,

+                UserName = DEFAULT_ADMIN_USERNAME,

                 ExpirationDate = license.Expires.Value.ToString("M"),

                 MindTouchUrl = siteBE.CanonicalHostName.HostName

             };