diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql index 64af03e2..a35668b3 100644 --- a/WebsitePanel/Database/update_db.sql +++ b/WebsitePanel/Database/update_db.sql @@ -1230,7 +1230,15 @@ GO - +-- Remove ExchangeHostedEdition Quotas +DELETE FROM HostingPlanQuotas WHERE QuotaID = 340 +GO +DELETE FROM HostingPlanQuotas WHERE QuotaID = 341 +GO +DELETE FROM HostingPlanQuotas WHERE QuotaID = 342 +GO +DELETE FROM HostingPlanQuotas WHERE QuotaID = 343 +GO -- Remove ExchangeHostedEdition Quotas @@ -1243,6 +1251,8 @@ GO DELETE FROM Quotas WHERE QuotaID = 343 GO +DELETE FROM HostingPlanResources WHERE GroupID = 33 +GO -- Remove ExchangeHostedEdition ServiceItemType DELETE FROM ServiceItemTypes WHERE ItemTypeID = 40 diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Database.MySQL/MySqlServer.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Database.MySQL/MySqlServer.cs index d7aca68c..9dbb49b9 100644 --- a/WebsitePanel/Sources/WebsitePanel.Providers.Database.MySQL/MySqlServer.cs +++ b/WebsitePanel/Sources/WebsitePanel.Providers.Database.MySQL/MySqlServer.cs @@ -39,7 +39,7 @@ using WebsitePanel.Server.Utils; using WebsitePanel.Providers.Utils; using WebsitePanel.Providers; using System.Reflection; - +using System.Data.Common; namespace WebsitePanel.Providers.Database { @@ -129,49 +129,36 @@ namespace WebsitePanel.Providers.Database static System.Reflection.Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args) { - // + + + // if (!args.Name.Contains("MySql.Data")) return null; + + if (args.Name.Contains("MySql.Data.resources")) + return null; + // string connectorKeyName = "SOFTWARE\\MySQL AB\\MySQL Connector/Net"; - string connectorLocation = String.Empty; string connectorVersion = String.Empty; // if (PInvoke.RegistryHive.HKLM.SubKeyExists_x86(connectorKeyName)) { - connectorLocation = PInvoke.RegistryHive.HKLM.GetSubKeyValue_x86(connectorKeyName, "Location"); connectorVersion = PInvoke.RegistryHive.HKLM.GetSubKeyValue_x86(connectorKeyName, "Version"); } - // - if (String.IsNullOrEmpty(connectorLocation)) - { - Log.WriteInfo("Connector location is either null or empty"); - return null; - } - - string assemblyFile = args.Name.Split(',')[0] + ".dll"; - // 1st location - string assemblyPath = Path.Combine(connectorLocation, @"Binaries\.NET 2.0\" + assemblyFile); - if (!File.Exists(assemblyPath)) + + + string assemblyFullName = string.Format("MySql.Data, Version={0}.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d", connectorVersion); + + if (assemblyFullName == args.Name) { - // 2nd location - assemblyPath = Path.Combine(connectorLocation, @"Assemblies\" + assemblyFile); - - if (!File.Exists(assemblyPath)) - { - // 3rd location - assemblyPath = Path.Combine(connectorLocation, @"Assemblies\v2.0" + assemblyFile); - - if (!File.Exists(assemblyPath)) - { - Log.WriteInfo("Connector assembly could not be found or does not exist"); - return null; // sorry, cannot find - } - } + return null; //avoid of stack overflow } - return Assembly.LoadFrom(assemblyPath); + + return Assembly.Load(assemblyFullName); + } #endregion @@ -185,8 +172,14 @@ namespace WebsitePanel.Providers.Database public virtual bool CheckConnectivity(string databaseName, string username, string password) { - MySqlConnection conn = new MySqlConnection(String.Format("server={0};port={1};database={2};uid={3};password={4}", - ServerName, ServerPort, databaseName, username, password)); + MySqlConnection conn = new MySqlConnection( + String.Format("server={0};port={1};database={2};uid={3};password={4}", + ServerName, + ServerPort, + databaseName, + username, + password) + ); try { conn.Open(); diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Database.MySQL/MySqlServer55.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Database.MySQL/MySqlServer55.cs index 8b0e740f..173441dd 100644 --- a/WebsitePanel/Sources/WebsitePanel.Providers.Database.MySQL/MySqlServer55.cs +++ b/WebsitePanel/Sources/WebsitePanel.Providers.Database.MySQL/MySqlServer55.cs @@ -32,7 +32,7 @@ using System.Text; using System.Text.RegularExpressions; using System.Data; using Microsoft.Win32; -using MySql.Data.MySqlClient; +//using MySql.Data.MySqlClient; using System.IO; using WebsitePanel.Server.Utils; diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx index f90f4aca..c676ac95 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx @@ -4868,7 +4868,7 @@ Web site "{1}" was not found - Selected application cannot be installed. + Following dependencies may be missing: ASP.NET 2.0 diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IIS70_Settings.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IIS70_Settings.ascx.cs index 051a3e58..c414927e 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IIS70_Settings.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ProviderControls/IIS70_Settings.ascx.cs @@ -223,7 +223,7 @@ namespace WebsitePanel.Portal.ProviderControls wpiEditFeedsList.Value = settings["FeedUrls"]; FilteredAppIds = settings["GalleryAppsFilter"]; radioFilterAppsList.SelectedIndex = Utils.ParseInt(settings["GalleryAppsFilterMode"], 0); - chkGalleryAppsAlwaysIgnoreDependencies.Checked = Utils.ParseBool(settings["GalleryAppsAlwaysIgnoreDependencies"], true); + chkGalleryAppsAlwaysIgnoreDependencies.Checked = Utils.ParseBool(settings["GalleryAppsAlwaysIgnoreDependencies"], false); } public void SaveSettings(StringDictionary settings) diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryInstall.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryInstall.ascx index cb96198b..94985211 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryInstall.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryInstall.ascx @@ -16,7 +16,8 @@ - + +
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryInstall.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryInstall.ascx.cs index 6d20c6a8..caa57525 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryInstall.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebApplicationGalleryInstall.ascx.cs @@ -64,9 +64,14 @@ namespace WebsitePanel.Portal if (appResult.ErrorCodes.Count > 0) { // app does not meet requirements + if (appResult.ErrorCodes.Count > 1) + { + // remove "- Your hosting package does not meet..." message + appResult.ErrorCodes.RemoveAt(0); + } messageBox.ShowMessage(appResult, "WAG_CANNOT_INSTALL_APPLICATION", "WebAppGallery"); - chIgnoreDependencies.Visible = true; - btnInstall.Enabled = false; + chIgnoreDependencies.Visible = false; + btnInstall.Enabled = true; } } catch (Exception ex)