diff --git a/src/Umbraco.Tests/Install/InstallHelperTests.cs b/src/Umbraco.Tests/Install/InstallHelperTests.cs deleted file mode 100644 index cd1b6471d3..0000000000 --- a/src/Umbraco.Tests/Install/InstallHelperTests.cs +++ /dev/null @@ -1,99 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Web; -using Moq; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; -using NUnit.Framework; -using Umbraco.Core; -using Umbraco.Core.Logging; -using Umbraco.Core.Persistence; -using Umbraco.Web; -using Umbraco.Web.Install; -using Umbraco.Web.Install.Controllers; -using Umbraco.Web.Install.InstallSteps; -using Umbraco.Web.Install.Models; - -namespace Umbraco.Tests.Install -{ - [TestFixture] - public class InstallHelperTests - { - - [Test] - public void Get_Steps() - { - var appCtx = new ApplicationContext(CacheHelper.CreateDisabledCacheHelper()); - ApplicationContext.EnsureContext(appCtx, true); - - var umbCtx = UmbracoContext.EnsureContext( - new Mock().Object, - appCtx, - true); - - var helper = new InstallHelper(umbCtx); - - var steps = helper.GetAllSteps().ToArray(); - - var expected = new[] - { - typeof (FilePermissionsStep), typeof (NewInstallStep), typeof(MajorVersion7UpgradeReport), typeof (DatabaseConfigureStep), typeof (DatabaseInstallStep), - typeof (DatabaseUpgradeStep), typeof (StarterKitDownloadStep), typeof (StarterKitInstallStep), typeof (StarterKitCleanupStep), - typeof (SetUmbracoVersionStep) - }; - - Assert.AreEqual(expected.Length, steps.Length); - - for (int i = 0; i < expected.Length; i++) - { - var type = expected[i]; - Assert.AreEqual(type, steps[i].GetType()); - } - } - - [Test] - public void Get_Steps_New_Install() - { - var appCtx = new ApplicationContext(CacheHelper.CreateDisabledCacheHelper()); - ApplicationContext.EnsureContext(appCtx, true); - - var umbCtx = UmbracoContext.EnsureContext( - new Mock().Object, - appCtx, - true); - - var helper = new InstallHelper(umbCtx); - - var steps = helper.GetAllSteps().ToArray(); - - //for new installs 2, don't require execution - Assert.AreEqual(2, steps.Count(x => x.RequiresExecution() == false)); - - } - - [Test] - public void Get_Steps_Upgrade() - { - var appCtx = new ApplicationContext(CacheHelper.CreateDisabledCacheHelper()); - ApplicationContext.EnsureContext(appCtx, true); - appCtx.DatabaseContext = new DatabaseContext(Mock.Of()); - - var umbCtx = UmbracoContext.EnsureContext( - new Mock().Object, - appCtx, - true); - - var helper = new InstallHelper(umbCtx); - - var steps = helper.GetAllSteps().ToArray(); - - //for upgrades 4, don't require execution - Assert.AreEqual(4, steps.Count(x => x.RequiresExecution() == false)); - - } - - } -} diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index a13b05163f..b638b4060e 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -169,7 +169,6 @@ - @@ -652,7 +651,9 @@ - + + + xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.0\amd64\*.* "$(TargetDir)amd64\" /Y /F /E /D diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/Skinning/LoadStarterKits.ascx.cs b/src/Umbraco.Web.UI/Areas/UmbracoInstall/Legacy/LoadStarterKits.ascx.cs similarity index 89% rename from src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/Skinning/LoadStarterKits.ascx.cs rename to src/Umbraco.Web.UI/Areas/UmbracoInstall/Legacy/LoadStarterKits.ascx.cs index d52bc19604..f150c942ae 100644 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/Skinning/LoadStarterKits.ascx.cs +++ b/src/Umbraco.Web.UI/Areas/UmbracoInstall/Legacy/LoadStarterKits.ascx.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Web; using System.Web.Mvc; using System.Web.Routing; +using System.Web.UI; using Umbraco.Core.Logging; using Umbraco.Web.Install; @@ -11,7 +12,7 @@ namespace Umbraco.Web.UI.Install.Steps.Skinning { public delegate void StarterKitInstalledEventHandler(); - public partial class LoadStarterKits : StepUserControl + public partial class LoadStarterKits : UserControl { /// /// Returns the string for the package installer web service base url @@ -54,11 +55,11 @@ namespace Umbraco.Web.UI.Install.Steps.Skinning } - protected void NextStep(object sender, EventArgs e) - { - var p = (Default)this.Page; - //InstallHelper.RedirectToNextStep(Page, Request.GetItemAsString("installStep")); - } + //protected void NextStep(object sender, EventArgs e) + //{ + // var p = (Default)this.Page; + // //InstallHelper.RedirectToNextStep(Page, Request.GetItemAsString("installStep")); + //} protected override void OnInit(EventArgs e) { diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/Skinning/LoadStarterKits.ascx.designer.cs b/src/Umbraco.Web.UI/Areas/UmbracoInstall/Legacy/LoadStarterKits.ascx.designer.cs similarity index 100% rename from src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/Skinning/LoadStarterKits.ascx.designer.cs rename to src/Umbraco.Web.UI/Areas/UmbracoInstall/Legacy/LoadStarterKits.ascx.designer.cs diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/Legacy/StepUserControl.cs b/src/Umbraco.Web.UI/Areas/UmbracoInstall/Legacy/StepUserControl.cs new file mode 100644 index 0000000000..9f690c3238 --- /dev/null +++ b/src/Umbraco.Web.UI/Areas/UmbracoInstall/Legacy/StepUserControl.cs @@ -0,0 +1,20 @@ +//using System; +//using System.Web.UI; +//using Umbraco.Web.Install; + +//namespace Umbraco.Web.UI.Install.Steps +//{ +// public abstract class StepUserControl : UserControl +// { +// protected string GetCurrentStep() +// { +// var defaultPage = (Default) Page; +// return defaultPage.step.Value; +// } + +// //protected virtual void GotoNextStep(object sender, EventArgs e) +// //{ +// // InstallHelper.RedirectToNextStep(Page, GetCurrentStep()); +// //} +// } +//} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/Skinning/loadStarterKits.ascx b/src/Umbraco.Web.UI/Areas/UmbracoInstall/Legacy/loadStarterKits.ascx similarity index 100% rename from src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/Skinning/loadStarterKits.ascx rename to src/Umbraco.Web.UI/Areas/UmbracoInstall/Legacy/loadStarterKits.ascx diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/default_old.aspx b/src/Umbraco.Web.UI/Areas/UmbracoInstall/default_old.aspx deleted file mode 100644 index d14b45bf10..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/default_old.aspx +++ /dev/null @@ -1,161 +0,0 @@ -<%@ Page Language="c#" CodeBehind="default_old.aspx.cs" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Install.Default" EnableViewState="False" %> - -<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %> - -<%@ Register Src="~/install/Title.ascx" TagPrefix="umb1" TagName="PageTitle" %> - - - - - - - - " /> - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - -
- -
- - - - - - - -
- - - - - - - -
- -
-
-
-
- - - - - - - - - - -
- - - - diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/default_old.aspx.cs b/src/Umbraco.Web.UI/Areas/UmbracoInstall/default_old.aspx.cs deleted file mode 100644 index 8819586f35..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/default_old.aspx.cs +++ /dev/null @@ -1,86 +0,0 @@ -using System; -using System.Web; -using System.Web.UI.WebControls; -using Umbraco.Core.IO; -using Umbraco.Web.Install; -using Umbraco.Web.Security; -using Umbraco.Web.UI.Pages; -using umbraco; - -namespace Umbraco.Web.UI.Install -{ - public partial class Default : BasePage - { - private string _installStep = ""; - - protected string CurrentStepClass = ""; - - protected void Page_Load(object sender, System.EventArgs e) - { - //rp_steps.DataSource = InstallHelper.InstallerSteps.Values; - //rp_steps.DataBind(); - } - - private void LoadContent(InstallerStep currentStep) - { - PlaceHolderStep.Controls.Clear(); - PlaceHolderStep.Controls.Add(LoadControl(IOHelper.ResolveUrl(currentStep.UserControl))); - step.Value = currentStep.Alias; - CurrentStepClass = currentStep.Alias; - } - - int _stepCounter = 0; - protected void BindStep(object sender, RepeaterItemEventArgs e) - { - - if (e.Item.ItemType == ListItemType.AlternatingItem || e.Item.ItemType == ListItemType.Item) - { - var i = (InstallerStep)e.Item.DataItem; - - if (!i.HideFromNavigation) - { - var _class = (Literal)e.Item.FindControl("lt_class"); - var name = (Literal)e.Item.FindControl("lt_name"); - - if (i.Alias == CurrentStepClass) - _class.Text = "active"; - - _stepCounter++; - name.Text = (_stepCounter).ToString() + " - " + i.Name; - } - else - e.Item.Visible = false; - } - } - - override protected void OnInit(EventArgs e) - { - base.OnInit(e); - - _installStep = Request.GetItemAsString("installStep"); - - //if this is not an upgrade we will log in with the default user. - // It's not considered an upgrade if the ConfigurationStatus is missing or empty. - if (string.IsNullOrWhiteSpace(GlobalSettings.ConfigurationStatus) == false) - { - var result = Security.ValidateCurrentUser(false); - - switch (result) - { - case ValidateRequestAttempt.FailedNoPrivileges: - case ValidateRequestAttempt.FailedTimedOut: - case ValidateRequestAttempt.FailedNoContextId: - Response.Redirect(SystemDirectories.Umbraco + "/AuthorizeUpgrade?redir=" + Server.UrlEncode(Request.RawUrl)); - break; - } - } - - //var s = string.IsNullOrEmpty(_installStep) - // ? InstallHelper.InstallerSteps["welcome"] - // : InstallHelper.InstallerSteps[_installStep]; - - //LoadContent(s); - } - - } -} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/default_old.aspx.designer.cs b/src/Umbraco.Web.UI/Areas/UmbracoInstall/default_old.aspx.designer.cs deleted file mode 100644 index 74f8188a66..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/default_old.aspx.designer.cs +++ /dev/null @@ -1,51 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Umbraco.Web.UI.Install { - - - public partial class Default - { - /// - /// ScriptManager1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.ScriptManager ScriptManager1; - - /// - /// rp_steps control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Repeater rp_steps; - - /// - /// PlaceHolderStep control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder PlaceHolderStep; - - /// - /// step control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - public global::System.Web.UI.HtmlControls.HtmlInputHidden step; - } -} diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/Database.ascx.cs b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/Database.ascx.cs deleted file mode 100644 index 6491c2aa0c..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/Database.ascx.cs +++ /dev/null @@ -1,273 +0,0 @@ -using System; -using System.Configuration; -using System.Data.Common; -using System.Web.UI.WebControls; -using System.Web.UI.HtmlControls; -using Umbraco.Core; -using Umbraco.Core.Configuration; -using Umbraco.Core.IO; -using Umbraco.Core.Logging; -using System.IO; -using Umbraco.Core.Persistence; -using Umbraco.Web.Install; -using umbraco.DataLayer; - -namespace Umbraco.Web.UI.Install.Steps -{ - /// - /// Database detection step in the installer wizard. - /// - public partial class Database : StepUserControl - { - /// - /// Returns whether the selected database is an embedded database. - /// - protected bool IsEmbeddedDatabase - { - get - { - var databaseSettings = ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName]; - var configuredDatabaseIsEmbedded = databaseSettings != null && databaseSettings.ProviderName.ToLower().Contains("SqlServerCe".ToLower()); - - return Request["database"] == "embedded" || configuredDatabaseIsEmbedded; - } - } - - protected bool IsConfigured - { - get { return DatabaseType.SelectedValue != ""; } - } - - protected bool IsNewInstall - { - get - { - var databaseSettings = ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName]; - if (databaseSettings != null && ( - databaseSettings.ConnectionString.Trim() == string.Empty - && databaseSettings.ProviderName.Trim() == string.Empty - && GlobalSettings.ConfigurationStatus == string.Empty)) - { - return true; - } - - return false; - } - } - - /// - /// Returns whether the connection string is set by direct text input. - /// - protected bool ManualConnectionString - { - get { return Request["database"] == "advanced"; } - } - - /// - /// Shows the right panel to the user. - /// - /// The sender. - /// The event arguments. - protected void Page_Load(object sender, System.EventArgs e) - { - // Does the user have to enter a connection string? - if (settings.Visible && !Page.IsPostBack) - { - //If the connection string is already present in web.config we don't need to show the settings page and we jump to installing/upgrading. - var databaseSettings = ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName]; - - var dbIsSqlCe = false; - if(databaseSettings != null && databaseSettings.ProviderName != null) - dbIsSqlCe = databaseSettings.ProviderName == "System.Data.SqlServerCe.4.0"; - var sqlCeDatabaseExists = false; - if (dbIsSqlCe) - { - var datasource = databaseSettings.ConnectionString.Replace("|DataDirectory|", AppDomain.CurrentDomain.GetData("DataDirectory").ToString()); - var filePath = datasource.Replace("Data Source=", string.Empty); - sqlCeDatabaseExists = File.Exists(filePath); - } - - // Either the connection details are not fully specified or it's a SQL CE database that doesn't exist yet - if (databaseSettings == null - || string.IsNullOrWhiteSpace(databaseSettings.ConnectionString) || string.IsNullOrWhiteSpace(databaseSettings.ProviderName) - || (dbIsSqlCe && sqlCeDatabaseExists == false)) - { - installProgress.Visible = true; - upgradeProgress.Visible = false; - ShowDatabaseSettings(); - } - else - { - //Since a connection string was present we verify whether this is an upgrade or an empty db - var result = ApplicationContext.Current.DatabaseContext.ValidateDatabaseSchema(); - var determinedVersion = result.DetermineInstalledVersion(); - if (determinedVersion.Equals(new Version(0, 0, 0))) - { - //Fresh install - installProgress.Visible = true; - upgradeProgress.Visible = false; - } - else - { - //Upgrade - installProgress.Visible = false; - upgradeProgress.Visible = true; - } - - settings.Visible = false; - installing.Visible = true; - } - } - } - - /// - /// Prepares and shows the database settings panel. - /// - protected void ShowDatabaseSettings() - { - // Parse the connection string - var connectionStringBuilder = new DbConnectionStringBuilder(); - - var databaseSettings = ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName]; - if (databaseSettings != null && string.IsNullOrWhiteSpace(databaseSettings.ConnectionString) == false) - { - var dataHelper = DataLayerHelper.CreateSqlHelper(databaseSettings.ConnectionString, false); - connectionStringBuilder.ConnectionString = dataHelper.ConnectionString; - - // Prepare data layer type - var datalayerType = GetConnectionStringValue(connectionStringBuilder, "datalayer"); - if (datalayerType.Length > 0) - { - foreach (ListItem item in DatabaseType.Items) - if (item.Value != string.Empty && datalayerType.Contains(item.Value)) - DatabaseType.SelectedValue = item.Value; - } - else if (dataHelper.ConnectionString != "server=.\\SQLEXPRESS;database=DATABASE;user id=USER;password=PASS") - DatabaseType.SelectedValue = "SqlServer"; - } - else - { - DatabaseType.SelectedValue = "SqlServer"; - } - - DatabaseType_SelectedIndexChanged(this, new EventArgs()); - - // Prepare other fields - DatabaseServer.Text = GetConnectionStringValue(connectionStringBuilder, "server"); - if (string.IsNullOrEmpty(DatabaseServer.Text)) DatabaseServer.Text = GetConnectionStringValue(connectionStringBuilder, "Data Source"); - DatabaseName.Text = GetConnectionStringValue(connectionStringBuilder, "database"); - if (string.IsNullOrEmpty(DatabaseName.Text)) DatabaseName.Text = GetConnectionStringValue(connectionStringBuilder, "Initial Catalog"); - DatabaseUsername.Text = GetConnectionStringValue(connectionStringBuilder, "user id"); - DatabasePassword.Text = GetConnectionStringValue(connectionStringBuilder, "password"); - if (string.IsNullOrEmpty(DatabasePassword.Text)) DatabasePassword.Text = GetConnectionStringValue(connectionStringBuilder, "pwd"); - - ToggleVisible(DatabaseServerItem, !ManualConnectionString && !IsEmbeddedDatabase); - ToggleVisible(DatabaseUsernameItem, !ManualConnectionString && !IsEmbeddedDatabase); - ToggleVisible(DatabasePasswordItem, !ManualConnectionString && !IsEmbeddedDatabase); - ToggleVisible(DatabaseNameItem, !ManualConnectionString && !IsEmbeddedDatabase); - - if (IsNewInstall || IsEmbeddedDatabase) - dbinit.Text = "$('#databaseOptionEmbedded').click();$('#databaseOptionEmbedded').change();"; - else if (ManualConnectionString) - dbinit.Text = "$('#databaseOptionAdvanced').click();$('#databaseOptionAdvanced').change();"; - else if (DatabaseType.SelectedValue == "SqlServer") - dbinit.Text = "$('#databaseOptionBlank').click();$('#databaseOptionBlank').change();"; - else if (DatabaseType.SelectedValue == "SqlAzure") - dbinit.Text = "$('#databaseOptionBlank').click();$('#databaseOptionBlank').change();"; - //toggleVisible(DatabaseConnectionString, ManualConnectionString); - - // Make sure ASP.Net displays the password text - DatabasePassword.Attributes["value"] = DatabasePassword.Text; - } - - /// - /// Shows the installation/upgrade panel. - /// - protected void SaveDbConfig(object sender, EventArgs e) - { - try - { - var dbContext = ApplicationContext.Current.DatabaseContext; - - if (string.IsNullOrEmpty(ConnectionString.Text) == false) - { - dbContext.ConfigureDatabaseConnection(ConnectionString.Text); - } - else if (IsEmbeddedDatabase) - { - dbContext.ConfigureEmbeddedDatabaseConnection(); - } - else - { - var server = DatabaseServer.Text; - var databaseName = DatabaseName.Text; - - if (DatabaseType.SelectedValue == "SqlServer" && DatabaseIntegratedSecurity.Checked == true) - { - dbContext.ConfigureIntegratedSecurityDatabaseConnection(server, databaseName); - } - else - { - dbContext.ConfigureDatabaseConnection(server, databaseName, - DatabaseUsername.Text, DatabasePassword.Text, DatabaseType.SelectedValue - ); - } - } - } - catch (Exception ex) - { - LogHelper.Error("Exception was thrown during the setup of the database in 'saveDBConfig'.", ex); - } - - settings.Visible = false; - installing.Visible = true; - } - - /// - /// Gets the value of the specified item in the connection string. - /// - /// The connection string. - /// Name of the item. - /// The value of the item, or an empty string if not found. - protected string GetConnectionStringValue(DbConnectionStringBuilder connectionStringBuilder, string keyword) - { - object value = null; - connectionStringBuilder.TryGetValue(keyword, out value); - return (string)value ?? String.Empty; - } - - /// - /// Show the needed fields according to the database type. - /// - /// The sender. - /// The event arguments. - protected void DatabaseType_SelectedIndexChanged(object sender, EventArgs e) - { - ToggleVisible(DatabaseServerItem, !ManualConnectionString && !IsEmbeddedDatabase); - ToggleVisible(DatabaseUsernameItem, !ManualConnectionString && !IsEmbeddedDatabase); - ToggleVisible(DatabasePasswordItem, !ManualConnectionString && !IsEmbeddedDatabase); - ToggleVisible(DatabaseNameItem, !ManualConnectionString && !IsEmbeddedDatabase); - - //toggleVisible(DatabaseConnectionString, ManualConnectionString); - } - - private static void ToggleVisible(HtmlGenericControl div, bool visible) - { - if (!visible) - div.Attributes["style"] = "display: none;"; - else - div.Attributes["style"] = "display: block;"; - } - - protected void GotoSettings(object sender, EventArgs e) - { - settings.Visible = true; - installing.Visible = false; - - ShowDatabaseSettings(); - - jsVars.Text = "showDatabaseSettings();"; - } - - } -} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/Database.ascx.designer.cs b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/Database.ascx.designer.cs deleted file mode 100644 index 2e2a2c9de1..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/Database.ascx.designer.cs +++ /dev/null @@ -1,249 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Umbraco.Web.UI.Install.Steps { - - - public partial class Database { - - /// - /// settings control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder settings; - - /// - /// DatabaseType control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.DropDownList DatabaseType; - - /// - /// ph_dbError control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder ph_dbError; - - /// - /// lt_dbError control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Literal lt_dbError; - - /// - /// DatabaseServerItem control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl DatabaseServerItem; - - /// - /// DatabaseServerLabel control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label DatabaseServerLabel; - - /// - /// DatabaseServer control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox DatabaseServer; - - /// - /// DatabaseNameItem control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl DatabaseNameItem; - - /// - /// DatabaseNameLabel control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label DatabaseNameLabel; - - /// - /// DatabaseName control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox DatabaseName; - - /// - /// DatabaseIntegratedSecurity control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.CheckBox DatabaseIntegratedSecurity; - - /// - /// DatabaseUsernameItem control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl DatabaseUsernameItem; - - /// - /// DatabaseUsernameLabel control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label DatabaseUsernameLabel; - - /// - /// DatabaseUsername control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox DatabaseUsername; - - /// - /// DatabasePasswordItem control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl DatabasePasswordItem; - - /// - /// DatabasePasswordLabel control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label DatabasePasswordLabel; - - /// - /// DatabasePassword control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox DatabasePassword; - - /// - /// embeddedFilesMissing control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl embeddedFilesMissing; - - /// - /// DatabaseConnectionString control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl DatabaseConnectionString; - - /// - /// ConnectionStringLabel control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label ConnectionStringLabel; - - /// - /// ConnectionString control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox ConnectionString; - - /// - /// jsVars control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Literal jsVars; - - /// - /// dbinit control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Literal dbinit; - - /// - /// installing control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder installing; - - /// - /// installProgress control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder installProgress; - - /// - /// upgradeProgress control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder upgradeProgress; - } -} diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/DefaultUser.ascx.cs b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/DefaultUser.ascx.cs deleted file mode 100644 index 53981005eb..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/DefaultUser.ascx.cs +++ /dev/null @@ -1,94 +0,0 @@ -using System; -using System.Web.Security; -using Umbraco.Core.Configuration; -using Umbraco.Core.Logging; -using Umbraco.Core.Security; -using Umbraco.Web.Install; -using Umbraco.Web.Security; -using umbraco.BusinessLogic; -using umbraco.providers; -using System.Collections.Specialized; - -namespace Umbraco.Web.UI.Install.Steps -{ - /// - /// Summary description for defaultUser. - /// - public partial class DefaultUser : StepUserControl - { - - protected MembershipProvider CurrentProvider - { - get - { - var provider = Membership.Providers[UmbracoConfig.For.UmbracoSettings().Providers.DefaultBackOfficeUserProvider]; - if (provider == null) - { - throw new InvalidOperationException("No MembershipProvider found with name " + UmbracoConfig.For.UmbracoSettings().Providers.DefaultBackOfficeUserProvider); - } - return provider; - } - } - - protected void ChangePasswordClick(object sender, EventArgs e) - { - Page.Validate(); - - if (Page.IsValid) - { - var user = User.GetUser(0); - - var membershipUser = CurrentProvider.GetUser(0, true); - if (membershipUser == null) - { - throw new InvalidOperationException("No user found in membership provider with id of 0"); - } - - try - { - var success = membershipUser.ChangePassword(user.GetPassword(), tb_password.Text.Trim()); - if (success == false) - { - PasswordValidator.IsValid = false; - PasswordValidator.ErrorMessage = "Password must be at least " + CurrentProvider.MinRequiredPasswordLength + " characters long and contain at least " + CurrentProvider.MinRequiredNonAlphanumericCharacters + " symbols"; - return; - } - } - catch (Exception ex) - { - PasswordValidator.IsValid = false; - PasswordValidator.ErrorMessage = "Password must be at least " + CurrentProvider.MinRequiredPasswordLength + " characters long and contain at least " + CurrentProvider.MinRequiredNonAlphanumericCharacters + " symbols"; - return; - } - - user.Email = tb_email.Text.Trim(); - user.Name = tb_name.Text.Trim(); - user.LoginName = tb_login.Text; - - user.Save(); - - if (cb_newsletter.Checked) - { - try - { - var client = new System.Net.WebClient(); - var values = new NameValueCollection {{"name", tb_name.Text}, {"email", tb_email.Text}}; - - client.UploadValues("http://umbraco.org/base/Ecom/SubmitEmail/installer.aspx", values); - } - catch (Exception ex) - { - LogHelper.Error("An error occurred subscribing user to newsletter", ex); - } - } - - - if (String.IsNullOrWhiteSpace(GlobalSettings.ConfigurationStatus)) - UmbracoContext.Current.Security.PerformLogin(user.Id); - - //InstallHelper.RedirectToNextStep(Page, GetCurrentStep()); - } - } - - } -} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/DefaultUser.ascx.designer.cs b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/DefaultUser.ascx.designer.cs deleted file mode 100644 index 1f708ce16d..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/DefaultUser.ascx.designer.cs +++ /dev/null @@ -1,87 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Umbraco.Web.UI.Install.Steps { - - - public partial class DefaultUser { - - /// - /// identify control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder identify; - - /// - /// tb_name control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_name; - - /// - /// tb_email control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_email; - - /// - /// tb_login control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_login; - - /// - /// tb_password control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_password; - - /// - /// PasswordValidator control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.CustomValidator PasswordValidator; - - /// - /// tb_password_confirm control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.TextBox tb_password_confirm; - - /// - /// cb_newsletter control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.CheckBox cb_newsletter; - } -} diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/License.ascx.cs b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/License.ascx.cs deleted file mode 100644 index 69e0a3e4e3..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/License.ascx.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using Umbraco.Web.Install; - -namespace Umbraco.Web.UI.Install.Steps -{ - public partial class License : StepUserControl - { - - } -} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/License.ascx.designer.cs b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/License.ascx.designer.cs deleted file mode 100644 index 25590c60a3..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/License.ascx.designer.cs +++ /dev/null @@ -1,24 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Umbraco.Web.UI.Install.Steps { - - - public partial class License { - - /// - /// btnNext control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton btnNext; - } -} diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/Renaming.ascx.cs b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/Renaming.ascx.cs deleted file mode 100644 index 8deb109514..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/Renaming.ascx.cs +++ /dev/null @@ -1,79 +0,0 @@ -using System; -using System.IO; -using System.Xml; -using Umbraco.Core.IO; - -namespace Umbraco.Web.UI.Install.Steps -{ - public partial class Renaming : StepUserControl - { - private readonly string _oldAccessFilePath = IOHelper.MapPath(SystemDirectories.Data + "/access.xml"); - private readonly string _newAccessFilePath = IOHelper.MapPath(SystemDirectories.Data + "/access.config"); - private bool _changesNeeded = false; - - protected void Page_Load(object sender, EventArgs e) - { - // check access.xml file - identifyResult.Text += CheckAccessFile(); - - if (_changesNeeded) - { - changesNeeded.Visible = true; - } - else - { - noChangedNeeded.Visible = true; - changesNeeded.Visible = false; - } - } - - private string CheckAccessFile() - { - if (!NewAccessFileExist() && OldAccessFileExist()) - { - _changesNeeded = true; - return "
  • Access.xml found. Needs to be renamed to access.config
    • "; - } - return "
  • Public Access file is all good. No changes needed
    • "; - } - - private bool OldAccessFileExist() - { - return File.Exists(_oldAccessFilePath); - } - - private bool NewAccessFileExist() - { - return File.Exists(_newAccessFilePath); - } - - protected void UpdateChangesClick(object sender, EventArgs e) - { - bool succes = true; - string progressText = ""; - - // rename access file - if (OldAccessFileExist()) - { - try - { - File.Move(_oldAccessFilePath, IOHelper.MapPath(SystemFiles.AccessXml)); - progressText += String.Format("
  • Public Access file renamed
    • "); - } - catch (Exception ee) - { - progressText += String.Format("
  • Error renaming access file: {0}
    • ", ee.ToString()); - succes = false; - } - } - - string resultClass = succes ? "success" : "error"; - resultText.Text = String.Format("

    {1}

    ", - resultClass, - progressText); - result.Visible = true; - init.Visible = false; - } - - } -} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/Renaming.ascx.designer.cs b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/Renaming.ascx.designer.cs deleted file mode 100644 index 5aab34af89..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/Renaming.ascx.designer.cs +++ /dev/null @@ -1,78 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Umbraco.Web.UI.Install.Steps { - - - public partial class Renaming { - - /// - /// init control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Panel init; - - /// - /// noChangedNeeded control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Panel noChangedNeeded; - - /// - /// changesNeeded control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Panel changesNeeded; - - /// - /// identifyResult control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Literal identifyResult; - - /// - /// updateChanges control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Button updateChanges; - - /// - /// result control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Panel result; - - /// - /// resultText control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Literal resultText; - } -} diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/RenderingEngine.ascx b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/RenderingEngine.ascx deleted file mode 100644 index 713af0460d..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/RenderingEngine.ascx +++ /dev/null @@ -1,27 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="RenderingEngine.ascx.cs" Inherits="Umbraco.Web.UI.Install.Steps.RenderingEngine" %> - -
    -
    -

    - Chose how you like to work with Templates

    -

    - Umbraco works with both ASP.NET WebForms (also known as MasterPages) and ASP.NET MVC (called Views). If you're not sure, we recommend using the MVC templates. You can of course use both but let's select a default one to get started. -

    -
    -
    -
    -

    - Choose a default template type: -

    - - MVC - Web forms - -
    -
    - -
    -
     
    - Continue -
    -
    diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/RenderingEngine.ascx.cs b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/RenderingEngine.ascx.cs deleted file mode 100644 index 905b2d0ff3..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/RenderingEngine.ascx.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; -using Umbraco.Core.Configuration; - -namespace Umbraco.Web.UI.Install.Steps -{ - public partial class RenderingEngine : StepUserControl - { - //protected override void GotoNextStep(object sender, EventArgs e) - //{ - // ////set the default engine - // //UmbracoSettings.DefaultRenderingEngine = Core.RenderingEngine.Mvc; - // //UmbracoSettings.Save(); - - // base.GotoNextStep(sender, e); - //} - } -} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/RenderingEngine.ascx.designer.cs b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/RenderingEngine.ascx.designer.cs deleted file mode 100644 index e7c63a8e58..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/RenderingEngine.ascx.designer.cs +++ /dev/null @@ -1,33 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Umbraco.Web.UI.Install.Steps { - - - public partial class RenderingEngine { - - /// - /// EngineSelection control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.RadioButtonList EngineSelection; - - /// - /// btnNext control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton btnNext; - } -} diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/StarterKits.ascx b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/StarterKits.ascx deleted file mode 100644 index dc20fc9b5e..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/StarterKits.ascx +++ /dev/null @@ -1,122 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="StarterKits.ascx.cs" Inherits="Umbraco.Web.UI.Install.Steps.StarterKits" %> - - - - - - - - - - - - - -
    -
    -

    Starter kits

    -

    To help you get started here are some basic starter kits. They have been tailored to suit common site configurations and install useful functionality.

    -
    - - -
    -     - - - - -
    -
    -

    Install a Skin

    -
    -

    You can now further enhance your site by choosing one of these great skins. This will apply a default look and feel to all the pages in your site, considerably reducing development time.

    -
    -
    - - -
    -     - -     -     - - - - - - diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/StarterKits.ascx.cs b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/StarterKits.ascx.cs deleted file mode 100644 index ba4408fec1..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/StarterKits.ascx.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using Umbraco.Core.IO; -using Umbraco.Web.Install; -using Umbraco.Web.UI.Install.Steps.Skinning; -using umbraco.cms.businesslogic.packager; - -namespace Umbraco.Web.UI.Install.Steps -{ - public partial class StarterKits : StepUserControl - { - - protected void Page_Load(object sender, EventArgs e) - { - //if (InstalledPackage.GetAllInstalledPackages().Count > 0) - // GotoNextStep(sender, e); - - ShowStarterKits(); - } - - - private void ShowStarterKits() - { - ph_starterKits.Controls.Add(LoadControl(SystemDirectories.Install + "/steps/Skinning/loadStarterKits.ascx")); - - pl_starterKit.Visible = true; - pl_starterKitDesign.Visible = false; - - - } - - } -} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/StarterKits.ascx.designer.cs b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/StarterKits.ascx.designer.cs deleted file mode 100644 index 08908154c9..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/StarterKits.ascx.designer.cs +++ /dev/null @@ -1,60 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Umbraco.Web.UI.Install.Steps { - - - public partial class StarterKits { - - /// - /// udp control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.UpdatePanel udp; - - /// - /// pl_starterKit control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder pl_starterKit; - - /// - /// ph_starterKits control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder ph_starterKits; - - /// - /// pl_starterKitDesign control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder pl_starterKitDesign; - - /// - /// ph_starterKitDesigns control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder ph_starterKitDesigns; - } -} diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/StepUserControl.cs b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/StepUserControl.cs deleted file mode 100644 index 2de1dbbd3b..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/StepUserControl.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Web.UI; -using Umbraco.Web.Install; - -namespace Umbraco.Web.UI.Install.Steps -{ - public abstract class StepUserControl : UserControl - { - protected string GetCurrentStep() - { - var defaultPage = (Default) Page; - return defaultPage.step.Value; - } - - //protected virtual void GotoNextStep(object sender, EventArgs e) - //{ - // InstallHelper.RedirectToNextStep(Page, GetCurrentStep()); - //} - } -} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/TheEnd.ascx.cs b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/TheEnd.ascx.cs deleted file mode 100644 index 73e052c472..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/TheEnd.ascx.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using System.Web; -using Umbraco.Core; -using Umbraco.Core.Configuration; -using Umbraco.Core.Logging; -using Umbraco.Web.Security; - -namespace Umbraco.Web.UI.Install.Steps -{ - public partial class TheEnd : StepUserControl - { - protected void Page_Load(object sender, System.EventArgs e) - { - // Update configurationStatus - try - { - GlobalSettings.ConfigurationStatus = UmbracoVersion.Current.ToString(3); - } - catch (Exception ex) - { - LogHelper.Error("An error occurred updating the config status", ex); - } - - // Update ClientDependency version - var clientDependencyConfig = new ClientDependencyConfiguration(); - var clientDependencyUpdated = clientDependencyConfig.IncreaseVersionNumber(); - - //Clear the auth cookie - this is required so that the login screen is displayed after upgrade and so the - // csrf anti-forgery tokens are created, otherwise there will just be JS errors if the user has an old - // login token from a previous version when we didn't have csrf tokens in place - var security = new WebSecurity(new HttpContextWrapper(Context), ApplicationContext.Current); - security.ClearCurrentLogin(); - } - - } -} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/TheEnd.ascx.designer.cs b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/TheEnd.ascx.designer.cs deleted file mode 100644 index 349efe6a9d..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/TheEnd.ascx.designer.cs +++ /dev/null @@ -1,15 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Umbraco.Web.UI.Install.Steps { - - - public partial class TheEnd { - } -} diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/UpgradeReport.ascx b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/UpgradeReport.ascx deleted file mode 100644 index 438d6fd9ab..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/UpgradeReport.ascx +++ /dev/null @@ -1,73 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="UpgradeReport.ascx.cs" Inherits="Umbraco.Web.UI.Install.Steps.UpgradeReport" %> - -
    -
    -

    Major version upgrade from <%= CurrentVersion %> to <%= NewVersion %>

    - - - -

    - This installation step will determine if there are compatibility issues with Property Editors that you have defined in your current installation. -

    -     - - - - -

    There were <%=Report.Count() %> issues detected

    -

    - The following compatibility issues were found. If you continue all non-compatible property editors will be converted to a Readonly/Label. - You will be able to change the property editor to a compatible type manually by editing the data type after installation. -

    -

    - Otherwise if you choose not to proceed you will need to fix the errors listed below. - Refer to v<%= NewVersion%> upgrade instructions for full details. -

    -     - -

    No issues detected

    -

    - Click 'Continue' to proceed with the upgrade -

    -     -     -     -     - -
    -
    -
    - - -

    - Click 'Continue' to generate the compatibility report -

    -     - - - - <% foreach (var item in Report) - { %> - - - - - - - <% } %> -
    - - - <%=item.Item2 %> -
    -     -     - -
    -
    - -
    -
     
    - Continue -
    -
    diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/UpgradeReport.ascx.cs b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/UpgradeReport.ascx.cs deleted file mode 100644 index bf6c947254..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/UpgradeReport.ascx.cs +++ /dev/null @@ -1,96 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; -using Umbraco.Core; -using Umbraco.Core.Configuration; -using Umbraco.Core.Persistence; -using Umbraco.Core.Persistence.SqlSyntax; -using Umbraco.Core.PropertyEditors; - -namespace Umbraco.Web.UI.Install.Steps -{ - public partial class UpgradeReport : StepUserControl - { - protected Version CurrentVersion { get; private set; } - protected Version NewVersion { get; private set; } - protected IEnumerable> Report { get; private set; } - - protected override void OnInit(EventArgs e) - { - base.OnInit(e); - - var result = ApplicationContext.Current.DatabaseContext.ValidateDatabaseSchema(); - var determinedVersion = result.DetermineInstalledVersion(); - - CurrentVersion = determinedVersion; - NewVersion = UmbracoVersion.Current; - Report = new List>(); - } - - protected override void OnLoad(EventArgs e) - { - base.OnLoad(e); - if (!IsPostBack) - { - DataBind(); - } - } - - protected void NextButtonClick(object sender, EventArgs e) - { - if (ToggleView.ActiveViewIndex == 1) - { - //GotoNextStep(sender, e); - } - else - { - CreateReport(); - ToggleView.ActiveViewIndex = 1; - DataBind(); - } - } - - private void CreateReport() - { - var errorReport = new List>(); - - var sql = new Sql(); - sql - .Select( - SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumn("cmsDataType", "controlId"), - SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumn("umbracoNode", "text")) - .From(SqlSyntaxContext.SqlSyntaxProvider.GetQuotedTableName("cmsDataType")) - .InnerJoin(SqlSyntaxContext.SqlSyntaxProvider.GetQuotedTableName("umbracoNode")) - .On( - SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumn("cmsDataType", "nodeId") + " = " + - SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumn("umbracoNode", "id")); - - var list = ApplicationContext.Current.DatabaseContext.Database.Fetch(sql); - foreach (var item in list) - { - Guid legacyId = item.controlId; - //check for a map entry - var alias = LegacyPropertyEditorIdToAliasConverter.GetAliasFromLegacyId(legacyId); - if (alias != null) - { - //check that the new property editor exists with that alias - var editor = PropertyEditorResolver.Current.GetByAlias(alias); - if (editor == null) - { - errorReport.Add(new Tuple(false, string.Format("Property Editor with ID '{0}' (assigned to Data Type '{1}') has a valid GUID -> Alias map but no property editor was found. It will be replaced with a Readonly/Label property editor.", item.controlId, item.text))); - } - } - else - { - errorReport.Add(new Tuple(false, string.Format("Property Editor with ID '{0}' (assigned to Data Type '{1}') does not have a valid GUID -> Alias map. It will be replaced with a Readonly/Label property editor.", item.controlId, item.text))); - } - } - - Report = errorReport; - } - } -} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/UpgradeReport.ascx.designer.cs b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/UpgradeReport.ascx.designer.cs deleted file mode 100644 index 6f59b0238a..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/UpgradeReport.ascx.designer.cs +++ /dev/null @@ -1,60 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Umbraco.Web.UI.Install.Steps { - - - public partial class UpgradeReport { - - /// - /// MultiView1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.MultiView MultiView1; - - /// - /// View1 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.View View1; - - /// - /// View2 control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.View View2; - - /// - /// ToggleView control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.MultiView ToggleView; - - /// - /// btnNext control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton btnNext; - } -} diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/ValidatePermissions.ascx.cs b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/ValidatePermissions.ascx.cs deleted file mode 100644 index b7c7934fb0..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/ValidatePermissions.ascx.cs +++ /dev/null @@ -1,181 +0,0 @@ -using System; -using System.IO; -using Umbraco.Core.IO; -using Umbraco.Web.Install; -using umbraco; - -namespace Umbraco.Web.UI.Install.Steps -{ - public partial class ValidatePermissions : StepUserControl - { - protected void Page_Load(object sender, EventArgs e) - { - var permissionsOk = true; - var packageOk = true; - var foldersOk = true; - var cacheOk = true; - var valResult = ""; - - // Test default dir permissions - foreach (var dir in FilePermissionHelper.PermissionDirs) - { - var result = SaveAndDeleteFile(IOHelper.MapPath(dir + "/configWizardPermissionTest.txt")); - - if (!result) - { - permissionsOk = false; - permSummary.Text += "
  • Directory: ./" + dir + "
    • "; - } - - // Print - valResult += " " + dir + " : " + SuccessOrFailure(result) + "!
    "; - } - - // Test default file permissions - foreach (var file in FilePermissionHelper.PermissionFiles) - { - var result = OpenFileForWrite(IOHelper.MapPath(file)); - if (!result) - { - permissionsOk = false; - permSummary.Text += "
  • File: " + file + "
    • "; - } - - // Print - valResult += " " + file + " : " + SuccessOrFailure(result) + "!
    "; - } - permissionResults.Text = valResult; - - // Test package dir permissions - string packageResult = ""; - foreach (var dir in FilePermissionHelper.PackagesPermissionsDirs) - { - var result = - SaveAndDeleteFile(IOHelper.MapPath(dir + "/configWizardPermissionTest.txt")); - if (!result) - { - packageOk = false; - permSummary.Text += "
  • Directory: " + dir + "
    • "; - } - - // Print - packageResult += " ./" + dir + " : " + SuccessOrFailure(result) + "!
    "; - } - packageResults.Text = packageResult; - - // Test umbraco.xml file - try - { - content.Instance.PersistXmlToFile(); - xmlResult.Text = "Success!"; - } - catch (Exception ee) - { - cacheOk = false; - xmlResult.Text = "Failed!"; - string tempFile = SystemFiles.ContentCacheXml; - - if (tempFile.Substring(0, 1) == "/") - tempFile = tempFile.Substring(1, tempFile.Length - 1); - - permSummary.Text += string.Format("
  • File ./{0}
    Error message: {1}
    • ", tempFile, ee); - } - - // Test creation of folders - try - { - string tempDir = IOHelper.MapPath(SystemDirectories.Media + "/testCreatedByConfigWizard"); - Directory.CreateDirectory(tempDir); - Directory.Delete(tempDir); - foldersResult.Text = "Success!"; - } - catch - { - foldersOk = false; - foldersResult.Text = "Failure!"; - } - - // update config files - if (permissionsOk) - { - foreach ( - var configFile in new DirectoryInfo(IOHelper.MapPath(SystemDirectories.Config)).GetFiles("*.xml")) - { - try - { - if (File.Exists(configFile.FullName.Replace(".xml", ".config"))) - File.Delete(configFile.FullName.Replace(".xml", ".config")); - - configFile.MoveTo(configFile.FullName.Replace(".xml", ".config")); - } - catch { } - - } - } - - // Generate summary - howtoResolve.Visible = true; - if (permissionsOk && cacheOk && packageOk && foldersOk) - { - perfect.Visible = true; - howtoResolve.Visible = false; - } - else if (permissionsOk && cacheOk && foldersOk) - noPackages.Visible = true; - else if (permissionsOk && cacheOk) - { - folderWoes.Visible = true; - grant.Visible = false; - noFolders.Visible = true; - } - else - { - error.Visible = true; - if (!foldersOk) - folderWoes.Visible = true; - } - } - - private static string SuccessOrFailure(bool result) - { - return result ? "Success" : "Failure"; - } - - private static bool SaveAndDeleteFile(string file) - { - try - { - //first check if the directory of the file exists, and if not try to create that first. - var fi = new FileInfo(file); - if (!fi.Directory.Exists) - { - fi.Directory.Create(); - } - - File.WriteAllText(file, - "This file has been created by the umbraco configuration wizard. It is safe to delete it!"); - File.Delete(file); - return true; - } - catch - { - return false; - } - - } - - private bool OpenFileForWrite(string file) - { - try - { - File.AppendText(file).Close(); - } - catch - { - return false; - } - return true; - } - - } -} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/ValidatePermissions.ascx.designer.cs b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/ValidatePermissions.ascx.designer.cs deleted file mode 100644 index 0b22faf58b..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/ValidatePermissions.ascx.designer.cs +++ /dev/null @@ -1,132 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Umbraco.Web.UI.Install.Steps { - - - public partial class ValidatePermissions { - - /// - /// perfect control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Literal perfect; - - /// - /// noPackages control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Literal noPackages; - - /// - /// noFolders control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Literal noFolders; - - /// - /// error control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Literal error; - - /// - /// howtoResolve control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Panel howtoResolve; - - /// - /// grant control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Panel grant; - - /// - /// permSummary control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Literal permSummary; - - /// - /// folderWoes control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Panel folderWoes; - - /// - /// permissionResults control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Literal permissionResults; - - /// - /// packageResults control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Literal packageResults; - - /// - /// xmlResult control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Literal xmlResult; - - /// - /// foldersResult control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Literal foldersResult; - - /// - /// btnNext control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton btnNext; - } -} diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/Welcome.ascx.cs b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/Welcome.ascx.cs deleted file mode 100644 index fbe0b690ae..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/Welcome.ascx.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using Umbraco.Core; -using umbraco; - -namespace Umbraco.Web.UI.Install.Steps -{ - public partial class Welcome : StepUserControl - { - protected override void OnInit(EventArgs e) - { - base.OnInit(e); - - if (!IsPostBack) - { - //clear the plugin cache when installation starts (just a safety check) - PluginManager.Current.ClearPluginCache(); - } - } - - protected void Page_Load(object sender, EventArgs e) - { - // Check for config! SD: I've moved this config check above the other stuff since there's no point in doing all that processing if we're - // just going to redirect if this setting is true. - if (GlobalSettings.Configured) - { - Response.Redirect(Request.QueryString["url"] ?? "/", true); - } - - var result = ApplicationContext.Current.DatabaseContext.ValidateDatabaseSchema(); - var determinedVersion = result.DetermineInstalledVersion(); - - // Display the Umbraco upgrade message if Umbraco is already installed - if (string.IsNullOrWhiteSpace(GlobalSettings.ConfigurationStatus) == false || determinedVersion.Equals(new Version(0, 0, 0)) == false) - { - ph_install.Visible = false; - ph_upgrade.Visible = true; - } - - } - - - - - } -} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/Welcome.ascx.designer.cs b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/Welcome.ascx.designer.cs deleted file mode 100644 index e6ca78e76c..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/Welcome.ascx.designer.cs +++ /dev/null @@ -1,42 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Umbraco.Web.UI.Install.Steps { - - - public partial class Welcome { - - /// - /// ph_install control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder ph_install; - - /// - /// ph_upgrade control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.PlaceHolder ph_upgrade; - - /// - /// btnNext control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton btnNext; - } -} diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/database.ascx b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/database.ascx deleted file mode 100644 index 04720a074d..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/database.ascx +++ /dev/null @@ -1,442 +0,0 @@ -<%@ Control Language="c#" AutoEventWireup="True" CodeBehind="database.ascx.cs" Inherits="Umbraco.Web.UI.Install.Steps.Database" %> -<%@ Import Namespace="Umbraco.Core.Configuration" %> - - - -
    -
    -

    Database configuration

    -

    - To complete this step you will either need a blank database or, if you do not have a blank database available, choose the SQL CE 4 embedded - database (This is the recommended approach for first time users or if you are unsure). -

    -

    - If you are not using the SQL CE 4 embedded database you will need the connection details for your database, such as the - "connection string". You may need to contact your system administrator or web host for this information. -

    -
    - -
    -
    -
    -
    -

    - 1. Select which database option best fits you: -

    - -
      -
    • - - - -
      • -
    • - - - -
      • -
    • - - - -
      • -
    • - - - -
      • -
    - -
    -
    - -
    - - - -
    - - -
    -
    -

    - 2. Now choose your database type below. -

    -
    - - - - - - - -
    -
    -
    - - -
    -
    -

    - 3. Connection details: Please fill out the connection information for your database. -

    -
    - - - -
    -

    - - -

    -
    - -     -
    - Server: - - -
    -
    - Database name: - - -
    - -
    - Integrated security: - -
    - -
    - Username: - - -
    -
    - Password: - - -
    - -
    -
    - - -
    -
    - - -
    -
    -
    - -

    - 2. Simple file-based database: -

    -
    - - - - -
    -
    -
    -
    - -
    -
    -
    -

    - 2. Connection details: Please fill out the connection information for your database. -

    - -
    - -
    - Connection string: - - -
    -
    -

    - Example: datalayer=MySQL;server=192.168.2.8;user id=user;password=***;database=umbraco -

    -
    - -
    -
    -
    -
    - - -
    -
    -
    -

    - 2. Getting a database setup for umbraco.
    - For first time users, we recommend you select "quick-and-simple embedded database". - This will install an easy to use database, that does - not require any additional software to use.
    - Alternatively, you can install Microsoft SQL Server, which will require a bit more - work to get up and running.
    - We have provided a step-by-step guide in the video instructions below. -

    - Open video instructions -
    -
    -
    - -
    -
     
    - install -
    - -
    - - - -
    -
    -
    - -     - - - -
    -
    - -
    -

    Installing Umbraco

    -

    - The Umbraco database is being configured. This process populates your chosen database with a blank Umbraco instance. -

    -
    - -     - -
    -

    Upgrading Umbraco

    -

    - The Umbraco database is being configured. This process upgrades your Umbraco database. -

    -
    - -     -
    -
    -
    -
    - 0% -
    - -
    -
    - -
    -
     
    - Continue - -
    -
    - - - -     \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/defaultUser.ascx b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/defaultUser.ascx deleted file mode 100644 index 8eb13b0817..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/defaultUser.ascx +++ /dev/null @@ -1,89 +0,0 @@ -<%@ Control Language="c#" AutoEventWireup="True" Codebehind="DefaultUser.ascx.cs" Inherits="Umbraco.Web.UI.Install.Steps.DefaultUser" TargetSchema="http://schemas.microsoft.com/intellisense/ie5"%> - - - -
    - -
    - -

    Create User

    -
    -

    You can now setup a new admin user to log into Umbraco, we recommend using a stong password for this (a password which is more than 4 characters and contains a mix of letters, numbers and symbols). - Please make a note of the chosen password.

    -

    The password can be changed once you have completed the installation and logged into the admin interface.

    -
    - -
    - -
    - -
    - -
    - -
    - -
    - -
    - Name: - - -
    - -
    - Email: - - -
    - -
    - Username: - - -
    - -
    - Password: - - - -
    - -
    - Confirm Password: - - - -
    - -
    - - Sign up for our monthly newsletter -
    -
    -
    -
    -
     
    - Create user -
    -
    -
    -
    -
    -     - - diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/license.ascx b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/license.ascx deleted file mode 100644 index f748657dde..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/license.ascx +++ /dev/null @@ -1,24 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="True" CodeBehind="license.ascx.cs" Inherits="Umbraco.Web.UI.Install.Steps.License" %> - -
    -
    -

    License

    -
    -

    Accept the license for Umbraco CMS

    -

    By clicking the "accept and continue" button (or by modifying the Umbraco Configuration Status in the web.config), you accept the license for this software as specified in the text below.

    -
    -

    The License (MIT):

    -
    -

    Copyright (c) 2002 - <%=DateTime.Now.Year %> Umbraco I/S

    -

    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

    -

    The above copyright and this permission notice shall be included in all copies or substantial portions of the software.

    -

    THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USER OR OTHER DEALINGS IN THE SOFTWARE.

    -
    -

    That’s all. That didn’t hurt did it?

    -
    - -
    -
     
    - Accept and Continue -
    -
    \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/renaming.ascx b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/renaming.ascx deleted file mode 100644 index 1af531c69c..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/renaming.ascx +++ /dev/null @@ -1,25 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="True" CodeBehind="Renaming.ascx.cs" Inherits="Umbraco.Web.UI.Install.Steps.Renaming" %> -

    Step 3/5: Updating old conventions

    - -

    - This version of Umbraco introduces new conventions for naming XSLT and REST extensions as well as a renaming of the Public Access storage file.
    - You no longer need to prefix your extension references with /bin and the public access storage file is now called access.config instead of access.xml.
    - This step of the installer will try to update your old references. If it fails due to permission settings, you'll need to make these changes manually! -

    - - -

    Everything looks good. No changes needed for the upgrade, just press next.

    -     - -

    -The following changes will need to be made. Press to update changes button to proceed: -

    - - -     -     - - - - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/theend.ascx b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/theend.ascx deleted file mode 100644 index 8288bab863..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/theend.ascx +++ /dev/null @@ -1,63 +0,0 @@ -<%@ Control Language="c#" AutoEventWireup="True" CodeBehind="TheEnd.ascx.cs" Inherits="Umbraco.Web.UI.Install.Steps.TheEnd" - TargetSchema="http://schemas.microsoft.com/intellisense/ie5" %> -<%@ Import Namespace="Umbraco.Core.IO" %> - - - - -
    -
    -

    You’re done...now what?

    -

    Excellent, you are now ready to start using Umbraco, one of the worlds most popular open source .NET CMS.

    - -
    -
    -
    -  
    -
    - - - -
    -
    -
    diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/validatePermissions.ascx b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/validatePermissions.ascx deleted file mode 100644 index f69853b0e9..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/validatePermissions.ascx +++ /dev/null @@ -1,89 +0,0 @@ -<%@ Control Language="c#" AutoEventWireup="True" Codebehind="ValidatePermissions.ascx.cs" Inherits="Umbraco.Web.UI.Install.Steps.ValidatePermissions" TargetSchema="http://schemas.microsoft.com/intellisense/ie5"%> -

    Step 3/5: Validating File Permissions

    -

    -umbraco needs write/modify access to certain directories in order to store files like pictures and PDF's. -It also stores temporary data (aka: cache) for enhancing the performance of your website. -

    - - -
    -

    Your permission settings are perfect!

    -

    You are ready to run umbraco and install packages!

    -
    -     - - -
    -

    Your permission settings are almost perfect!

    -

    -You can run umbraco without problems, but you will not be able to install packages which are recommended to take full advantage of umbraco. -

    -
    -     - - -
    -

    -Your permission settings might be an issue! -

    -

    You can run umbraco without problems, but you will not be able to create folders or install packages which are recommended to take full advantage of umbraco.

    -
    -     - - -
    -

    -Your permission settings are not ready for umbraco! -

    -

    -In order to run umbraco, you'll need to update your permission settings. -

    -
    -     - - -

    How to Resolve

    - -
    - -

    Affected files and folders

    -

    - You need to grant ASP.NET modify permissions to the following files/folders: -

    - -
      - -
    -     - - -

    Resolving folder issue

    - -

    Follow this link for more information on problems with ASP.NET and creating - folders. -

    -     - - -

    View Permission Error Details:

    - -
    -     - -
    -
     
    - Continue anyway -
    \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/welcome.ascx b/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/welcome.ascx deleted file mode 100644 index be5c4acd61..0000000000 --- a/src/Umbraco.Web.UI/Areas/UmbracoInstall/steps/welcome.ascx +++ /dev/null @@ -1,55 +0,0 @@ -<%@ Control Language="c#" AutoEventWireup="True" CodeBehind="Welcome.ascx.cs" Inherits="Umbraco.Web.UI.Install.Steps.Welcome" - TargetSchema="http://schemas.microsoft.com/intellisense/ie5" %> -<%@ Import Namespace="Umbraco.Core.Configuration" %> - -
    -
    - - - -

    - Welcome to the Umbraco installation

    -

    - Thanks for downloading the Umbraco CMS installer. -

    -

    - You are just a few minutes away from getting up and running. The installer will - take you through the following process:-

    -
      -
    • 1.Accept the easy to read License.
      • -
    • 2.Set up a database. There are a number of options available - such as MS SQL Server, MS SQL Express Edition and MYSQL or you may wish to use the - Microsoft SQL CE 4 database. You may need to consult your web host or system administrator.
      • -
    • 3.Set an Umbraco Admin password.
      • -
    • 4.You can then choose to install one of our great starter - kits and a skin.
      • -
    • 5.But whatever you do don't forget to become part of the Umbraco community, one of the friendliest developer communities you will find. It’s what makes Umbraco such a great product and so much fun to use.
      • -
    - Enjoy! -     - - -

    Upgrading Umbraco

    -

    - Welcome to the umbraco upgrade wizard. This will make sure that you upgrade safely from your old version to Umbraco version <%=UmbracoVersion.Current.ToString(3) %> <%=UmbracoVersion.CurrentComment %> -

    -

    - As this is an upgrade, the wizard might skip steps that are only needed for new umbraco installations. It might also ask you questions you've already answered once. But do not worry, - everything is in order. Click Let's get started below to begin your upgrade. -

    - Enjoy! -     - -
    - -
    -
     
    - Let's get started! -
    - -
    - \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 29494bf459..5ba5f8cf1c 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -307,8 +307,14 @@ Properties\SolutionInfo.cs - - default_old.aspx + + loadStarterKits.ascx + ASPXCodeBehind + + + loadStarterKits.ascx + + ASPXCodeBehind @@ -319,9 +325,6 @@ noNodes.aspx ASPXCodeBehind - - default_old.aspx - InstallerRestService.aspx ASPXCodeBehind @@ -329,86 +332,6 @@ InstallerRestService.aspx - - database.ascx - ASPXCodeBehind - - - database.ascx - - - defaultUser.ascx - ASPXCodeBehind - - - defaultUser.ascx - - - license.ascx - ASPXCodeBehind - - - license.ascx - - - renaming.ascx - ASPXCodeBehind - - - renaming.ascx - - - RenderingEngine.ascx - ASPXCodeBehind - - - RenderingEngine.ascx - - - loadStarterKits.ascx - ASPXCodeBehind - - - loadStarterKits.ascx - - - StarterKits.ascx - ASPXCodeBehind - - - StarterKits.ascx - - - ASPXCodeBehind - - - theend.ascx - ASPXCodeBehind - - - theend.ascx - - - UpgradeReport.ascx - ASPXCodeBehind - - - UpgradeReport.ascx - - - validatePermissions.ascx - ASPXCodeBehind - - - validatePermissions.ascx - - - welcome.ascx - ASPXCodeBehind - - - welcome.ascx - Title.ascx ASPXCodeBehind @@ -630,6 +553,7 @@ treeInit.aspx + @@ -651,7 +575,6 @@ - @@ -742,7 +665,6 @@ UI.xml - @@ -1754,10 +1676,6 @@ - - - - @@ -1897,8 +1815,6 @@ - - @@ -2089,18 +2005,6 @@ - - UserControl - - - UserControl - - - UserControl - - - UserControl - Designer diff --git a/src/Umbraco.Web.UI/config/ClientDependency.config b/src/Umbraco.Web.UI/config/ClientDependency.config index e09251e424..eb54627277 100644 --- a/src/Umbraco.Web.UI/config/ClientDependency.config +++ b/src/Umbraco.Web.UI/config/ClientDependency.config @@ -10,7 +10,7 @@ NOTES: * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config * A new version will invalidate both client and server cache and create new persisted files --> - +