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

Merge

Browse source
This commit is contained in:
Virtuworks 2015-05-04 07:26:29 -04:00
commit 117a8fa98d
8 changed files with 127 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

12
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/System/SystemController.cs
View file

@ -53,6 +53,18 @@ namespace WebsitePanel.EnterpriseServer
return GetSystemSettingsInternal(settingsName, !isDemoAccount);
}
public static SystemSettings GetSystemSettingsActive(string settingsName, bool decrypt)
{
// check account
int accountCheck = SecurityContext.CheckAccount(DemandAccount.IsActive);
if (accountCheck < 0)
return null;
bool isDemoAccount = (SecurityContext.CheckAccount(DemandAccount.NotDemo) < 0);
return GetSystemSettingsInternal(settingsName, decrypt && isDemoAccount);
}
internal static SystemSettings GetSystemSettingsInternal(string settingsName, bool decryptPassword)
{
// create settings object