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

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

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

164
WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/IIs60.cs
View file

@ -145,6 +145,12 @@ namespace WebsitePanel.Providers.Web
public const string FRONTPAGE_ALLPORTS_REGLOC_X64 = @"SOFTWARE\Wow6432Node\Microsoft\Shared Tools\Web Server Extensions\All Ports\"; public const string FRONTPAGE_ALLPORTS_REGLOC_X64 = @"SOFTWARE\Wow6432Node\Microsoft\Shared Tools\Web Server Extensions\All Ports\";
//ColdFusion related constants //ColdFusion related constants
public const string COLDFUSION_12_REGLOC = @"SOFTWARE\Adobe\Install Data\Adobe ColdFusion 12";
public const string COLDFUSION_12_REGLOC_X64 = @"SOFTWARE\Wow6432Node\Adobe\Install Data\Adobe ColdFusion 12";
public const string COLDFUSION_11_REGLOC = @"SOFTWARE\Adobe\Install Data\Adobe ColdFusion 11";
public const string COLDFUSION_11_REGLOC_X64 = @"SOFTWARE\Wow6432Node\Adobe\Install Data\Adobe ColdFusion 11";
public const string COLDFUSION_10_REGLOC = @"SOFTWARE\Adobe\Install Data\Adobe ColdFusion 10";
public const string COLDFUSION_10_REGLOC_X64 = @"SOFTWARE\Wow6432Node\Adobe\Install Data\Adobe ColdFusion 10";
public const string COLDFUSION_9_REGLOC = @"SOFTWARE\Adobe\Install Data\Adobe ColdFusion 9"; public const string COLDFUSION_9_REGLOC = @"SOFTWARE\Adobe\Install Data\Adobe ColdFusion 9";
public const string COLDFUSION_9_REGLOC_X64 = @"SOFTWARE\Wow6432Node\Adobe\Install Data\Adobe ColdFusion 9"; public const string COLDFUSION_9_REGLOC_X64 = @"SOFTWARE\Wow6432Node\Adobe\Install Data\Adobe ColdFusion 9";
public const string COLDFUSION_8_REGLOC = @"SOFTWARE\Adobe\Install Data\Adobe ColdFusion 8"; public const string COLDFUSION_8_REGLOC = @"SOFTWARE\Adobe\Install Data\Adobe ColdFusion 8";
@ -422,6 +428,25 @@ namespace WebsitePanel.Providers.Web
site.ColdFusionVersion = "9"; site.ColdFusionVersion = "9";
site.ColdFusionAvailable = true; 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 else
{ {
@ -430,11 +455,16 @@ namespace WebsitePanel.Providers.Web
WebVirtualDirectory[] virtdirs = GetVirtualDirectories(siteId); WebVirtualDirectory[] virtdirs = GetVirtualDirectories(siteId);
if (VirtualDirectoryExists(siteId, "CFIDE") && VirtualDirectoryExists(siteId, "JRunScripts")) if (IsColdFusion10Installed() || IsColdFusion11Installed() || IsColdFusion12Installed())
{ {
site.CreateCFVirtualDirectories = true; if (VirtualDirectoryExists(siteId, "CFIDE") && VirtualDirectoryExists(siteId, "jakarta"));
} site.CreateCFVirtualDirectories = true;
}
else else
{
if (VirtualDirectoryExists(siteId, "CFIDE") && VirtualDirectoryExists(siteId, "JRunScripts"));
site.CreateCFVirtualDirectories = true;
}
{ {
site.CreateCFVirtualDirectories = false; site.CreateCFVirtualDirectories = false;
} }
@ -808,7 +838,14 @@ namespace WebsitePanel.Providers.Web
WebVirtualDirectory[] virtdirs = GetVirtualDirectories(site.SiteId); WebVirtualDirectory[] virtdirs = GetVirtualDirectories(site.SiteId);
bool cfDirsinstalled = false; bool cfDirsinstalled = false;
if (VirtualDirectoryExists(site.SiteId, "CFIDE") && VirtualDirectoryExists(site.SiteId, "JRunScripts")) if (IsColdFusion10Installed() || IsColdFusion11Installed() || IsColdFusion12Installed())
{
if (VirtualDirectoryExists(site.SiteId, "CFIDE") && VirtualDirectoryExists(site.SiteId, "jakarta"));
}
else
{
if (VirtualDirectoryExists(site.SiteId, "CFIDE") && VirtualDirectoryExists(site.SiteId, "JRunScripts"));
}
{ {
cfDirsinstalled = true; cfDirsinstalled = true;
} }
@ -1077,7 +1114,14 @@ namespace WebsitePanel.Providers.Web
} }
WebVirtualDirectory flashRemotingDir = new WebVirtualDirectory(); WebVirtualDirectory flashRemotingDir = new WebVirtualDirectory();
flashRemotingDir.Name = "JRunScripts"; if (IsColdFusion10Installed() || IsColdFusion11Installed() || IsColdFusion12Installed())
{
flashRemotingDir.Name = "jakarta";
}
else
{
flashRemotingDir.Name = "JRunScripts";
}
flashRemotingDir.ContentPath = CFFlashRemotingDirPath; flashRemotingDir.ContentPath = CFFlashRemotingDirPath;
flashRemotingDir.EnableAnonymousAccess = true; flashRemotingDir.EnableAnonymousAccess = true;
flashRemotingDir.EnableWindowsAuthentication = true; flashRemotingDir.EnableWindowsAuthentication = true;
@ -1095,8 +1139,16 @@ namespace WebsitePanel.Providers.Web
public virtual void DeleteCFVirtualDirectories(string siteId) public virtual void DeleteCFVirtualDirectories(string siteId)
{ {
DeleteVirtualDirectory(siteId, "CFIDE"); if (IsColdFusion10Installed() || IsColdFusion11Installed() || IsColdFusion12Installed())
DeleteVirtualDirectory(siteId, "JRunScripts"); {
DeleteVirtualDirectory(siteId, "CFIDE");
DeleteVirtualDirectory(siteId, "jakarta");
}
else
{
DeleteVirtualDirectory(siteId, "CFIDE");
DeleteVirtualDirectory(siteId, "JRunScripts");
}
} }
@ -1307,7 +1359,58 @@ namespace WebsitePanel.Providers.Web
public virtual bool IsColdFusionSystemInstalled() public virtual bool IsColdFusionSystemInstalled()
{ {
return (IsColdFusion8Installed() || IsColdFusion7Installed() || IsColdFusion9Installed()); return (IsColdFusion8Installed() || IsColdFusion7Installed() || IsColdFusion10Installed() || IsColdFusion11Installed() || IsColdFusion12Installed() || IsColdFusion9Installed());
}
protected bool IsColdFusion12Installed()
{
RegistryKey keyColdFusion = Registry.LocalMachine.OpenSubKey(COLDFUSION_12_REGLOC);
if (keyColdFusion == null)
{
keyColdFusion = Registry.LocalMachine.OpenSubKey(COLDFUSION_12_REGLOC_X64);
if (keyColdFusion == null)
return false;
}
if (!String.IsNullOrEmpty((string)keyColdFusion.GetValue(COLDFUSION_ROOT_PATH)))
{
return true;
}
return false;
}
protected bool IsColdFusion11Installed()
{
RegistryKey keyColdFusion = Registry.LocalMachine.OpenSubKey(COLDFUSION_11_REGLOC);
if (keyColdFusion == null)
{
keyColdFusion = Registry.LocalMachine.OpenSubKey(COLDFUSION_11_REGLOC_X64);
if (keyColdFusion == null)
return false;
}
if (!String.IsNullOrEmpty((string)keyColdFusion.GetValue(COLDFUSION_ROOT_PATH)))
{
return true;
}
return false;
}
protected bool IsColdFusion10Installed()
{
RegistryKey keyColdFusion = Registry.LocalMachine.OpenSubKey(COLDFUSION_10_REGLOC);
if (keyColdFusion == null)
{
keyColdFusion = Registry.LocalMachine.OpenSubKey(COLDFUSION_10_REGLOC_X64);
if (keyColdFusion == null)
return false;
}
if (!String.IsNullOrEmpty((string)keyColdFusion.GetValue(COLDFUSION_ROOT_PATH)))
{
return true;
}
return false;
} }
protected bool IsColdFusion9Installed() protected bool IsColdFusion9Installed()
@ -1399,6 +1502,49 @@ namespace WebsitePanel.Providers.Web
} }
return String.Empty; return String.Empty;
if (IsColdFusion10Installed())
{
RegistryKey keyColdFusion = Registry.LocalMachine.OpenSubKey(COLDFUSION_10_REGLOC);
if (keyColdFusion == null)
{
keyColdFusion = Registry.LocalMachine.OpenSubKey(COLDFUSION_10_REGLOC_X64);
if (keyColdFusion == null)
return String.Empty;
}
return (string)keyColdFusion.GetValue(COLDFUSION_ROOT_PATH);
}
return String.Empty;
if (IsColdFusion11Installed())
{
RegistryKey keyColdFusion = Registry.LocalMachine.OpenSubKey(COLDFUSION_11_REGLOC);
if (keyColdFusion == null)
{
keyColdFusion = Registry.LocalMachine.OpenSubKey(COLDFUSION_11_REGLOC_X64);
if (keyColdFusion == null)
return String.Empty;
}
return (string)keyColdFusion.GetValue(COLDFUSION_ROOT_PATH);
}
return String.Empty;
if (IsColdFusion12Installed())
{
RegistryKey keyColdFusion = Registry.LocalMachine.OpenSubKey(COLDFUSION_12_REGLOC);
if (keyColdFusion == null)
{
keyColdFusion = Registry.LocalMachine.OpenSubKey(COLDFUSION_12_REGLOC_X64);
if (keyColdFusion == null)
return String.Empty;
}
return (string)keyColdFusion.GetValue(COLDFUSION_ROOT_PATH);
}
return String.Empty;
} }
protected void EnableColdFusionScripting(string siteName) protected void EnableColdFusionScripting(string siteName)

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/FileManager.ascx.cs
View file

