diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/user.controller.js b/src/Umbraco.Web.UI.Client/src/installer/steps/user.controller.js index 6c689a3166..297db6ac4a 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/steps/user.controller.js +++ b/src/Umbraco.Web.UI.Client/src/installer/steps/user.controller.js @@ -1,6 +1,8 @@ angular.module("umbraco.install").controller("Umbraco.Install.UserController", function($scope, installerService) { $scope.passwordPattern = /.*/; + $scope.installer.current.model.subscribeToNewsLetter = true; + if ($scope.installer.current.model.minNonAlphaNumericLength > 0) { var exp = ""; for (var i = 0; i < $scope.installer.current.model.minNonAlphaNumericLength; i++) { diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/user.html b/src/Umbraco.Web.UI.Client/src/installer/steps/user.html index fd1a245b65..a5f0f81cd3 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/steps/user.html +++ b/src/Umbraco.Web.UI.Client/src/installer/steps/user.html @@ -33,12 +33,22 @@ required ng-model="installer.current.model.password" /> At least {{installer.current.model.minCharLength}} characters long + At least {{installer.current.model.minNonAlphaNumericLength}} symbol{{installer.current.model.minNonAlphaNumericLength > 1 ? 's' : ''}} + +
+
+ +
+
+
diff --git a/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs b/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs index 64bef533a8..baa94c304e 100644 --- a/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs +++ b/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Collections.Specialized; using System.Configuration; using System.Web.Security; using Umbraco.Core; @@ -69,7 +70,19 @@ namespace Umbraco.Web.Install.InstallSteps admin.Username = user.Email.Trim(); _applicationContext.Services.UserService.Save(admin); - + + + if (user.SubscribeToNewsLetter) + { + try + { + var client = new System.Net.WebClient(); + var values = new NameValueCollection { { "name", admin.Name }, { "email", admin.Email} }; + client.UploadValues("http://umbraco.org/base/Ecom/SubmitEmail/installer.aspx", values); + } + catch { /* fail in silence */ } + } + return null; } diff --git a/src/Umbraco.Web/Install/Models/UserModel.cs b/src/Umbraco.Web/Install/Models/UserModel.cs index 837a573ab3..82baf9ba56 100644 --- a/src/Umbraco.Web/Install/Models/UserModel.cs +++ b/src/Umbraco.Web/Install/Models/UserModel.cs @@ -13,5 +13,8 @@ namespace Umbraco.Web.Install.Models [DataMember(Name = "password")] public string Password { get; set; } + + [DataMember(Name = "subscribeToNewsLetter")] + public bool SubscribeToNewsLetter { get; set; } } } \ No newline at end of file