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

Commit Changes from Helicon for Work Item 9

Browse source
This commit is contained in:
Virtuworks 2012-08-10 07:42:01 -04:00
commit d44ede92a1
1 changed files with 21 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -98,6 +98,8 @@ namespace WebsitePanel.Providers.Web
public const string AspNet40x64PathSetting = "AspNet40x64Path"; public const string AspNet40x64PathSetting = "AspNet40x64Path";
public const string WEBSITEPANEL_IISMODULES = "WebsitePanel.IIsModules"; public const string WEBSITEPANEL_IISMODULES = "WebsitePanel.IIsModules";
public const string DOTNETPANEL_IISMODULES = "DotNetPanel.IIsModules";
public const string HeliconApeModule = "Helicon Ape"; public const string HeliconApeModule = "Helicon Ape";
public const string HeliconApeHandlerPath = "*.apehandler"; public const string HeliconApeHandlerPath = "*.apehandler";
@ -1691,7 +1693,10 @@ namespace WebsitePanel.Providers.Web
// //
foreach (var moduleEntry in modulesCollection) foreach (var moduleEntry in modulesCollection)
{ {
if (String.Equals(moduleEntry["name"].ToString(), Constants.WEBSITEPANEL_IISMODULES, StringComparison.InvariantCultureIgnoreCase)) if (
String.Equals(moduleEntry["name"].ToString(), Constants.WEBSITEPANEL_IISMODULES, StringComparison.InvariantCultureIgnoreCase)
|| String.Equals(moduleEntry["name"].ToString(), Constants.DOTNETPANEL_IISMODULES, StringComparison.InvariantCultureIgnoreCase)
)
return true; return true;
} }
// //
@ -1829,22 +1834,27 @@ namespace WebsitePanel.Providers.Web
// //
ConfigurationElementCollection modulesCollection = modulesSection.GetCollection(); ConfigurationElementCollection modulesCollection = modulesSection.GetCollection();
// //
ConfigurationElement iisModulesEntry = null;
//
foreach (ConfigurationElement moduleEntry in modulesCollection) foreach (ConfigurationElement moduleEntry in modulesCollection)
{ {
if (String.Equals(moduleEntry["name"].ToString(), Constants.WEBSITEPANEL_IISMODULES, StringComparison.InvariantCultureIgnoreCase)) if (String.Equals(moduleEntry["name"].ToString(), Constants.WEBSITEPANEL_IISMODULES, StringComparison.InvariantCultureIgnoreCase))
{ {
iisModulesEntry = moduleEntry; modulesCollection.Remove(moduleEntry);
break; break;
} }
} }
//
if (iisModulesEntry != null) foreach (ConfigurationElement moduleEntry in modulesCollection)
{ {
modulesCollection.Remove(iisModulesEntry); if (String.Equals(moduleEntry["name"].ToString(), Constants.DOTNETPANEL_IISMODULES, StringComparison.InvariantCultureIgnoreCase))
srvman.CommitChanges(); {
} modulesCollection.Remove(moduleEntry);
break;
}
}
srvman.CommitChanges();
} }
} }