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

Web.config section fix

Browse source
This commit is contained in:
vfedosevich 2014-12-30 04:04:27 -08:00
parent f5b41b5c85
commit 58b6b89ab0
10 changed files with 3 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel/Sources/WebsitePanel.WebDavPortal/App_Data/SiteSettings.config
View file

@ -3,7 +3,7 @@
<!-- Display Settings -->
<PortalName>WebsitePanel</PortalName>
<!-- Enterprise Server -->
<EnterpriseServer>http://localhost:9002</EnterpriseServer>
<EnterpriseServer>http://127.0.0.1:9555</EnterpriseServer>
<!-- General Settings -->
<CultureCookieName>UserCulture</CultureCookieName>
<ThemeCookieName>UserTheme</ThemeCookieName>

39
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/Entities/ConnectionStringsCollection.cs
View file

@ -1,39 +0,0 @@
using System.Collections.Generic;
using System.Configuration;
using System.Linq;
using WebsitePanel.WebDavPortal.WebConfigSections;
namespace WebsitePanel.WebDavPortal.Config.Entities
{
public class ConnectionStringsCollection : AbstractConfigCollection
{
private readonly IEnumerable<AppConnectionStringsElement> _appConnectionStringsElements;
public ConnectionStringsCollection()
{
_appConnectionStringsElements = ConfigSection.ConnectionStrings.Cast<AppConnectionStringsElement>();
}
public string WebDavServer
{
get
{
AppConnectionStringsElement connectionStr =
_appConnectionStringsElements.FirstOrDefault(
x => x.Key == AppConnectionStringsElement.WebdavConnectionStringKey);
return connectionStr != null ? connectionStr.ConnectionString : null;
}
}
public string LdapServer
{
get
{
AppConnectionStringsElement connectionStr =
_appConnectionStringsElements.FirstOrDefault(
x => x.Key == AppConnectionStringsElement.LdapConnectionStringKey);
return connectionStr != null ? connectionStr.ConnectionString : null;
}
}
}
}

1
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/IWebDavAppConfig.cs
View file

@ -8,7 +8,6 @@ namespace WebsitePanel.WebDavPortal.Config
string ApplicationName { get; }
ElementsRendering ElementsRendering { get; }
WebsitePanelConstantUserParameters WebsitePanelConstantUserParameters { get; }
ConnectionStringsCollection ConnectionStrings { get; }
SessionKeysCollection SessionKeys { get; }
FileIconsDictionary FileIcons { get; }
HttpErrorsCollection HttpErrors { get; }

2
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Config/WebDavAppConfigManager.cs
View file

@ -14,7 +14,6 @@ namespace WebsitePanel.WebDavPortal.Config
_configSection = ((WebDavExplorerConfigurationSettingsSection) ConfigurationManager.GetSection(WebDavExplorerConfigurationSettingsSection.SectionName));
WebsitePanelConstantUserParameters = new WebsitePanelConstantUserParameters();
ElementsRendering = new ElementsRendering();
ConnectionStrings = new ConnectionStringsCollection();
SessionKeys = new SessionKeysCollection();
FileIcons = new FileIconsDictionary();
HttpErrors = new HttpErrorsCollection();
@ -38,7 +37,6 @@ namespace WebsitePanel.WebDavPortal.Config
public ElementsRendering ElementsRendering { get; private set; }
public WebsitePanelConstantUserParameters WebsitePanelConstantUserParameters { get; private set; }
public ConnectionStringsCollection ConnectionStrings { get; private set; }
public SessionKeysCollection SessionKeys { get; private set; }
public FileIconsDictionary FileIcons { get; private set; }
public HttpErrorsCollection HttpErrors { get; private set; }

2
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Controllers/AccountController.cs
View file

