Merge

WebsitePanel/Sources/WebsitePanel.Providers.Web.HeliconZoo/HeliconZoo.cs

@@ -70,7 +70,17 @@ namespace WebsitePanel.Providers.Web.HeliconZoo
             {
                 Configuration appConfig = srvman.GetApplicationHostConfiguration();
 
-                ConfigurationSection heliconZooServer = appConfig.GetSection("system.webServer/heliconZooServer");
+                ConfigurationSection heliconZooServer;
+                try
+                {
+                    heliconZooServer = appConfig.GetSection("system.webServer/heliconZooServer");
+                }
+                catch(Exception)
+                {
+                    // heliconZooServer is not found
+                    // looks like zoo is not installed
+                    return result.ToArray();
+                }
 
                 ConfigurationElement engines = heliconZooServer.GetChildElement("engines");
                 ConfigurationElementCollection enginesCollection = engines.GetCollection();
@@ -278,7 +288,18 @@ namespace WebsitePanel.Providers.Web.HeliconZoo
             using (var srvman = new ServerManager())
             {
                 Configuration appConfig = srvman.GetApplicationHostConfiguration();
-                ConfigurationSection zooServer = appConfig.GetSection("system.webServer/heliconZooServer", siteId);
+                ConfigurationSection zooServer;
+                try
+                {
+                    zooServer = appConfig.GetSection("system.webServer/heliconZooServer", siteId);
+                }
+                catch(Exception)
+                {
+                    // heliconZooServer is not found
+                    // looks like zoo is not installed
+                    return engines.ToArray();
+
+                }
                 ConfigurationElement switchboard = zooServer.GetChildElement("switchboard");
                 ConfigurationElementCollection switchboardCollection = switchboard.GetCollection();
 

WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/IIs70.cs

@@ -1914,22 +1914,27 @@ namespace WebsitePanel.Providers.Web
 
         private bool IsHeliconApeEnabled(ServerManager srvman, string siteId)
         {
-            WebSite webSite = null;
+            if (!string.IsNullOrEmpty(siteId))
-            webSite = webObjectsSvc.GetWebSiteFromIIS(srvman, siteId);
-            if (webSite == null)
-                throw new ApplicationException(
-                    String.Format("Could not find a web site with the following identifier: {0}.", siteId));
-
-            // Fill ASP.NET settings
-            FillAspNetSettingsFromIISObject(srvman, webSite);
-
-            var aphl = new WebAppPoolHelper(ProviderSettings);
-            var currentPool = aphl.match_webapp_pool(webSite);
-
-            if (aphl.pipeline(currentPool.Mode) != SiteAppPoolMode.Integrated)
             {
-                // Ape is not working in not Integrated pipeline mode
+                // Check the web site app pool in integrated pipeline mode
-                return false;
+
+                WebSite webSite = null;
+                webSite = webObjectsSvc.GetWebSiteFromIIS(srvman, siteId);
+                if (webSite == null)
+                    throw new ApplicationException(
+                        String.Format("Could not find a web site with the following identifier: {0}.", siteId));
+
+                // Fill ASP.NET settings
+                FillAspNetSettingsFromIISObject(srvman, webSite);
+
+                var aphl = new WebAppPoolHelper(ProviderSettings);
+                var currentPool = aphl.match_webapp_pool(webSite);
+
+                if (aphl.pipeline(currentPool.Mode) != SiteAppPoolMode.Integrated)
+                {
+                    // Ape is not working in not Integrated pipeline mode
+                    return false;
+                }
             }
 
 

WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/HeliconZoo_Settings.ascx

@@ -85,16 +85,18 @@ span.ValidationMessageBlock {
 </fieldset>
 
 
+<asp:Panel runat="server" ID="EnginesPanel">
+
 <fieldset>
-    <legend>
+  <legend>
-        <span>Helicon Zoo engine quotas settings</span>
+      <span>Helicon Zoo engine quotas settings</span>
-    </legend>
+  </legend>
-    <div class="FormBody">
+  <div class="FormBody">
-        <asp:CheckBox runat="server" ID="QuotasEnabled" Text="Enable Quotas"/>
+      <asp:CheckBox runat="server" ID="QuotasEnabled" Text="Enable Quotas"/>
-    </div>
+  </div>
 </fieldset>
 
-<asp:Panel runat="server" ID="EnginesPanel">
+
 <fieldset>
     <legend>
         <span>Engines management</span>