@ -40,7 +40,7 @@ namespace WebsitePanel.Portal
{ {
public partial class FileManager : WebsitePanelModuleBase public partial class FileManager : WebsitePanelModuleBase
{ {
public static string ALLOWED_EDIT_EXTENSIONS = ".txt,.htm,.html,.php,.pl,.sql,.cs,.vb,.ascx,.aspx,.inc,.asp,.config,.xml,.xsl,.xslt,.xsd,.master,.htaccess,.htpasswd,.cshtml,.vbhtml,.ini,.config"; public static string ALLOWED_EDIT_EXTENSIONS = ".txt,.htm,.html,.cfc,.cfml,.cfm,.php,.pl,.sql,.cs,.vb,.ascx,.aspx,.inc,.asp,.config,.xml,.xsl,.xslt,.xsd,.master,.htaccess,.htpasswd,.cshtml,.vbhtml,.ini,.config";
protected void Page_Load(object sender, EventArgs e) protected void Page_Load(object sender, EventArgs e)
{ {

12
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesEditSite.ascx.cs
View file

@ -239,6 +239,18 @@ namespace WebsitePanel.Portal
litCFUnavailable.Text = "ColdFusion 9.x is installed"; litCFUnavailable.Text = "ColdFusion 9.x is installed";
litCFUnavailable.Visible = true; litCFUnavailable.Visible = true;
if (site.ColdFusionVersion.Equals("10"))
litCFUnavailable.Text = "ColdFusion 10.x is installed";
litCFUnavailable.Visible = true;
if (site.ColdFusionVersion.Equals("11"))
litCFUnavailable.Text = "ColdFusion 11.x is installed";
litCFUnavailable.Visible = true;
if (site.ColdFusionVersion.Equals("12"))
litCFUnavailable.Text = "ColdFusion 12.x is installed";
litCFUnavailable.Visible = true;
} }
if (!PackagesHelper.CheckGroupQuotaEnabled(PackageId, ResourceGroups.Web, Quotas.WEB_CFVIRTUALDIRS)) if (!PackagesHelper.CheckGroupQuotaEnabled(PackageId, ResourceGroups.Web, Quotas.WEB_CFVIRTUALDIRS))