diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index d1e477624e..d26da3250f 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -259,19 +259,93 @@ default.aspx - - loadStarterKitDesigns.ascx + + InstallerRestService.aspx ASPXCodeBehind + + InstallerRestService.aspx + + + database.ascx + ASPXCodeBehind + + + database.ascx + + + defaultUser.ascx + ASPXCodeBehind + + + defaultUser.ascx + + + license.ascx + ASPXCodeBehind + + + license.ascx + + + renaming.ascx + ASPXCodeBehind + + + renaming.ascx + loadStarterKitDesigns.ascx + loadStarterKits.ascx ASPXCodeBehind loadStarterKits.ascx + + StarterKits.ascx + ASPXCodeBehind + + + StarterKits.ascx + + + loadStarterKitDesigns.ascx + ASPXCodeBehind + + + ASPXCodeBehind + + + theend.ascx + ASPXCodeBehind + + + theend.ascx + + + validatePermissions.ascx + ASPXCodeBehind + + + validatePermissions.ascx + + + welcome.ascx + ASPXCodeBehind + + + welcome.ascx + + + Title.ascx + ASPXCodeBehind + + + Title.ascx + PartialViewMacro.ascx @@ -1402,11 +1476,11 @@ - + - + diff --git a/src/Umbraco.Web.UI/config/ClientDependency.config b/src/Umbraco.Web.UI/config/ClientDependency.config index 91d1e0bb24..b69956ce6c 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 --> - + diff --git a/src/Umbraco.Web.UI/config/splashes/noNodes.aspx b/src/Umbraco.Web.UI/config/splashes/noNodes.aspx index 49ef40210c..84c0befdc6 100644 --- a/src/Umbraco.Web.UI/config/splashes/noNodes.aspx +++ b/src/Umbraco.Web.UI/config/splashes/noNodes.aspx @@ -72,12 +72,12 @@ - -
- Server: - - -
-
- Database name: - - -
-
- 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/umbraco.presentation/install/steps/database.ascx.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/database.ascx.cs index 8a57ad3b92..c4cbd87a31 100644 --- a/src/Umbraco.Web/umbraco.presentation/install/steps/database.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/install/steps/database.ascx.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Configuration; using System.Data.Common; using System.Web.UI.WebControls; @@ -15,6 +15,7 @@ namespace umbraco.presentation.install.steps /// /// Database detection step in the installer wizard. /// + [Obsolete("This class is no longer used and will be removed from the codebase in the future. The UserControl Umbraco.Web.UI.Install.Steps.Database has superceded this.")] public partial class detect : System.Web.UI.UserControl { /// @@ -138,7 +139,7 @@ namespace umbraco.presentation.install.steps { DatabaseType.SelectedValue = "SqlServer"; } - + DatabaseType_SelectedIndexChanged(this, new EventArgs()); // Prepare other fields @@ -251,5 +252,230 @@ namespace umbraco.presentation.install.steps { Helper.RedirectToNextStep(this.Page); } + + /// + /// 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; + + /// + /// 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; } } \ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/install/steps/database.ascx.resx b/src/Umbraco.Web/umbraco.presentation/install/steps/database.ascx.resx deleted file mode 100644 index c31621308d..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/install/steps/database.ascx.resx +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 1.3 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - False - - - Private - - - True - - \ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/install/steps/defaultUser.ascx b/src/Umbraco.Web/umbraco.presentation/install/steps/defaultUser.ascx deleted file mode 100644 index 5ada28686d..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/install/steps/defaultUser.ascx +++ /dev/null @@ -1,87 +0,0 @@ -<%@ Control Language="c#" AutoEventWireup="True" Codebehind="defaultUser.ascx.cs" Inherits="umbraco.presentation.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/umbraco.presentation/install/steps/defaultUser.ascx.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/defaultUser.ascx.cs index 16df5f2c40..6314077ed6 100644 --- a/src/Umbraco.Web/umbraco.presentation/install/steps/defaultUser.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/install/steps/defaultUser.ascx.cs @@ -1,4 +1,4 @@ -#region namespace +#region namespace using System; using System.Data; using System.Drawing; @@ -8,44 +8,45 @@ using System.Web.UI.HtmlControls; using System.Web.Security; using umbraco.BusinessLogic; using umbraco.providers; -using System.Collections.Specialized; +using System.Collections.Specialized; #endregion namespace umbraco.presentation.install.steps { - /// - /// Summary description for defaultUser. - /// - public partial class defaultUser : System.Web.UI.UserControl - { + /// + /// Summary description for defaultUser. + /// + [Obsolete("This class is no longer used and will be removed from the codebase in the future. The UserControl that supercedes this is Umbraco.Web.UI.Install.Steps.DefaultUser")] + public partial class defaultUser : System.Web.UI.UserControl + { - protected void Page_Load(object sender, System.EventArgs e) - { - - } + protected void Page_Load(object sender, System.EventArgs e) + { - #region Web Form Designer generated code - override protected void OnInit(EventArgs e) - { - // - // CODEGEN: This call is required by the ASP.NET Web Form Designer. - // - InitializeComponent(); - base.OnInit(e); - } - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { + } - } - #endregion + #region Web Form Designer generated code + override protected void OnInit(EventArgs e) + { + // + // CODEGEN: This call is required by the ASP.NET Web Form Designer. + // + InitializeComponent(); + base.OnInit(e); + } - protected void changePassword_Click(object sender, System.EventArgs e) - { + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + + } + #endregion + + protected void changePassword_Click(object sender, System.EventArgs e) + { Page.Validate(); if (Page.IsValid) @@ -95,9 +96,9 @@ namespace umbraco.presentation.install.steps if (String.IsNullOrWhiteSpace(GlobalSettings.ConfigurationStatus)) BasePages.UmbracoEnsuredPage.doLogin(u); - Helper.RedirectToNextStep(this.Page); + Helper.RedirectToNextStep(this.Page); } - } + } private void SubscribeToNewsLetter(string name, string email) { @@ -113,5 +114,68 @@ namespace umbraco.presentation.install.steps } catch { /* fail in silence */ } } - } + + /// + /// 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; + + /// + /// 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/umbraco.presentation/install/steps/defaultUser.ascx.resx b/src/Umbraco.Web/umbraco.presentation/install/steps/defaultUser.ascx.resx deleted file mode 100644 index c31621308d..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/install/steps/defaultUser.ascx.resx +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 1.3 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - False - - - Private - - - True - - \ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/install/steps/license.ascx b/src/Umbraco.Web/umbraco.presentation/install/steps/license.ascx deleted file mode 100644 index eb78671e79..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/install/steps/license.ascx +++ /dev/null @@ -1,24 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="license.ascx.cs" Inherits="umbraco.presentation.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/umbraco.presentation/install/steps/license.ascx.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/license.ascx.cs index dd26da62cc..741ffe9ed5 100644 --- a/src/Umbraco.Web/umbraco.presentation/install/steps/license.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/install/steps/license.ascx.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Data; using System.Configuration; using System.Collections; @@ -11,6 +11,7 @@ using System.Web.UI.HtmlControls; namespace umbraco.presentation.install.steps { + [Obsolete("This class is no longer used and will be removed from the codebase in the future. The UserControl that supercedes this is Umbraco.Web.UI.Install.Steps.License")] public partial class license : System.Web.UI.UserControl { protected void Page_Load(object sender, EventArgs e) @@ -18,8 +19,18 @@ namespace umbraco.presentation.install.steps } - protected void gotoNextStep(object sender, EventArgs e) { - Helper.RedirectToNextStep(this.Page); + protected void gotoNextStep(object sender, EventArgs e) + { + Helper.RedirectToNextStep(this.Page); } + + /// + /// 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; } } \ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/install/steps/renaming.ascx b/src/Umbraco.Web/umbraco.presentation/install/steps/renaming.ascx deleted file mode 100644 index 0e782032ab..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/install/steps/renaming.ascx +++ /dev/null @@ -1,25 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="renaming.ascx.cs" Inherits="umbraco.presentation.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/umbraco.presentation/install/steps/renaming.ascx.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/renaming.ascx.cs index 9bb98e48fc..09498e2a15 100644 --- a/src/Umbraco.Web/umbraco.presentation/install/steps/renaming.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/install/steps/renaming.ascx.cs @@ -10,6 +10,8 @@ using umbraco.IO; namespace umbraco.presentation.install.steps { + + [Obsolete("This class is no longer used and will be removed from the codebase in the future. The UserControl that supercedes this is Umbraco.Web.UI.Install.Steps.Renaming")] public partial class renaming : System.Web.UI.UserControl { private string _oldAccessFilePath = IO.IOHelper.MapPath(IO.SystemDirectories.Data + "/access.xml"); @@ -169,5 +171,68 @@ namespace umbraco.presentation.install.steps return xsltExt.SelectNodes("//" + elementName); } + + /// + /// 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; } } \ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/install/steps/skinning.ascx b/src/Umbraco.Web/umbraco.presentation/install/steps/skinning.ascx deleted file mode 100644 index 9dea7dd8a6..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/install/steps/skinning.ascx +++ /dev/null @@ -1,140 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="skinning.ascx.cs" Inherits="umbraco.presentation.install.steps.skinning" %> - - - - - - - - - - - - - -
-
-

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 such as blogs or image galleries.
- Mouse over the icons to learn more about what the starter kits will install.

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

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/umbraco.presentation/install/steps/skinning.ascx.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/skinning.ascx.cs index c0246e01d0..440034b62c 100644 --- a/src/Umbraco.Web/umbraco.presentation/install/steps/skinning.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/install/steps/skinning.ascx.cs @@ -8,6 +8,7 @@ using umbraco.IO; namespace umbraco.presentation.install.steps { + [Obsolete("This class is no longer used and will be removed from the codebase in the future. The UserControl that supercedes this is Umbraco.Web.UI.Install.Steps.StarterKits")] public partial class skinning : System.Web.UI.UserControl { protected void Page_Load(object sender, EventArgs e) @@ -22,7 +23,7 @@ namespace umbraco.presentation.install.steps { base.OnInit(e); - + } private void showStarterKits() @@ -32,7 +33,7 @@ namespace umbraco.presentation.install.steps pl_starterKit.Visible = true; pl_starterKitDesign.Visible = false; - + } public void showStarterKitDesigns(Guid starterKitGuid) @@ -59,5 +60,50 @@ namespace umbraco.presentation.install.steps { Helper.RedirectToNextStep(this.Page); } + + /// + /// udp control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected 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; } } \ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx b/src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx deleted file mode 100644 index f9c6f30107..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx +++ /dev/null @@ -1,68 +0,0 @@ -<%@ Control Language="c#" AutoEventWireup="True" CodeBehind="theend.ascx.cs" Inherits="umbraco.presentation.install.steps.theend" - TargetSchema="http://schemas.microsoft.com/intellisense/ie5" %> - - - - -
-
-

- You’re done...now what?

-

- Excellent, you are now ready to start using Umbraco, one of the worlds most popular open - source .NET CMS. -
- If you installed a starter kit you can start by configuring your new site, just click "Preview your new website" and follow the instructions. Or to start adding content right away click "Set up your new website"

- -
-
-
-  
-
- - - -
-
-
diff --git a/src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx.cs index 66d88de694..e1775fa5c5 100644 --- a/src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx.cs @@ -1,4 +1,4 @@ -using System.IO; +using System.IO; using Umbraco.Core.Configuration; using Umbraco.Core.IO; using umbraco.BusinessLogic; @@ -11,11 +11,12 @@ using System.Web.UI.HtmlControls; namespace umbraco.presentation.install.steps { - + /// /// Summary description for theend. /// + [Obsolete("This class is no longer used and will be removed from the codebase in the future. The UserControl that supercedes this is Umbraco.Web.UI.Install.Steps.TheEnd")] public partial class theend : System.Web.UI.UserControl { @@ -60,5 +61,14 @@ namespace umbraco.presentation.install.steps { } #endregion + + /// + /// customizeSite control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl customizeSite; } } diff --git a/src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx.resx b/src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx.resx deleted file mode 100644 index dd0ea4d8e3..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx.resx +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 1.0.0.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - diff --git a/src/Umbraco.Web/umbraco.presentation/install/steps/validatePermissions.ascx b/src/Umbraco.Web/umbraco.presentation/install/steps/validatePermissions.ascx deleted file mode 100644 index 3a4d28b270..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/install/steps/validatePermissions.ascx +++ /dev/null @@ -1,101 +0,0 @@ -<%@ Control Language="c#" AutoEventWireup="True" Codebehind="validatePermissions.ascx.cs" Inherits="umbraco.presentation.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

-

Watch our video tutorial on setting up folder permissions for umbraco or read the text version.

- - -
- - Watch: Setting up folder permissions -
- - - - - -
-
 
- Continue anyway -
\ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/install/steps/validatePermissions.ascx.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/validatePermissions.ascx.cs index 2163e7affd..7a78e3389a 100644 --- a/src/Umbraco.Web/umbraco.presentation/install/steps/validatePermissions.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/install/steps/validatePermissions.ascx.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Web.UI; using umbraco.IO; @@ -8,11 +8,12 @@ namespace umbraco.presentation.install.steps /// /// Summary description for validatePermissions. /// + [Obsolete("This class is no longer used and will be removed from the codebase in the future. The UserControl that supercedes this is Umbraco.Web.UI.Install.Steps.ValidatePermissions")] public partial class validatePermissions : UserControl { - private string[] permissionDirs = {SystemDirectories.Css, SystemDirectories.Config, SystemDirectories.Data, SystemDirectories.Media, SystemDirectories.Masterpages, SystemDirectories.MacroScripts, SystemDirectories.Xslt, SystemDirectories.Usercontrols, SystemDirectories.Preview}; + private string[] permissionDirs = { SystemDirectories.Css, SystemDirectories.Config, SystemDirectories.Data, SystemDirectories.Media, SystemDirectories.Masterpages, SystemDirectories.MacroScripts, SystemDirectories.Xslt, SystemDirectories.Usercontrols, SystemDirectories.Preview }; private string[] permissionFiles = { }; - private string[] packagesPermissionsDirs = {SystemDirectories.Bin, SystemDirectories.Umbraco, SystemDirectories.Usercontrols, SystemDirectories.Packages}; + private string[] packagesPermissionsDirs = { SystemDirectories.Bin, SystemDirectories.Umbraco, SystemDirectories.Usercontrols, SystemDirectories.Packages }; protected void Page_Load(object sender, EventArgs e) { @@ -25,8 +26,8 @@ namespace umbraco.presentation.install.steps // Test default dir permissions foreach (string dir in permissionDirs) { - bool result = SaveAndDeleteFile( IOHelper.MapPath( dir + "/configWizardPermissionTest.txt") ); - + bool result = SaveAndDeleteFile(IOHelper.MapPath(dir + "/configWizardPermissionTest.txt")); + if (!result) { permissionsOK = false; @@ -40,7 +41,7 @@ namespace umbraco.presentation.install.steps // Test default file permissions foreach (string file in permissionFiles) { - bool result = OpenFileForWrite( IOHelper.MapPath(file) ); + bool result = OpenFileForWrite(IOHelper.MapPath(file)); if (!result) { permissionsOK = false; @@ -57,7 +58,7 @@ namespace umbraco.presentation.install.steps foreach (string dir in packagesPermissionsDirs) { bool result = - SaveAndDeleteFile( IOHelper.MapPath(dir + "/configWizardPermissionTest.txt")); + SaveAndDeleteFile(IOHelper.MapPath(dir + "/configWizardPermissionTest.txt")); if (!result) { packageOK = false; @@ -90,7 +91,7 @@ namespace umbraco.presentation.install.steps // Test creation of folders try { - string tempDir = IOHelper.MapPath( SystemDirectories.Media + "/testCreatedByConfigWizard" ); + string tempDir = IOHelper.MapPath(SystemDirectories.Media + "/testCreatedByConfigWizard"); Directory.CreateDirectory(tempDir); Directory.Delete(tempDir); foldersResult.Text = "Success!"; @@ -105,15 +106,17 @@ namespace umbraco.presentation.install.steps if (permissionsOK) { foreach ( - FileInfo configFile in new DirectoryInfo( IOHelper.MapPath( SystemDirectories.Config )).GetFiles("*.xml")) + FileInfo configFile in new DirectoryInfo(IOHelper.MapPath(SystemDirectories.Config)).GetFiles("*.xml")) { - try { + try + { if (File.Exists(configFile.FullName.Replace(".xml", ".config"))) File.Delete(configFile.FullName.Replace(".xml", ".config")); configFile.MoveTo(configFile.FullName.Replace(".xml", ".config")); - }catch{} - + } + catch { } + } } @@ -175,7 +178,7 @@ namespace umbraco.presentation.install.steps { try { - File.AppendText(file).Close(); + File.AppendText(file).Close(); } catch { @@ -209,5 +212,122 @@ namespace umbraco.presentation.install.steps } #endregion + + /// + /// 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; } } \ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/install/steps/validatePermissions.ascx.resx b/src/Umbraco.Web/umbraco.presentation/install/steps/validatePermissions.ascx.resx deleted file mode 100644 index c31621308d..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/install/steps/validatePermissions.ascx.resx +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 1.3 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - False - - - Private - - - True - - \ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/install/steps/welcome.ascx b/src/Umbraco.Web/umbraco.presentation/install/steps/welcome.ascx deleted file mode 100644 index a0ce00d7f1..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/install/steps/welcome.ascx +++ /dev/null @@ -1,55 +0,0 @@ -<%@ Control Language="c#" AutoEventWireup="True" CodeBehind="welcome.ascx.cs" Inherits="umbraco.presentation.install.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) %> -

-

- 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/umbraco.presentation/install/steps/welcome.ascx.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/welcome.ascx.cs index bb5b765a8c..246924e4e0 100644 --- a/src/Umbraco.Web/umbraco.presentation/install/steps/welcome.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/install/steps/welcome.ascx.cs @@ -1,16 +1,16 @@ -using System; +using System; using Umbraco.Core; namespace umbraco.presentation.install { - /// - /// Summary description for welcome. - /// - public partial class welcome : System.Web.UI.UserControl - { + /// + /// Summary description for welcome. + /// + public partial class welcome : System.Web.UI.UserControl + { - protected void Page_Load(object sender, System.EventArgs e) - { + protected void Page_Load(object sender, System.EventArgs e) + { var result = ApplicationContext.Current.DatabaseContext.ValidateDatabaseSchema(); var determinedVersion = result.DetermineInstalledVersion(); @@ -20,7 +20,7 @@ namespace umbraco.presentation.install ph_install.Visible = false; ph_upgrade.Visible = true; } - + // Check for config! if (GlobalSettings.Configured) { @@ -29,31 +29,59 @@ namespace umbraco.presentation.install Application.UnLock(); Response.Redirect(Request.QueryString["url"] ?? "/", true); } - } + } - protected void gotoNextStep(object sender, EventArgs e) { - Helper.RedirectToNextStep(this.Page); + protected void gotoNextStep(object sender, EventArgs e) + { + Helper.RedirectToNextStep(this.Page); + } + + #region Web Form Designer generated code + override protected void OnInit(EventArgs e) + { + // + // CODEGEN: This call is required by the ASP.NET Web Form Designer. + // + InitializeComponent(); + base.OnInit(e); + } + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + } + #endregion + + /// + /// 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; } - #region Web Form Designer generated code - override protected void OnInit(EventArgs e) - { - // - // CODEGEN: This call is required by the ASP.NET Web Form Designer. - // - InitializeComponent(); - base.OnInit(e); - } - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - } - #endregion - } - } diff --git a/src/Umbraco.Web/umbraco.presentation/install/steps/welcome.ascx.resx b/src/Umbraco.Web/umbraco.presentation/install/steps/welcome.ascx.resx deleted file mode 100644 index dd0ea4d8e3..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/install/steps/welcome.ascx.resx +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 1.0.0.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - diff --git a/src/Umbraco.Web/umbraco.presentation/install/utills/FilePermissions.cs b/src/Umbraco.Web/umbraco.presentation/install/utills/FilePermissions.cs index 327f5ed30b..61ef23105b 100644 --- a/src/Umbraco.Web/umbraco.presentation/install/utills/FilePermissions.cs +++ b/src/Umbraco.Web/umbraco.presentation/install/utills/FilePermissions.cs @@ -2,22 +2,21 @@ using System.Collections.Generic; using System.Linq; using System.Web; -using umbraco.IO; using System.IO; +using Umbraco.Core.IO; namespace umbraco.presentation.install.utills { - - + [Obsolete("This is no longer used and will be removed from the codebase in the future. Has been superceded by Umbraco.Web.Install.FilePermissionHelper but this is marked internal it is not to be used in external code.")] public class FilePermissions { - public static string[] permissionDirs = { SystemDirectories.Css, SystemDirectories.Config, SystemDirectories.Data, SystemDirectories.Media, SystemDirectories.Masterpages, SystemDirectories.Xslt, SystemDirectories.Usercontrols, SystemDirectories.Preview }; + public static string[] permissionDirs = { SystemDirectories.Css, SystemDirectories.Config, SystemDirectories.Data, SystemDirectories.Media, SystemDirectories.Masterpages, SystemDirectories.Xslt, SystemDirectories.UserControls, SystemDirectories.Preview }; public static string[] permissionFiles = { }; - public static string[] packagesPermissionsDirs = { SystemDirectories.Bin, SystemDirectories.Umbraco, SystemDirectories.Usercontrols, SystemDirectories.Packages }; + public static string[] packagesPermissionsDirs = { SystemDirectories.Bin, SystemDirectories.Umbraco, SystemDirectories.UserControls, SystemDirectories.Packages }; public static bool RunFilePermissionTestSuite() { - Dictionary newReport = new Dictionary(); + var newReport = new Dictionary(); if (!TestDirectories(permissionDirs, ref newReport)) return false; @@ -107,14 +106,6 @@ namespace umbraco.presentation.install.utills } } - private static string successOrFailure(bool result) - { - if (result) - return "Success"; - else - return "Failure"; - } - private static bool SaveAndDeleteFile(string file) { try diff --git a/src/Umbraco.Web/umbraco.presentation/install/utills/Helper.cs b/src/Umbraco.Web/umbraco.presentation/install/utills/Helper.cs index 7a48656387..e02dd8b812 100644 --- a/src/Umbraco.Web/umbraco.presentation/install/utills/Helper.cs +++ b/src/Umbraco.Web/umbraco.presentation/install/utills/Helper.cs @@ -5,51 +5,58 @@ using System.Web; using System.Web.Script.Serialization; using System.Web.UI; -namespace umbraco.presentation.install { - public static class Helper { +namespace umbraco.presentation.install +{ - public static void RedirectToNextStep(Page page) { - _default d = (_default)page; - d.GotoNextStep(d.step.Value); - } - - public static void RedirectToLastStep(Page page) + [Obsolete("This is no longer used and will be removed from the codebase in the future. Has been superceded by Umbraco.Web.Install.InstallHelper but this is marked internal it is not to be used in external code.")] + public static class Helper { - _default d = (_default)page; - d.GotoLastStep(); + + public static void RedirectToNextStep(Page page) + { + _default d = (_default)page; + d.GotoNextStep(d.step.Value); + } + + public static void RedirectToLastStep(Page page) + { + _default d = (_default)page; + d.GotoLastStep(); + } + + + private static int m_Percentage = -1; + public static int Percentage { get { return m_Percentage; } set { m_Percentage = value; } } + + public static string Description { get; set; } + public static string Error { get; set; } + + + public static void clearProgress() + { + Percentage = -1; + Description = string.Empty; + Error = string.Empty; + } + + public static void setProgress(int percent, string description, string error) + { + if (percent > 0) + Percentage = percent; + + Description = description; + Error = error; + } + + public static string getProgress() + { + ProgressResult pr = new ProgressResult(Percentage, Description, Error); + JavaScriptSerializer js = new JavaScriptSerializer(); + return js.Serialize(pr); + } } - - private static int m_Percentage = -1; - public static int Percentage { get { return m_Percentage; } set { m_Percentage = value; } } - - public static string Description { get; set; } - public static string Error { get; set; } - - - public static void clearProgress() - { - Percentage = -1; - Description = string.Empty; - Error = string.Empty; - } - - public static void setProgress(int percent, string description, string error) - { - if (percent > 0) - Percentage = percent; - - Description = description; - Error = error; - } - - public static string getProgress(){ - ProgressResult pr = new ProgressResult(Percentage, Description, Error); - JavaScriptSerializer js = new JavaScriptSerializer(); - return js.Serialize(pr); - } - } - + [Obsolete("This class is no longer used and will be removed from the codebase in future versions. It is superceded by Umbraco.Web.Install.ProgressResult but is internal and not to be used in external code.")] public class ProgressResult { public string Error { get; set; } @@ -57,7 +64,7 @@ namespace umbraco.presentation.install { public string Description { get; set; } public ProgressResult() { - + } public ProgressResult(int percentage, string description, string error) diff --git a/src/Umbraco.Web/umbraco.presentation/install/utills/p.aspx b/src/Umbraco.Web/umbraco.presentation/install/utills/p.aspx deleted file mode 100644 index 2c37a07bb9..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/install/utills/p.aspx +++ /dev/null @@ -1 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="p.aspx.cs" Inherits="umbraco.presentation.install.utills.p" %> \ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/install/utills/p.aspx.cs b/src/Umbraco.Web/umbraco.presentation/install/utills/p.aspx.cs index d44285e93d..e5247b19f6 100644 --- a/src/Umbraco.Web/umbraco.presentation/install/utills/p.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/install/utills/p.aspx.cs @@ -8,11 +8,12 @@ using Umbraco.Core.Logging; namespace umbraco.presentation.install.utills { + [Obsolete("This class is no longer used and will be removed in future version. The page Umbraco.Web.UI.Install.DatabaseRestService supercedes this.")] public partial class p : System.Web.UI.Page { protected void Page_Load(object sender, EventArgs e) { - LogHelper.Info

(string.Format("Hitting Page_Load on p.aspx for the requested '{0}' feed", Request.QueryString["feed"])); + LogHelper.Info

(string.Format("Hitting Page_Load on InstallerRestService.aspx for the requested '{0}' feed", Request.QueryString["feed"])); // Stop Caching in IE Response.Cache.SetCacheability(System.Web.HttpCacheability.NoCache); @@ -60,7 +61,7 @@ namespace umbraco.presentation.install.utills LogHelper.Info

("Running 'installOrUpgrade' service"); var result = ApplicationContext.Current.DatabaseContext.CreateDatabaseSchemaAndDataOrUpgrade(); - + // Remove legacy umbracoDbDsn configuration setting if it exists and connectionstring also exists if (ConfigurationManager.ConnectionStrings[Umbraco.Core.Configuration.GlobalSettings.UmbracoConnectionName] != null) { diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/StarterKits.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/StarterKits.aspx.cs index e53e704762..1417a79d67 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/StarterKits.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/StarterKits.aspx.cs @@ -9,6 +9,7 @@ using umbraco.IO; namespace umbraco.presentation.umbraco.developer.Packages { + [Obsolete("This class is no longer used and will be removed in future version. The page that supercedes this is Umbraco.Web.UI.Umbraco.Developer.Packages.StarterKits")] public partial class StarterKits : UmbracoEnsuredPage { protected void Page_Load(object sender, EventArgs e) diff --git a/src/umbraco.businesslogic/BasePages/BasePage.cs b/src/umbraco.businesslogic/BasePages/BasePage.cs index cc4148a0da..7f4a1a9159 100644 --- a/src/umbraco.businesslogic/BasePages/BasePage.cs +++ b/src/umbraco.businesslogic/BasePages/BasePage.cs @@ -143,6 +143,7 @@ namespace umbraco.BasePages ///

/// The umbraco user context ID. /// + [Obsolete("Use Umbraco.Web.Security.WebSecurity.GetUserId instead")] public static int GetUserId(string umbracoUserContextID) { try @@ -175,8 +176,9 @@ namespace umbraco.BasePages /// /// Validates the user context ID. /// - /// The umbraco user context ID. + /// The umbraco user context ID. /// + [Obsolete("Use Umbraco.Web.Security.WebSecurity.ValidateUserContextId instead")] public static bool ValidateUserContextID(string currentUmbracoUserContextID) { if ((currentUmbracoUserContextID != "")) @@ -215,12 +217,13 @@ namespace umbraco.BasePages } - public static long GetTimeout(bool byPassCache) + [Obsolete("Use Umbraco.Web.Security.WebSecurity.GetTimeout instead")] + public static long GetTimeout(bool bypassCache) { if (UmbracoSettings.KeepUserLoggedIn) RenewLoginTimeout(); - if (byPassCache) + if (bypassCache) { return SqlHelper.ExecuteScalar("select timeout from umbracoUserLogins where contextId=@contextId", SqlHelper.CreateParameter("@contextId", new Guid(umbracoUserContextID)) @@ -235,6 +238,7 @@ namespace umbraco.BasePages /// Gets or sets the umbraco user context ID. /// /// The umbraco user context ID. + [Obsolete("Use Umbraco.Web.Security.WebSecurity.UmbracoUserContextId instead")] public static string umbracoUserContextID { get @@ -335,6 +339,7 @@ namespace umbraco.BasePages SqlHelper.CreateParameter("@contextId", umbracoUserContextID)); } + [Obsolete("Use Umbraco.Web.Security.WebSecurity.RenewLoginTimeout instead")] public static void RenewLoginTimeout() { // only call update if more than 1/10 of the timeout has passed @@ -348,6 +353,7 @@ namespace umbraco.BasePages /// Logs a user in. /// /// The user + [Obsolete("Use Umbraco.Web.Security.WebSecurity.PerformLogin instead")] public static void doLogin(User u) { Guid retVal = Guid.NewGuid(); @@ -359,7 +365,6 @@ namespace umbraco.BasePages umbracoUserContextID = retVal.ToString(); LogHelper.Info("User {0} (Id: {1}) logged in", () => u.Name, () => u.Id); - } @@ -396,6 +401,7 @@ namespace umbraco.BasePages /// /// a collection of available speechbubble icons /// + [Obsolete("This is no longer in use, it has been superceded by Umbraco.Web.UI.SpeechBubbleIcon")] public enum speechBubbleIcon { /// diff --git a/src/umbraco.cms/businesslogic/installer/IInstallerStep.cs b/src/umbraco.cms/businesslogic/installer/IInstallerStep.cs index 54909eef96..a64d13c576 100644 --- a/src/umbraco.cms/businesslogic/installer/IInstallerStep.cs +++ b/src/umbraco.cms/businesslogic/installer/IInstallerStep.cs @@ -1,6 +1,7 @@ using System; namespace umbraco.cms.businesslogic.installer { + [Obsolete("This is no longer used and will be removed from the codebase in future versions.")] interface IInstallerStep { string Alias { get;} diff --git a/src/umbraco.cms/businesslogic/installer/InstallStepCollection.cs b/src/umbraco.cms/businesslogic/installer/InstallStepCollection.cs index f32b4d151d..04b674c51e 100644 --- a/src/umbraco.cms/businesslogic/installer/InstallStepCollection.cs +++ b/src/umbraco.cms/businesslogic/installer/InstallStepCollection.cs @@ -6,6 +6,8 @@ using System.Collections.Specialized; namespace umbraco.cms.businesslogic.installer { + + [Obsolete("This is no longer used and will be removed from the codebase in future versions. It has been superceded by Umbraco.Web.Install.InstallerStepCollection however that is marked internal and is not to be used in external code.")] public class InstallerStepCollection : Dictionary { public void Add(InstallerStep step){ diff --git a/src/umbraco.cms/businesslogic/installer/InstallerStep.cs b/src/umbraco.cms/businesslogic/installer/InstallerStep.cs index 9a72eaa906..58953143dc 100644 --- a/src/umbraco.cms/businesslogic/installer/InstallerStep.cs +++ b/src/umbraco.cms/businesslogic/installer/InstallerStep.cs @@ -5,6 +5,7 @@ using System.Text; namespace umbraco.cms.businesslogic.installer { + [Obsolete("This is no longer used and will be removed from the codebase in future versions. It has been superceded by Umbraco.Web.Install.InstallerStep however that is marked internal and is not to be used in external code.")] public abstract class InstallerStep : IInstallerStep { public abstract string Alias { get; }