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

CF Fixes

Browse source
This commit is contained in:
akovach 2015-02-02 15:52:19 -06:00
parent 344317b569
commit 3d6f6fc7a2
4 changed files with 228 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1207,6 +1207,25 @@ namespace WebsitePanel.Providers.Web
site.ColdFusionVersion = "9";
site.ColdFusionAvailable = true;
}
if (IsColdFusion10Installed())
{
site.ColdFusionVersion = "10";
site.ColdFusionAvailable = true;
}
if (IsColdFusion11Installed())
{
site.ColdFusionVersion = "11";
site.ColdFusionAvailable = true;
}
if (IsColdFusion12Installed())
{
site.ColdFusionVersion = "12";
site.ColdFusionAvailable = true;
}
}
else
{
@ -1477,17 +1496,20 @@ namespace WebsitePanel.Providers.Web
if (site.ColdFusionInstalled)
{
var cfElement = handlersCollection.CreateElement("add");
cfElement["name"] = "coldfusion";
cfElement["modules"] = "IsapiModule";
cfElement["path"] = "*";
cfElement["scriptProcessor"] = base.ColdFusionPath;
cfElement["verb"] = "*";
cfElement["resourceType"] = "Unspecified";
cfElement["requireAccess"] = "None";
cfElement["preCondition"] = "bitness64";
handlersCollection.AddAt(0, cfElement);
if (IsColdFusion7Installed() || IsColdFusion8Installed() || IsColdFusion9Installed())
{
var cfElement = handlersCollection.CreateElement("add");
cfElement["name"] = "coldfusion";
cfElement["modules"] = "IsapiModule";
cfElement["path"] = "*";
cfElement["scriptProcessor"] = base.ColdFusionPath;
cfElement["verb"] = "*";
cfElement["resourceType"] = "Unspecified";
cfElement["requireAccess"] = "None";
cfElement["preCondition"] = "bitness64";
handlersCollection.AddAt(0, cfElement);
}
}
@ -3336,7 +3358,14 @@ namespace WebsitePanel.Providers.Web
}
WebVirtualDirectory flashRemotingDir = new WebVirtualDirectory();
flashRemotingDir.Name = "JRunScripts";
if (IsColdFusion10Installed() || IsColdFusion11Installed() || IsColdFusion12Installed())
{
flashRemotingDir.Name = "jakarta";
}
else
{
flashRemotingDir.Name = "JRunScripts";
}
flashRemotingDir.ContentPath = CFFlashRemotingDirPath;
flashRemotingDir.EnableAnonymousAccess = true;
flashRemotingDir.EnableWindowsAuthentication = true;
@ -3354,8 +3383,17 @@ namespace WebsitePanel.Providers.Web
public override void DeleteCFVirtualDirectories(string siteId)
{
DeleteVirtualDirectory(siteId, "CFIDE");
DeleteVirtualDirectory(siteId, "JRunScripts");
if (IsColdFusion10Installed() || IsColdFusion11Installed() || IsColdFusion12Installed())
{
DeleteVirtualDirectory(siteId, "CFIDE");
DeleteVirtualDirectory(siteId, "jakarta");
}
else
{
DeleteVirtualDirectory(siteId, "CFIDE");
DeleteVirtualDirectory(siteId, "JRunScripts");
}
}
@ -3367,8 +3405,16 @@ namespace WebsitePanel.Providers.Web
foreach (WebVirtualDirectory dir in dirs)
{
if (IsColdFusion10Installed() || IsColdFusion11Installed() || IsColdFusion12Installed())
{
if (dir.FullQualifiedPath.Equals("CFIDE") || dir.FullQualifiedPath.Equals("jakarta"))
identifier++;
}
else
{
if (dir.FullQualifiedPath.Equals("CFIDE") || dir.FullQualifiedPath.Equals("JRunScripts"))
identifier++;
}
}
return identifier.Equals(2);
}