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

Some refactoring and small changes:

Browse source 
- Use webObjectsSvc.GetServerManager()
- Do not make any changes if the PHP5 handler is not changed in the UI
- Added text on IIS70_Settings page to inform that the PHP5 Executable Path can be ignored
This commit is contained in:
Olov Karlsson 2014-10-09 11:14:45 +02:00
parent d7ac9fa36f
commit 170b4da51d
5 changed files with 62 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -882,22 +882,19 @@ namespace WebsitePanel.Providers.Web
{
if (PhpMode == Constants.PhpMode.FastCGI && virtualDir.PhpInstalled.Contains('|'))
{
var path = PhpExecutablePath;
var args = virtualDir.PhpInstalled.Split('|');
if (args.Count() > 1)
{
// Handler name is present, let us try to find the corresponding path to executable
var phpVersion = GetPhpVersions(virtualDir).SingleOrDefault(p => p.HandlerName == args[1]);
if (phpVersion != null)
{
path = phpVersion.ExecutionPath;
}
}
// Handler name is present, use it to set choosen version
var handlerName = args[1];
if (!String.IsNullOrEmpty(path) && File.Exists(path))
{
handlersSvc.CopyInheritedHandlers(((WebSite)virtualDir).SiteId, virtualDir.VirtualPath);
handlersSvc.MoveHandlerToTop(args[1], ((WebSite) virtualDir).SiteId, virtualDir.VirtualPath);
if (handlerName != GetActivePhpHandlerName(virtualDir))
{
// Only change handler if it is different from the current one
handlersSvc.CopyInheritedHandlers(((WebSite)virtualDir).SiteId, virtualDir.VirtualPath);
MakeHandlerActive(handlerName, virtualDir);
}
}
}
else
@ -4511,12 +4508,21 @@ namespace WebsitePanel.Providers.Web
protected PhpVersion[] GetPhpVersions(WebVirtualDirectory virtualDir)
{
using (var srvman = new ServerManager())
using (var srvman = webObjectsSvc.GetServerManager())
{
return GetPhpVersions(srvman, virtualDir);
}
}
protected string GetActivePhpHandlerName(WebVirtualDirectory virtualDir)
{
using (var srvman = webObjectsSvc.GetServerManager())
{
return GetActivePhpHandlerName(srvman, virtualDir);
}
}
protected string GetActivePhpHandlerName(ServerManager srvman, WebVirtualDirectory virtualDir)
{
var config = srvman.GetWebConfiguration(((WebSite)virtualDir).SiteId, virtualDir.VirtualPath);
@ -4529,11 +4535,34 @@ namespace WebsitePanel.Providers.Web
).FirstOrDefault();
}
private static string GetPhpExecutableVersion(string phpexePath)
protected static string GetPhpExecutableVersion(string phpexePath)
{
return FileVersionInfo.GetVersionInfo(phpexePath).ProductVersion;
}
protected void MakeHandlerActive(string handlerName, WebVirtualDirectory virtualDir)
{
using (var srvman = webObjectsSvc.GetServerManager())
{
var config = srvman.GetWebConfiguration(((WebSite)virtualDir).SiteId, virtualDir.VirtualPath);
var handlersSection = (HandlersSection)config.GetSection(Constants.HandlersSection, typeof(HandlersSection));
var handlersCollection = handlersSection.Handlers;
var handlerElement = handlersCollection[handlerName];
var activeHandlerElement = handlersCollection[GetActivePhpHandlerName(srvman, virtualDir)];
var activeHandlerIndex = handlersCollection.IndexOf(activeHandlerElement);
handlersCollection.Remove(handlerElement);
handlersCollection.AddCopyAt(activeHandlerIndex, handlerElement);
srvman.CommitChanges();
}
}
#endregion
}
}