merge

WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config

@@ -5,8 +5,7 @@
   </configSections>
   <!-- Connection strings -->
   <connectionStrings>
-    <!--<add name="EnterpriseServer" connectionString="Server=(local)\SQLExpress;Database=WebsitePanel;uid=sa;pwd=Password12" providerName="System.Data.SqlClient"/>-->
-    <add name="EnterpriseServer" connectionString="Data Source=CHERNETSI\BENQMSSERVER;Initial Catalog=WebsitePanel;uid=sa;pwd=Password12;Integrated Security=True;" providerName="System.Data.SqlClient" />
+    <add name="EnterpriseServer" connectionString="Server=(local)\SQLExpress;Database=WebsitePanel;uid=sa;pwd=Password12" providerName="System.Data.SqlClient"/>
   </connectionStrings>
   <appSettings>
     <!-- Encryption util settings -->

WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esEnterpriseStorage.asmx.cs

@@ -56,6 +56,29 @@ namespace WebsitePanel.EnterpriseServer
     [ToolboxItem(false)]
     public class esEnterpriseStorage : WebService
     {
+        [WebMethod]
+        public int AddWebDavAccessToken(WebDavAccessToken accessToken)
+        {
+           return EnterpriseStorageController.AddWebDavAccessToken(accessToken);
+        }
+
+        [WebMethod]
+        public void DeleteExpiredWebDavAccessTokens()
+        {
+            EnterpriseStorageController.DeleteExpiredWebDavAccessTokens();
+        }
+
+        [WebMethod]
+        public WebDavAccessToken GetWebDavAccessTokenById(int id)
+        {
+            return EnterpriseStorageController.GetWebDavAccessTokenById(id);
+        }
+
+        [WebMethod]
+        public WebDavAccessToken GetWebDavAccessTokenByAccessToken(Guid accessToken)
+        {
+            return EnterpriseStorageController.GetWebDavAccessTokenByAccessToken(accessToken);
+        }
 
         [WebMethod]
         public bool CheckFileServicesInstallation(int serviceId)

WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esExchangeServer.asmx.cs

@@ -344,6 +344,18 @@ namespace WebsitePanel.EnterpriseServer
             return ExchangeServerController.SetMailboxPermissions(itemId, accountId, sendAsaccounts, fullAccessAcounts);
         }
 
+        [WebMethod]
+        public int ExportMailBox(int itemId, int accountId, string path)
+        {
+            return ExchangeServerController.ExportMailBox(itemId, accountId, path);
+        }
+
+        [WebMethod]
+        public int SetDeletedMailbox(int itemId, int accountId)
+        {
+            return ExchangeServerController.SetDeletedMailbox(itemId, accountId);
+        }
+
 
         #endregion
 

WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esOrganizations.asmx.cs

@@ -193,6 +193,12 @@ namespace WebsitePanel.EnterpriseServer
             return OrganizationController.ImportUser(itemId, accountName, displayName, name, domain, password, subscriberNumber);
         }
 
+        [WebMethod]
+        public OrganizationDeletedUsersPaged GetOrganizationDeletedUsersPaged(int itemId, string filterColumn, string filterValue, string sortColumn,
+            int startRow, int maximumRows)
+        {
+            return OrganizationController.GetOrganizationDeletedUsersPaged(itemId, filterColumn, filterValue, sortColumn, startRow, maximumRows);
+        }
 
         [WebMethod]
         public OrganizationUsersPaged GetOrganizationUsersPaged(int itemId, string filterColumn, string filterValue, string sortColumn,
@@ -248,6 +254,17 @@ namespace WebsitePanel.EnterpriseServer
                 filterColumn, filterValue, sortColumn, includeMailboxes);
         }
 
+        [WebMethod]
+        public int SetDeletedUser(int itemId, int accountId, bool enableForceArchive)
+        {
+            return OrganizationController.SetDeletedUser(itemId, accountId, enableForceArchive);
+        }
+        
+        [WebMethod]
+        public byte[] GetArchiveFileBinaryChunk(int packageId, string path, int offset, int length)
+        {
+            return OrganizationController.GetArchiveFileBinaryChunk(packageId, path, offset, length);
+        }
 
         [WebMethod]
         public int DeleteUser(int itemId, int accountId)

WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esPackages.asmx.cs

