diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Packages/PackageController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Packages/PackageController.cs
index b8532151..522ab4e6 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Packages/PackageController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Packages/PackageController.cs
@@ -619,7 +619,7 @@ namespace WebsitePanel.EnterpriseServer
BackgroundTask topTask = TaskManager.TopTask;
- topTask.ItemId = userId;
+ topTask.ItemId = result.Result;
topTask.UpdateParamValue("SendLetter", sendLetter);
TaskController.UpdateTaskWithParams(topTask);
@@ -724,7 +724,7 @@ namespace WebsitePanel.EnterpriseServer
BackgroundTask topTask = TaskManager.TopTask;
- topTask.ItemId = userId;
+ topTask.ItemId = result.Result;
topTask.UpdateParamValue("Signup", signup);
topTask.UpdateParamValue("UserId", userId);
topTask.UpdateParamValue("SendLetter", sendLetter);
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebServers/WebServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebServers/WebServerController.cs
index 78bda188..c46671c9 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebServers/WebServerController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebServers/WebServerController.cs
@@ -3488,7 +3488,8 @@ namespace WebsitePanel.EnterpriseServer
}
catch(Exception e)
{
- TaskManager.WriteWarning("Error on enabling zoo engines for site '{0}': {1}", siteId, e.ToString());
+ // TODO: write to right place debug warning message
+ // TaskManager.WriteWarning("Error on enabling zoo engines for site '{0}': {1}", siteId, e.ToString());
}
}
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/SystemEventHandlers.config b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/SystemEventHandlers.config
index 156bd913..50c56886 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/SystemEventHandlers.config
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/SystemEventHandlers.config
@@ -1,36 +1,36 @@
-
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
diff --git a/WebsitePanel/Sources/WebsitePanel.Server/Code/WPIHelper.cs b/WebsitePanel/Sources/WebsitePanel.Server/Code/WPIHelper.cs
index 11efc0b7..a6b84657 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server/Code/WPIHelper.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Server/Code/WPIHelper.cs
@@ -520,7 +520,7 @@ namespace WebsitePanel.Server.Code
{
Product app = GetProduct(appId);
- Installer appInstaller = app.GetInstaller(GetLanguage(languageId));
+ Installer appInstaller = GetInstaller(languageId, app);
WpiAppInstallLogger logger = new WpiAppInstallLogger();
/*
@@ -586,6 +586,25 @@ namespace WebsitePanel.Server.Code
return !logger.IsFailed;
}
+ private Installer GetInstaller(string languageId, Product product)
+ {
+ Installer installer = product.GetInstaller(GetLanguage(languageId));
+ if (null == installer)
+ {
+ installer = product.GetInstaller(GetLanguage(DeafultLanguage));
+ if (null == installer)
+ {
+ throw new Exception(
+ string.Format(
+ "Could not get installer for product '{0}', language: {1}, default language: {2}",
+ product.Title, languageId, DeafultLanguage)
+ );
+ }
+ }
+
+ return installer;
+ }
+
#endregion
#endregion Public interface
@@ -701,10 +720,11 @@ namespace WebsitePanel.Server.Code
private List GetInstallers(List productsToInstall, Language lang)
{
+ Language defaultLang = GetLanguage(DeafultLanguage);
List installersToUse = new List();
foreach (Product product in productsToInstall)
{
- Installer installer = product.GetInstaller(lang);
+ Installer installer = product.GetInstaller(lang) ?? product.GetInstaller(defaultLang);
if (null != installer)
{
installersToUse.Add(installer);
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SystemSettings.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SystemSettings.ascx.cs
index 8d07c97d..c55eeb8a 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SystemSettings.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SystemSettings.ascx.cs
@@ -125,10 +125,9 @@ namespace WebsitePanel.Portal
}
// FILE MANAGER
- settings = ES.Services.System.GetSystemSettings(
- WSP.SystemSettings.FILEMANAGER_SETTINGS);
+ settings = ES.Services.System.GetSystemSettings(WSP.SystemSettings.FILEMANAGER_SETTINGS);
- if (settings != null)
+ if (settings != null && !String.IsNullOrEmpty(settings[FILE_MANAGER_EDITABLE_EXTENSIONS]))
{
txtFileManagerEditableExtensions.Text = settings[FILE_MANAGER_EDITABLE_EXTENSIONS].Replace(",", System.Environment.NewLine);
}