From 7e70253e1ce96eef31d4240a935360f17da39070 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 19 Nov 2013 16:06:14 +0100
Subject: [PATCH] U4-3340 Installer: Make SQL CE Default option

---
 .../install/steps/Database.ascx.cs            | 24 +++++++++----------
 .../install/steps/database.ascx               | 21 ++++++----------
 2 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/src/Umbraco.Web.UI/install/steps/Database.ascx.cs b/src/Umbraco.Web.UI/install/steps/Database.ascx.cs
index e482c5c6fe..ede7132da0 100644
--- a/src/Umbraco.Web.UI/install/steps/Database.ascx.cs
+++ b/src/Umbraco.Web.UI/install/steps/Database.ascx.cs
@@ -38,21 +38,20 @@ namespace Umbraco.Web.UI.Install.Steps
             get { return DatabaseType.SelectedValue != ""; }
         }
 
-        /// <summary>
-        /// Returns whether the selected database is an embedded database.
-        /// </summary>
-        protected bool HasEmbeddedDatabaseFiles
+        protected bool IsNewInstall
         {
             get
             {
-                // check if sql ce is present
-                if (
-                    !File.Exists(IOHelper.MapPath(Path.Combine(IOHelper.ResolveUrl(SystemDirectories.Bin), "System.Data.SqlServerCe.dll"))) ||
-                    !File.Exists(IOHelper.MapPath(Path.Combine(IOHelper.ResolveUrl(SystemDirectories.Bin), "SQLCE4Umbraco.dll")))
-                    )
-                    return false;
-                else
+                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;
             }
         }
 
@@ -167,8 +166,7 @@ namespace Umbraco.Web.UI.Install.Steps
             toggleVisible(DatabasePasswordItem, !ManualConnectionString && !IsEmbeddedDatabase);
             toggleVisible(DatabaseNameItem, !ManualConnectionString && !IsEmbeddedDatabase);
 
-
-            if (IsEmbeddedDatabase)
+            if (IsNewInstall || IsEmbeddedDatabase)
                 dbinit.Text = "$('#databaseOptionEmbedded').click();$('#databaseOptionEmbedded').change();";
             else if (ManualConnectionString)
                 dbinit.Text = "$('#databaseOptionAdvanced').click();$('#databaseOptionAdvanced').change();";
diff --git a/src/Umbraco.Web.UI/install/steps/database.ascx b/src/Umbraco.Web.UI/install/steps/database.ascx
index 6b6f1c4496..f4ff5176db 100644
--- a/src/Umbraco.Web.UI/install/steps/database.ascx
+++ b/src/Umbraco.Web.UI/install/steps/database.ascx
@@ -26,13 +26,13 @@
 
                             <ul>
                                 <li>
-                                    <input type="radio" id="databaseOptionBlank" name="database" value="blank" />
-                                    <label for="databaseOptionBlank">I already have a blank SQL Server, SQL Azure or MySQL database</label>
+                                    <input type="radio" id="databaseOptionEmbedded" name="database" value="embedded" />
+                                    <label for="databaseOptionEmbedded">I want to use SQL CE 4, a free, quick-and-simple embedded database</label>
 
                                 </li>
                                 <li>
-                                    <input type="radio" id="databaseOptionEmbedded" name="database" value="embedded" />
-                                    <label for="databaseOptionEmbedded">I want to use SQL CE 4, a free, quick-and-simple embedded database</label>
+                                    <input type="radio" id="databaseOptionBlank" name="database" value="blank" />
+                                    <label for="databaseOptionBlank">I already have a blank SQL Server, SQL Azure or MySQL database</label>
 
                                 </li>
                                 <li>
@@ -253,7 +253,6 @@
         </div>
     </div>
     <script type="text/javascript">
-        var hasEmbeddedDlls = <%= HasEmbeddedDatabaseFiles.ToString().ToLower() %>;
         var currentVersion = '<%=UmbracoVersion.Current.ToString(3)%> <%=UmbracoVersion.CurrentComment%> ';
         var configured = <%= IsConfigured.ToString().ToLower() %>;
 
@@ -278,15 +277,9 @@
                     $(".database-option").hide();
                     $("#database-embedded").show();
 
-                    if (!hasEmbeddedDlls) {
-                        $('.embeddedError').show();
-                        $(".installbtn").hide();
-                    }
-                    else {
-                        $('.embedded').show();
-                        $(".installbtn").show();
-                    }
-	                    
+                    $('.embedded').show();
+                    $(".installbtn").show();
+                    
                     break;
                 case "advanced":
                     $(".database-option").hide();