Merge

WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeAccountType.cs

@@ -39,7 +39,7 @@ namespace WebsitePanel.Providers.HostedSolution
 		Equipment = 6,
         User = 7,
         SecurityGroup = 8,
-        DefaultSecurityGroup = 9
-
+        DefaultSecurityGroup = 9,
+        SharedMailbox = 10
 	}
 }

WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeMailboxPlan.cs

@@ -38,6 +38,15 @@ namespace WebsitePanel.Providers.HostedSolution
         int itemId;
         int mailboxPlanId;
         string mailboxPlan;
+
+        public override string ToString()
+        {
+            if (mailboxPlan != null)
+                return mailboxPlan;
+
+            return base.ToString();
+        }
+
         int mailboxSizeMB;
         int maxRecipients;
         int maxSendMessageSizeKB;
@@ -63,7 +72,6 @@ namespace WebsitePanel.Providers.HostedSolution
         string litigationHoldUrl;
         string litigationHoldMsg;
 
-
         public int ItemId
         {
             get { return this.itemId; }

WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/OrganizationStatistics.cs

@@ -341,6 +341,36 @@ namespace WebsitePanel.Providers.HostedSolution
             get { return usedArchingStorage; }
             set { usedArchingStorage = value; }
         }
+
+        int allocatedSharedMailboxes;
+        public int AllocatedSharedMailboxes
+        {
+            get { return allocatedSharedMailboxes; }
+            set { allocatedSharedMailboxes = value; }
+        }
+
+        int createdSharedMailboxes;
+        public int CreatedSharedMailboxes
+        {
+            get { return createdSharedMailboxes; }
+            set { createdSharedMailboxes = value; }
+        }
+
+        int allocatedResourceMailboxes;
+        public int AllocatedResourceMailboxes
+        {
+            get { return allocatedResourceMailboxes; }
+            set { allocatedResourceMailboxes = value; }
+        }
+
+        int createdResourceMailboxes;
+        public int CreatedResourceMailboxes
+        {
+            get { return createdResourceMailboxes; }
+            set { createdResourceMailboxes = value; }
+        }
+
+
 	}
 }
 

WebsitePanel/Sources/WebsitePanel.Providers.Base/RemoteDesktopServices/RdsPolicyTypes.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace WebsitePanel.Providers.RemoteDesktopServices
+{
+    public enum RdsPolicyTypes
+    {
+        RdCap,
+        RdRap
+    }
+}

WebsitePanel/Sources/WebsitePanel.Providers.Base/WebsitePanel.Providers.Base.csproj

@@ -131,6 +131,7 @@
     <Compile Include="RemoteDesktopServices\IRemoteDesktopServices.cs" />
     <Compile Include="RemoteDesktopServices\RdsCollection.cs" />
     <Compile Include="RemoteDesktopServices\RdsCollectionPaged.cs" />
+    <Compile Include="RemoteDesktopServices\RdsPolicyTypes.cs" />
     <Compile Include="RemoteDesktopServices\RdsServer.cs" />
     <Compile Include="RemoteDesktopServices\RdsServersPaged.cs" />
     <Compile Include="RemoteDesktopServices\RemoteApplication.cs" />