@@ -262,6 +262,11 @@ namespace WebsitePanel.EnterpriseServer
             return PackageController.UpdatePackageSettings(settings);
         }
 
+        [WebMethod]
+        public bool SetDefaultTopPackage(int userId, int packageId) {
+            return PackageController.SetDefaultTopPackage(userId, packageId);
+        }
+
         #endregion
 
         #region Package Add-ons

WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esRemoteDesktopServices.asmx.cs

@@ -58,6 +58,12 @@ namespace WebsitePanel.EnterpriseServer
             return RemoteDesktopServicesController.GetRdsCollection(collectionId);
         }
 
+        [WebMethod]
+        public RdsCollectionSettings GetRdsCollectionSettings(int collectionId)
+        {
+            return RemoteDesktopServicesController.GetRdsCollectionSettings(collectionId);
+        }
+
         [WebMethod]
         public List<RdsCollection> GetOrganizationRdsCollections(int itemId)
         {
@@ -65,7 +71,7 @@ namespace WebsitePanel.EnterpriseServer
         }
 
         [WebMethod]
-        public ResultObject AddRdsCollection(int itemId, RdsCollection collection)
+        public int AddRdsCollection(int itemId, RdsCollection collection)
         {
             return RemoteDesktopServicesController.AddRdsCollection(itemId, collection);
         }
@@ -76,6 +82,12 @@ namespace WebsitePanel.EnterpriseServer
             return RemoteDesktopServicesController.EditRdsCollection(itemId, collection);
         }
 
+        [WebMethod]
+        public ResultObject EditRdsCollectionSettings(int itemId, RdsCollection collection)
+        {
+            return RemoteDesktopServicesController.EditRdsCollectionSettings(itemId, collection);
+        }
+
         [WebMethod]
         public RdsCollectionPaged GetRdsCollectionsPaged(int itemId, string filterColumn, string filterValue,
             string sortColumn, int startRow, int maximumRows)
@@ -99,10 +111,10 @@ namespace WebsitePanel.EnterpriseServer
         }
 
         [WebMethod]
-        public RdsServersPaged GetFreeRdsServersPaged(string filterColumn, string filterValue,
+        public RdsServersPaged GetFreeRdsServersPaged(int packageId, string filterColumn, string filterValue,
             string sortColumn, int startRow, int maximumRows)
         {
-            return RemoteDesktopServicesController.GetFreeRdsServersPaged(filterColumn, filterValue,
+            return RemoteDesktopServicesController.GetFreeRdsServersPaged(packageId, filterColumn, filterValue,
                 sortColumn, startRow, maximumRows);
         }
 
@@ -236,6 +248,18 @@ namespace WebsitePanel.EnterpriseServer
             return RemoteDesktopServicesController.GetOrganizationRdsUsersCount(itemId);
         }
 
+        [WebMethod]
+        public int GetOrganizationRdsServersCount(int itemId)
+        {
+            return RemoteDesktopServicesController.GetOrganizationRdsServersCount(itemId);
+        }
+
+        [WebMethod]
+        public int GetOrganizationRdsCollectionsCount(int itemId)
+        {
+            return RemoteDesktopServicesController.GetOrganizationRdsCollectionsCount(itemId);
+        }        
+
         [WebMethod]
         public List<string> GetApplicationUsers(int itemId, int collectionId, RemoteApplication remoteApp)
         {
@@ -247,5 +271,23 @@ namespace WebsitePanel.EnterpriseServer
         {
             return RemoteDesktopServicesController.SetApplicationUsers(itemId, collectionId, remoteApp, users);
         }
+
+        [WebMethod]
+        public List<RdsUserSession> GetRdsUserSessions(int collectionId)
+        {
+            return RemoteDesktopServicesController.GetRdsUserSessions(collectionId);
+        }
+
+        [WebMethod]
+        public ResultObject LogOffRdsUser(int itemId, string unifiedSessionId, string hostServer)
+        {
+            return RemoteDesktopServicesController.LogOffRdsUser(itemId, unifiedSessionId, hostServer);
+        }
+
+        [WebMethod]
+        public List<string> GetRdsCollectionSessionHosts(int collectionId)
+        {
+            return RemoteDesktopServicesController.GetRdsCollectionSessionHosts(collectionId);
+        }
     }
 }