@ -68,7 +68,7 @@ namespace WebsitePanel.WebDavPortal.Controllers
private void AutheticationToServicesUsingWebsitePanelUser()
{
var crypto = _kernel.Get<ICryptography>();
var websitePanelLogin = crypto.Decrypt(WebDavAppConfigManager.Instance.WebsitePanelConstantUserParameters.Login);
var websitePanelLogin = WebDavAppConfigManager.Instance.WebsitePanelConstantUserParameters.Login;
var websitePanelPassword = crypto.Decrypt(WebDavAppConfigManager.Instance.WebsitePanelConstantUserParameters.Password);
var authTicket = new FormsAuthenticationTicket(1, websitePanelLogin, DateTime.Now, DateTime.Now.Add(FormsAuthentication.Timeout),
FormsAuthentication.SlidingExpiration, websitePanelPassword + Environment.NewLine);

6
WebsitePanel/Sources/WebsitePanel.WebDavPortal/Web.config
View file

@ -25,11 +25,7 @@
<!--<userDomain value=""/>-->
<applicationName value="WebDAV Explorer"/>
<elementsRendering defaultCount="20" addElementsCount="20"/>
<websitePanelConstantUser login="8P5wdPdqguwaFOGe/Zn06idbqaeoa7ZhST/U0hFYrYA=" password="HtR7J8dtBhovYLigXNtVutxqpvaE48Z+FBIokWZlR/g=" />
<appConnectionStrings>
<add key="WebDavServerConnectionString" connectionString="http://webdavtest.com"/>
<add key="LdapServerConnectionString" connectionString="LDAP://itransition.corp"/>
</appConnectionStrings>
<websitePanelConstantUser login="serveradmin" password="HtR7J8dtBhovYLigXNtVutxqpvaE48Z+FBIokWZlR/g=" />
<sessionKeys>
<add key="AccountInfoSessionKey" value="AccountInfo"/>
<add key="WebDavManagerSessionKey" value="WebDavManager"/>

27
WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/AppConnectionStringsElement.cs
View file

@ -1,27 +0,0 @@
using System.Configuration;
namespace WebsitePanel.WebDavPortal.WebConfigSections
{
public class AppConnectionStringsElement : ConfigurationElement
{
private const string ConnectionStringKey = "key";
private const string ConnectionStringValue = "connectionString";
public const string WebdavConnectionStringKey = "WebDavServerConnectionString";
public const string LdapConnectionStringKey = "LdapServerConnectionString";
[ConfigurationProperty(ConnectionStringKey, IsKey = true, IsRequired = true)]
public string Key
{
get { return (string) this[ConnectionStringKey]; }
set { this[ConnectionStringKey] = value; }
}
[ConfigurationProperty(ConnectionStringValue, IsKey = true, IsRequired = true)]
public string ConnectionString
{
get { return (string) this[ConnectionStringValue]; }
set { this[ConnectionStringValue] = value; }
}
}
}

18
WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/AppConnectionStringsElementCollection.cs
View file

@ -1,18 +0,0 @@
using System.Configuration;
namespace WebsitePanel.WebDavPortal.WebConfigSections
{
[ConfigurationCollection(typeof (AppConnectionStringsElement))]
public class AppConnectionStringsElementCollection : ConfigurationElementCollection
{
protected override ConfigurationElement CreateNewElement()
{
return new AppConnectionStringsElement();
}
protected override object GetElementKey(ConfigurationElement element)
{
return ((AppConnectionStringsElement) element).Key;
}
}
}

7
WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebConfigSections/WebDavExplorerConfigurationSettingsSection.cs
View file

@ -44,13 +44,6 @@ namespace WebsitePanel.WebDavPortal.WebConfigSections
set { this[ElementsRenderingKey] = value; }
}
[ConfigurationProperty(ConnectionStringsKey, IsDefaultCollection = false)]
public AppConnectionStringsElementCollection ConnectionStrings
{
get { return (AppConnectionStringsElementCollection) this[ConnectionStringsKey]; }
set { this[ConnectionStringsKey] = value; }
}
[ConfigurationProperty(SessionKeysKey, IsDefaultCollection = false)]
public SessionKeysElementCollection SessionKeys
{

3
WebsitePanel/Sources/WebsitePanel.WebDavPortal/WebsitePanel.WebDavPortal.csproj
View file

@ -143,7 +143,6 @@
<Compile Include="App_Start\FilterConfig.cs" />
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="Config\Entities\AbstractConfigCollection.cs" />
<Compile Include="Config\Entities\ConnectionStringsCollection.cs" />
<Compile Include="Config\Entities\ElementsRendering.cs" />
<Compile Include="Config\Entities\FileIconsDictionary.cs" />
<Compile Include="Config\Entities\HttpErrorsCollection.cs" />
@ -180,8 +179,6 @@
<Compile Include="Models\OfficeOnlineModel.cs" />
<Compile Include="Models\WebDavManager.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="WebConfigSections\AppConnectionStringsElement.cs" />
<Compile Include="WebConfigSections\AppConnectionStringsElementCollection.cs" />
<Compile Include="WebConfigSections\ApplicationNameElement.cs" />
<Compile Include="WebConfigSections\ElementsRenderingElement.cs" />
<Compile Include="WebConfigSections\FileIconsElement.cs" />