zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge commit

Browse source
This commit is contained in:
robvde 2013-10-15 21:38:03 +04:00
commit 346749ba4e
5 changed files with 41 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Packages/PackageController.cs
View file

@ -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);

3
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/WebServers/WebServerController.cs
View file

@ -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());
}
}

26
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/SystemEventHandlers.config
View file

@ -1,36 +1,36 @@
<?xml version="1.0"?>
<eventHandlers>
<task source="USER" name="ADD">
<handler type="WebsitePanel.EnterpriseServer.Tasks.SendEmailNotification, WebsitePanel.EnterpriseServer" />
<handler type="WebsitePanel.EnterpriseServer.Tasks.SendEmailNotification, WebsitePanel.EnterpriseServer.Code" />
</task>
<task source="HOSTING_SPACE" name="ADD">
<handler type="WebsitePanel.EnterpriseServer.Tasks.SendEmailNotification, WebsitePanel.EnterpriseServer" />
<handler type="WebsitePanel.EnterpriseServer.Tasks.SendEmailNotification, WebsitePanel.EnterpriseServer.Code" />
</task>
<task source="HOSTING_SPACE_WR" name="ADD">
<handler type="WebsitePanel.EnterpriseServer.Tasks.SendEmailNotification, WebsitePanel.EnterpriseServer" />
<handler type="WebsitePanel.EnterpriseServer.Tasks.SendEmailNotification, WebsitePanel.EnterpriseServer.Code" />
</task>
<task source="ECOMMERCE" name="ADD_INVOICE">
<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SendEmailNotification, WebsitePanel.EnterpriseServer" />
<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SystemTriggersAgent, WebsitePanel.EnterpriseServer" />
<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SendEmailNotification, WebsitePanel.EnterpriseServer.Code" />
<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SystemTriggersAgent, WebsitePanel.EnterpriseServer.Code" />
</task>
<task source="ECOMMERCE" name="ADD_CONTRACT">
<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SystemTriggersAgent, WebsitePanel.EnterpriseServer" />
<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SystemTriggersAgent, WebsitePanel.EnterpriseServer.Code" />
</task>
<task source="ECOMMERCE" name="ADD_PAYMENT">
<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SendEmailNotification, WebsitePanel.EnterpriseServer" />
<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SystemTriggersAgent, WebsitePanel.EnterpriseServer" />
<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SendEmailNotification, WebsitePanel.EnterpriseServer.Code" />
<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SystemTriggersAgent, WebsitePanel.EnterpriseServer.Code" />
</task>
<task source="ECOMMERCE" name="UPDATE_PAYMENT">
<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SendEmailNotification, WebsitePanel.EnterpriseServer" />
<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SystemTriggersAgent, WebsitePanel.EnterpriseServer" />
<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SendEmailNotification, WebsitePanel.EnterpriseServer.Code" />
<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SystemTriggersAgent, WebsitePanel.EnterpriseServer.Code" />
</task>
<task source="ECOMMERCE" name="SVC_ACTIVATE">
<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SendEmailNotification, WebsitePanel.EnterpriseServer" />
<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SendEmailNotification, WebsitePanel.EnterpriseServer.Code" />
</task>
<task source="ECOMMERCE" name="SVC_SUSPEND">
<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SendEmailNotification, WebsitePanel.EnterpriseServer" />
<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SendEmailNotification, WebsitePanel.EnterpriseServer.Code" />
</task>
<task source="ECOMMERCE" name="SVC_CANCEL">
<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SendEmailNotification, WebsitePanel.EnterpriseServer" />
<handler type="WebsitePanel.Ecommerce.EnterpriseServer.TaskEventHandlers.SendEmailNotification, WebsitePanel.EnterpriseServer.Code" />
</task>
</eventHandlers>

24
WebsitePanel/Sources/WebsitePanel.Server/Code/WPIHelper.cs
View file

@ -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<Installer> GetInstallers(List<Product> productsToInstall, Language lang)
{
Language defaultLang = GetLanguage(DeafultLanguage);
List<Installer> installersToUse = new List<Installer>();
foreach (Product product in productsToInstall)
{
Installer installer = product.GetInstaller(lang);
Installer installer = product.GetInstaller(lang) ?? product.GetInstaller(defaultLang);
if (null != installer)
{
installersToUse.Add(installer);

5
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SystemSettings.ascx.cs
View file

@ -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);
}