Fixed installation issues

Author: muratcakir

src/Presentation/SmartStore.Web.Framework/DependencyRegistrar.cs

@@ -415,7 +415,7 @@ protected override void Load(ContainerBuilder builder)
 						}
 						catch
 						{
-							//return new SmartObjectContext();
+							// return new SmartObjectContext();
 							return null;
 						}
 

src/Presentation/SmartStore.Web.Framework/Filters/HandleInstallFilter.cs

@@ -4,34 +4,28 @@
 
 namespace SmartStore.Web.Framework.Filters
 { 
-    public class HandleInstallFilter : IActionFilter
-    {
-        public void OnActionExecuting(ActionExecutingContext filterContext)
-        {
-            var controllerName = filterContext.ActionDescriptor.ControllerDescriptor.ControllerName;
-            var actionName = filterContext.ActionDescriptor.ActionName;
+    public class HandleInstallFilter : IAuthorizationFilter
+	{
+		public void OnAuthorization(AuthorizationContext filterContext)
+		{
+			var controllerName = filterContext.ActionDescriptor.ControllerDescriptor.ControllerName;
+			var actionName = filterContext.ActionDescriptor.ActionName;
 
-            if (controllerName == "Install" && actionName != "Index" && filterContext.HttpContext.Request.IsAjaxRequest())
-            {
-                // probably "progress" or "finalize" call
-                return;
-            }
+			if (controllerName == "Install" && actionName != "Index" && filterContext.HttpContext.Request.IsAjaxRequest())
+			{
+				// probably "progress" or "finalize" call
+				return;
+			}
 
-            if (!DataSettings.DatabaseIsInstalled() && controllerName != "Install")
-            {
-                filterContext.Result = new RedirectToRouteResult(
-                    new RouteValueDictionary {
-                        { "Controller", "Install" }, 
-                        { "Action", "Index" } 
-                    });
-            }
-        }
-        
-        public void OnActionExecuted(ActionExecutedContext filterContext)
-        {
-            // nada
-        }
-
-    }
+			if (!DataSettings.DatabaseIsInstalled() && controllerName != "Install")
+			{
+				filterContext.Result = new RedirectToRouteResult(
+					new RouteValueDictionary {
+						{ "Controller", "Install" },
+						{ "Action", "Index" }
+					});
+			}
+		}
+	}
 
 }

src/Presentation/SmartStore.Web.Framework/Validators/ValidatorLanguageManager.cs

@@ -3,18 +3,26 @@
 using System.Web.Hosting;
 using FluentValidation;
 using FluentValidation.Resources;
+using SmartStore.Core.Data;
 using SmartStore.Core.Infrastructure;
 using SmartStore.Services;
 
 namespace SmartStore.Web.Framework.Validators
 {
 	public class ValidatorLanguageManager : LanguageManager
 	{
+		private readonly bool _canResolveServices;
+
+		public ValidatorLanguageManager()
+		{
+			_canResolveServices = DataSettings.DatabaseIsInstalled() && HostingEnvironment.IsHosted;
+		}
+
 		public override string GetString(string key, CultureInfo culture = null)
 		{
 			string result = base.GetString(key, culture);
 
-			if (HostingEnvironment.IsHosted)
+			if (_canResolveServices)
 			{
 				// (Perf) although FV expects a culture parameter, we gonna ignore it.
 				// It's highly unlikely that it is anything different than our WorkingLanguage.

src/Presentation/SmartStore.Web/Controllers/HomeController.cs

@@ -48,8 +48,7 @@ public HomeController(
 			Lazy<CommonSettings> commonSettings,
 			Lazy<SeoSettings> seoSettings,
 			Lazy<CustomerSettings> customerSettings,
-			Lazy<PrivacySettings> privacySettings,
-			Services.Directory.ICountryService countryService)
+			Lazy<PrivacySettings> privacySettings)
         {
 			_categoryService = categoryService;
 			_productService = productService;

src/Presentation/SmartStore.Web/Global.asax.cs

@@ -164,7 +164,7 @@ protected void Application_Start()
 				// app not installed
 
 				// Install filter
-				GlobalFilters.Filters.Add(new HandleInstallFilter());
+				GlobalFilters.Filters.Add(new HandleInstallFilter(), -1000);
 			}
 		}