Merge

WebsitePanel/Database/update_db.sql

@@ -6004,6 +6004,44 @@ RETURN
 GO
 
 
+
+IF OBJECTPROPERTY(object_id('dbo.GetExchangeAccountByAccountNameWithoutItemId'), N'IsProcedure') = 1
+DROP PROCEDURE [dbo].[GetExchangeAccountByAccountNameWithoutItemId]
+GO
+CREATE PROCEDURE [dbo].[GetExchangeAccountByAccountNameWithoutItemId] 
+(
+	@PrimaryEmailAddress nvarchar(300)
+)
+AS
+SELECT
+	E.AccountID,
+	E.ItemID,
+	E.AccountType,
+	E.AccountName,
+	E.DisplayName,
+	E.PrimaryEmailAddress,
+	E.MailEnabledPublicFolder,
+	E.MailboxManagerActions,
+	E.SamAccountName,
+	E.AccountPassword,
+	E.MailboxPlanId,
+	P.MailboxPlan,
+	E.SubscriberNumber,
+	E.UserPrincipalName,
+	E.ArchivingMailboxPlanId, 
+	AP.MailboxPlan as 'ArchivingMailboxPlan',
+	E.EnableArchiving
+FROM
+	ExchangeAccounts AS E
+LEFT OUTER JOIN ExchangeMailboxPlans AS P ON E.MailboxPlanId = P.MailboxPlanId	
+LEFT OUTER JOIN ExchangeMailboxPlans AS AP ON E.ArchivingMailboxPlanId = AP.MailboxPlanId
+WHERE
+	E.PrimaryEmailAddress = @PrimaryEmailAddress
+RETURN
+GO
+
+
+
 -- wsp-10269: Changed php extension path in default properties for IIS70 and IIS80 provider
 update ServiceDefaultProperties
 set PropertyValue='%PROGRAMFILES(x86)%\PHP\php-cgi.exe'
@@ -7393,4 +7431,43 @@ LEFT OUTER JOIN ServiceItems AS MD ON D.MailDomainID = MD.ItemID
 LEFT OUTER JOIN ServiceItems AS Z ON D.ZoneItemID = Z.ItemID
 RETURN
 
-GO
+GO
+
+-- fix Disk Space Report
+
+IF EXISTS (SELECT * FROM SYS.OBJECTS WHERE type = 'P' AND name = 'GetPackageDiskspace')
+DROP PROCEDURE GetPackageDiskspace
+GO
+
+CREATE PROCEDURE [dbo].[GetPackageDiskspace]
+(
+	@ActorID int,
+	@PackageID int
+)
+AS
+
+-- check rights
+IF dbo.CheckActorPackageRights(@ActorID, @PackageID) = 0
+RAISERROR('You are not allowed to access this package', 16, 1)
+
+SELECT
+	RG.GroupID,
+	RG.GroupName,
+	ROUND(CONVERT(float, ISNULL(GD.Diskspace, 0)) / 1024 / 1024, 0) AS Diskspace,
+	ISNULL(GD.Diskspace, 0) AS DiskspaceBytes
+FROM ResourceGroups AS RG
+LEFT OUTER JOIN
+(
+	SELECT
+		PD.GroupID,
+		SUM(ISNULL(PD.DiskSpace, 0)) AS Diskspace -- in megabytes
+	FROM PackagesTreeCache AS PT
+	INNER JOIN PackagesDiskspace AS PD ON PT.PackageID = PD.PackageID
+	INNER JOIN Packages AS P ON PT.PackageID = P.PackageID
+	WHERE PT.ParentPackageID = @PackageID
+	GROUP BY PD.GroupID
+) AS GD ON RG.GroupID = GD.GroupID
+WHERE GD.Diskspace <> 0
+ORDER BY RG.GroupOrder
+
+RETURN