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

Merge

Browse source
This commit is contained in:
Virtuworks 2013-10-30 06:26:18 -04:00
commit ec7cb965f9
2 changed files with 33 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -110,10 +110,13 @@ namespace WebsitePanel.Providers.Web
// true handler name // true handler name
public const string HeliconApeHandler = "Helicon.Ape Handler"; public const string HeliconApeHandler = "Helicon.Ape Handler";
public const string HeliconApeHandlerType = "Helicon.Ape.Handler"; public const string HeliconApeHandlerType = "Helicon.Ape.Handler";
public const string HeliconApeHandlerPath = "*.apehandler"; public const string HeliconApeHandlerPath = "*.apehandler";
public const string IsapiModule = "IsapiModule"; public const string HeliconApeRegistryPath = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Helicon\\Ape";
public const string heliconApeRegistryPathWow6432 = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Helicon\\Ape";
public const string IsapiModule = "IsapiModule";
public const string FastCgiModule = "FastCgiModule"; public const string FastCgiModule = "FastCgiModule";
public const string CgiModule = "CgiModule"; public const string CgiModule = "CgiModule";
@ -2066,10 +2069,10 @@ namespace WebsitePanel.Providers.Web
private string GetHeliconApeInstallDir(string siteId) private string GetHeliconApeInstallDir(string siteId)
{ {
//Check global registration //Check global registration
string installDir = Registry.GetValue("HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Helicon\\Ape", "InstallDir", string.Empty) as string; string installDir = Registry.GetValue(Constants.heliconApeRegistryPathWow6432, "InstallDir", string.Empty) as string;
if (string.Empty == installDir) if (string.Empty == installDir)
{ {
installDir = Registry.GetValue("HKEY_LOCAL_MACHINE\\SOFTWARE\\Helicon\\Ape", "InstallDir", string.Empty) as string; installDir = Registry.GetValue(Constants.HeliconApeRegistryPath, "InstallDir", string.Empty) as string;
} }
return installDir; return installDir;
@ -2218,15 +2221,36 @@ namespace WebsitePanel.Providers.Web
if (!string.IsNullOrEmpty(registrationInfo)) if (!string.IsNullOrEmpty(registrationInfo))
return registrationInfo; return registrationInfo;
string apeRegistryPath = Constants.HeliconApeRegistryPath;
long dtFirstRunBinary = 0L;
try
{
dtFirstRunBinary = (long) Registry.GetValue(apeRegistryPath, "FirstRun", 0L);
}
catch(NullReferenceException)
{
// nothing
}
long dtFirstRunBinary = (long)Registry.GetValue("HKEY_LOCAL_MACHINE\\SOFTWARE\\Helicon\\Ape", "FirstRun", 0L); if (0 == dtFirstRunBinary)
{
apeRegistryPath = Constants.heliconApeRegistryPathWow6432;
try
{
dtFirstRunBinary = (long) Registry.GetValue(apeRegistryPath, "FirstRun", 0L);
}
catch(NullReferenceException)
{
// nothing
}
}
DateTime dtFirstRun; DateTime dtFirstRun;
if (0 == dtFirstRunBinary) if (0 == dtFirstRunBinary)
{ {
dtFirstRun = DateTime.Now; dtFirstRun = DateTime.Now;
Registry.SetValue("HKEY_LOCAL_MACHINE\\SOFTWARE\\Helicon\\Ape", "FirstRun", dtFirstRun.ToBinary(),RegistryValueKind.QWord ); Registry.SetValue(apeRegistryPath, "FirstRun", dtFirstRun.ToBinary(),RegistryValueKind.QWord );
} }
else else
{ {
@ -3457,7 +3481,6 @@ namespace WebsitePanel.Providers.Web
public const string WDeployAppHostConfigWriter = "WDeployAppHostConfigWriter"; public const string WDeployAppHostConfigWriter = "WDeployAppHostConfigWriter";
public const string WDeployAppPoolConfigEditor = "WDeployAppPoolConfigEditor"; public const string WDeployAppPoolConfigEditor = "WDeployAppPoolConfigEditor";
private void SetupWebDeployPublishingOnServer(List<string> messages) private void SetupWebDeployPublishingOnServer(List<string> messages)
{ {
if (IsWebDeployInstalled() == false if (IsWebDeployInstalled() == false

3
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IIS70_Settings.ascx.cs
View file

@ -331,7 +331,8 @@ namespace WebsitePanel.Portal.ProviderControls
return HostModule.EditUrl("ItemID", PanelRequest.ItemID.ToString(), ctrlKey, return HostModule.EditUrl("ItemID", PanelRequest.ItemID.ToString(), ctrlKey,
"Name=" + name, "Name=" + name,
PortalUtils.SPACE_ID_PARAM + "=" + int.Parse(Request.QueryString["ServiceID"]), PortalUtils.SPACE_ID_PARAM + "=" + int.Parse(Request.QueryString["ServiceID"]),
"ReturnUrlBase64="+ EncodeTo64(Server.UrlEncode(Request.Url.PathAndQuery)) "ReturnUrlBase64="+ EncodeTo64(Server.UrlEncode(Request.Url.PathAndQuery)),
"UserID="+PanelSecurity.LoggedUserId.ToString()
); );
} }