diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe b/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe index cf5936bc..0c0d14e1 100644 Binary files a/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe and b/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe differ diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql index 6e6e3098..e9636137 100644 --- a/WebsitePanel/Database/update_db.sql +++ b/WebsitePanel/Database/update_db.sql @@ -875,7 +875,7 @@ INNER JOIN UsersDetailed AS U ON P.UserID = U.UserID LEFT OUTER JOIN ServiceItems AS Z ON D.ZoneItemID = Z.ItemID LEFT OUTER JOIN Services AS S ON Z.ServiceID = S.ServiceID LEFT OUTER JOIN Servers AS SRV ON S.ServerID = SRV.ServerID -WHERE (D.IsInstantAlias = 0 AND D.IsDomainPointer = 0) AND +WHERE D.IsInstantAlias = 0 AND ((@Recursive = 0 AND D.PackageID = @PackageID) OR (@Recursive = 1 AND dbo.CheckPackageParent(@PackageID, D.PackageID) = 1)) AND (@ServerID = 0 OR (@ServerID > 0 AND S.ServerID = @ServerID)) diff --git a/WebsitePanel/Lib/References/MySQL/MySql.Data.dll b/WebsitePanel/Lib/References/MySQL/MySql.Data.dll new file mode 100644 index 00000000..3b5cadde Binary files /dev/null and b/WebsitePanel/Lib/References/MySQL/MySql.Data.dll differ diff --git a/WebsitePanel/Sources/VersionInfo.cs b/WebsitePanel/Sources/VersionInfo.cs index 56a3acb5..8230c593 100644 --- a/WebsitePanel/Sources/VersionInfo.cs +++ b/WebsitePanel/Sources/VersionInfo.cs @@ -1,4 +1,4 @@ -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // This code was generated by a tool. // Runtime Version:4.0.30319.269 @@ -10,14 +10,13 @@ using System; using System.Reflection; -using System.Resources; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyCompany("Outercurve Foundation")] [assembly: AssemblyCopyright("Copyright © 2012 Outercurve Foundation.")] -[assembly: AssemblyVersion("1.2.2")] -[assembly: AssemblyFileVersion("1.2.2")] -[assembly: AssemblyInformationalVersion("1.2.2")] +[assembly: AssemblyVersion("1.2.2.1")] +[assembly: AssemblyFileVersion("1.2.2.1")] +[assembly: AssemblyInformationalVersion("1.2.2.1")] diff --git a/WebsitePanel/Sources/VersionInfo.vb b/WebsitePanel/Sources/VersionInfo.vb index 4c8abfdc..73662e9d 100644 --- a/WebsitePanel/Sources/VersionInfo.vb +++ b/WebsitePanel/Sources/VersionInfo.vb @@ -1,4 +1,4 @@ -'------------------------------------------------------------------------------ +'------------------------------------------------------------------------------ ' ' This code was generated by a tool. ' Runtime Version:4.0.30319.269 @@ -13,12 +13,11 @@ Option Explicit On Imports System Imports System.Reflection -Imports System.Resources Imports System.Runtime.CompilerServices Imports System.Runtime.InteropServices + Assembly: AssemblyVersion("1.2.2.1"), _ + Assembly: AssemblyFileVersion("1.2.2.1"), _ + Assembly: AssemblyInformationalVersion("1.2.2.1")> diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/ExchangeServer/ExchangeServerController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/ExchangeServer/ExchangeServerController.cs index 2f51f9b8..88a4fb78 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/ExchangeServer/ExchangeServerController.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/ExchangeServer/ExchangeServerController.cs @@ -109,6 +109,15 @@ namespace WebsitePanel.EnterpriseServer delegate(ServiceProviderItem item) { return (Organization)item; })); } + public static List GetExchangeOrganizationsInternal(int packageId, bool recursive) + { + List items = PackageController.GetPackageItemsByTypeInternal(packageId, null, typeof(Organization), recursive); + + return items.ConvertAll( + new Converter( + delegate(ServiceProviderItem item) { return (Organization)item; })); + } + public static Organization GetOrganization(int itemId) { #region Demo Mode @@ -2554,12 +2563,12 @@ namespace WebsitePanel.EnterpriseServer if ((Packages != null) & (Packages.Count > 0)) { - orgs = GetExchangeOrganizations(Packages[0].PackageId, false); + orgs = GetExchangeOrganizationsInternal(Packages[0].PackageId, false); } } else { - orgs = GetExchangeOrganizations(1, false); + orgs = GetExchangeOrganizationsInternal(1, false); } if ((orgs != null) &(orgs.Count > 0)) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Packages/PackageController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Packages/PackageController.cs index a80b8388..24b440d5 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Packages/PackageController.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Packages/PackageController.cs @@ -1072,6 +1072,14 @@ namespace WebsitePanel.EnterpriseServer return CreateServiceItemsList(dsItems, 0); } + public static List GetPackageItemsByTypeInternal(int packageId, string groupName, Type itemType, bool recursive) + { + string typeName = ObjectUtils.GetTypeFullName(itemType); + DataSet dsItems = DataProvider.GetServiceItems(-1, packageId, groupName, typeName, recursive); + + return CreateServiceItemsList(dsItems, 0); + } + public static DataSet GetRawPackageItemsByType(int packageId, Type itemType, bool recursive) { return GetRawPackageItemsByType(packageId, null, itemType, recursive); diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config index 1b72c6ba..58da2d47 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config @@ -5,11 +5,11 @@ - + - + diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.DNS.PowerDNS/WebsitePanel.Providers.DNS.PowerDNS.csproj b/WebsitePanel/Sources/WebsitePanel.Providers.DNS.PowerDNS/WebsitePanel.Providers.DNS.PowerDNS.csproj index d268e395..909cf2b9 100644 --- a/WebsitePanel/Sources/WebsitePanel.Providers.DNS.PowerDNS/WebsitePanel.Providers.DNS.PowerDNS.csproj +++ b/WebsitePanel/Sources/WebsitePanel.Providers.DNS.PowerDNS/WebsitePanel.Providers.DNS.PowerDNS.csproj @@ -56,7 +56,7 @@ - ..\..\..\..\..\Program Files (x86)\MySQL\Connector NET 6.3.7\Assemblies\v2.0\MySql.Data.dll + ..\..\Lib\References\MySQL\MySql.Data.dll diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Database.MySQL/WebsitePanel.Providers.Database.MySQL.csproj b/WebsitePanel/Sources/WebsitePanel.Providers.Database.MySQL/WebsitePanel.Providers.Database.MySQL.csproj index 5dda564e..a5e5948b 100644 --- a/WebsitePanel/Sources/WebsitePanel.Providers.Database.MySQL/WebsitePanel.Providers.Database.MySQL.csproj +++ b/WebsitePanel/Sources/WebsitePanel.Providers.Database.MySQL/WebsitePanel.Providers.Database.MySQL.csproj @@ -55,8 +55,7 @@ 618 - - False + ..\..\Lib\References\MySQL\MySql.Data.dll diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Pages.config b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Pages.config index 05d15b9a..0dce0ea2 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Pages.config +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Pages.config @@ -65,7 +65,7 @@ - + @@ -175,7 +175,7 @@ - +