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

Helicon Ape module & handler names fixed

Browse source
This commit is contained in:
ruslanht 2012-12-27 12:52:44 +02:00
parent f2bdb13d34
commit 9810f1cd74
1 changed files with 28 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

53
WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/IIs70.cs
View file

@ -101,7 +101,11 @@ namespace WebsitePanel.Providers.Web
public const string DOTNETPANEL_IISMODULES = "DotNetPanel.IIsModules"; public const string DOTNETPANEL_IISMODULES = "DotNetPanel.IIsModules";
public const string HeliconApeModulePrevName = "Helicon Ape";
// true module name
public const string HeliconApeModule = "Helicon.Ape"; public const string HeliconApeModule = "Helicon.Ape";
// true handler name
public const string HeliconApeHandler = "Helicon.Ape Handler";
public const string HeliconApeHandlerPath = "*.apehandler"; public const string HeliconApeHandlerPath = "*.apehandler";
public const string IsapiModule = "IsapiModule"; public const string IsapiModule = "IsapiModule";
@ -1861,6 +1865,9 @@ namespace WebsitePanel.Providers.Web
#endregion #endregion
#region Helicon Ape #region Helicon Ape
public override HeliconApeStatus GetHeliconApeStatus(string siteId) public override HeliconApeStatus GetHeliconApeStatus(string siteId)
@ -1895,7 +1902,11 @@ namespace WebsitePanel.Providers.Web
foreach (var moduleEntry in modulesCollection) foreach (var moduleEntry in modulesCollection)
{ {
if (String.Equals(moduleEntry["name"].ToString(), Constants.HeliconApeModule, StringComparison.InvariantCultureIgnoreCase)) if (
String.Equals(moduleEntry["name"].ToString(), Constants.HeliconApeModule, StringComparison.InvariantCultureIgnoreCase)
||
String.Equals(moduleEntry["name"].ToString(), Constants.HeliconApeModulePrevName, StringComparison.InvariantCultureIgnoreCase)
)
return true; return true;
} }
// //
@ -2262,17 +2273,7 @@ namespace WebsitePanel.Providers.Web
ConfigurationSection modulesSection = appConfig.GetSection(Constants.ModulesSection, siteId); ConfigurationSection modulesSection = appConfig.GetSection(Constants.ModulesSection, siteId);
ConfigurationElementCollection modulesCollection = modulesSection.GetCollection(); ConfigurationElementCollection modulesCollection = modulesSection.GetCollection();
/* // <add name="Helicon.Ape" />
if ("" != siteId)
{
// <remove name="Helicon.Ape" />
ConfigurationElement removeHeliconApeModuleEntry = modulesCollection.CreateElement("remove");
removeHeliconApeModuleEntry["name"] = Constants.HeliconApeModule;
modulesCollection.Add(removeHeliconApeModuleEntry);
}
*/
// add name="Helicon.Ape" />
ConfigurationElement heliconApeModuleEntry = modulesCollection.CreateElement("add"); ConfigurationElement heliconApeModuleEntry = modulesCollection.CreateElement("add");
heliconApeModuleEntry["name"] = Constants.HeliconApeModule; heliconApeModuleEntry["name"] = Constants.HeliconApeModule;
heliconApeModuleEntry["type"] = GetHeliconApeModuleType(siteId); heliconApeModuleEntry["type"] = GetHeliconApeModuleType(siteId);
@ -2289,19 +2290,9 @@ namespace WebsitePanel.Providers.Web
ConfigurationSection handlersSection = appConfig.GetSection(Constants.HandlersSection, siteId); ConfigurationSection handlersSection = appConfig.GetSection(Constants.HandlersSection, siteId);
ConfigurationElementCollection handlersCollection = handlersSection.GetCollection(); ConfigurationElementCollection handlersCollection = handlersSection.GetCollection();
/* // <add name="Helicon.Ape" />
if ("" != siteId)
{
// <remove name="Helicon.Ape" />
ConfigurationElement removeHeliconApeHandlerEntry = handlersCollection.CreateElement("remove");
removeHeliconApeHandlerEntry["name"] = Constants.HeliconApeModule;
handlersCollection.Add(removeHeliconApeHandlerEntry);
}
*/
// add name="Helicon.Ape" />
ConfigurationElement heliconApeHandlerEntry = handlersCollection.CreateElement("add"); ConfigurationElement heliconApeHandlerEntry = handlersCollection.CreateElement("add");
heliconApeHandlerEntry["name"] = Constants.HeliconApeModule; heliconApeHandlerEntry["name"] = Constants.HeliconApeHandler;
heliconApeHandlerEntry["type"] = GetHeliconApeHandlerType(siteId); heliconApeHandlerEntry["type"] = GetHeliconApeHandlerType(siteId);
heliconApeHandlerEntry["path"] = Constants.HeliconApeHandlerPath; heliconApeHandlerEntry["path"] = Constants.HeliconApeHandlerPath;
heliconApeHandlerEntry["verb"] = "*"; heliconApeHandlerEntry["verb"] = "*";
@ -2335,7 +2326,11 @@ namespace WebsitePanel.Providers.Web
List<ConfigurationElement> heliconApeModuleEntriesList = new List<ConfigurationElement>(); List<ConfigurationElement> heliconApeModuleEntriesList = new List<ConfigurationElement>();
foreach (ConfigurationElement moduleEntry in modulesCollection) foreach (ConfigurationElement moduleEntry in modulesCollection)
{ {
if (String.Equals(moduleEntry["name"].ToString(), Constants.HeliconApeModule, StringComparison.InvariantCultureIgnoreCase)) if (
String.Equals(moduleEntry["name"].ToString(), Constants.HeliconApeModule, StringComparison.InvariantCultureIgnoreCase)
||
String.Equals(moduleEntry["name"].ToString(), Constants.HeliconApeModulePrevName, StringComparison.InvariantCultureIgnoreCase)
)
{ {
heliconApeModuleEntriesList.Add(moduleEntry); heliconApeModuleEntriesList.Add(moduleEntry);
} }
@ -2351,7 +2346,13 @@ namespace WebsitePanel.Providers.Web
List<ConfigurationElement> heliconApeHandlerEntriesList = new List<ConfigurationElement>(); List<ConfigurationElement> heliconApeHandlerEntriesList = new List<ConfigurationElement>();
foreach (ConfigurationElement handlerEntry in handlersCollection) foreach (ConfigurationElement handlerEntry in handlersCollection)
{ {
if (String.Equals(handlerEntry["name"].ToString(), Constants.HeliconApeModule, StringComparison.InvariantCultureIgnoreCase)) if (
String.Equals(handlerEntry["name"].ToString(), Constants.HeliconApeModule, StringComparison.InvariantCultureIgnoreCase)
||
String.Equals(handlerEntry["name"].ToString(), Constants.HeliconApeModulePrevName, StringComparison.InvariantCultureIgnoreCase)
||
String.Equals(handlerEntry["name"].ToString(), Constants.HeliconApeHandler, StringComparison.InvariantCultureIgnoreCase)
)
{ {
heliconApeHandlerEntriesList.Add(handlerEntry); heliconApeHandlerEntriesList.Add(handlerEntry);
} }