Merge commit

This commit is contained in:
robvde 2015-03-07 08:00:32 +08:00
commit 23b41102bf
424 changed files with 65508 additions and 4473 deletions

View file

@ -158,6 +158,24 @@ namespace WebsitePanel.EnterpriseServer
return EnterpriseStorageController.CheckUsersDomainExists(itemId);
}
[WebMethod]
public string GetWebDavPortalUserSettingsByAccountId(int accountId)
{
return EnterpriseStorageController.GetWebDavPortalUserSettingsByAccountId(accountId);
}
[WebMethod]
public void UpdateWebDavPortalUserSettings(int accountId, string settings)
{
EnterpriseStorageController.UpdateUserSettings(accountId,settings);
}
[WebMethod]
public SystemFile[] SearchFiles(int itemId, string[] searchPaths, string searchText, string userPrincipalName, bool recursive)
{
return EnterpriseStorageController.SearchFiles(itemId, searchPaths, searchText, userPrincipalName, recursive);
}
#region Directory Browsing
[WebMethod]

View file

@ -189,9 +189,9 @@ namespace WebsitePanel.EnterpriseServer
}
[WebMethod]
public ResultObject RemoveRdsServerFromOrganization(int rdsServerId)
public ResultObject RemoveRdsServerFromOrganization(int itemId, int rdsServerId)
{
return RemoteDesktopServicesController.RemoveRdsServerFromOrganization(rdsServerId);
return RemoteDesktopServicesController.RemoveRdsServerFromOrganization(itemId, rdsServerId);
}
[WebMethod]
@ -289,5 +289,47 @@ namespace WebsitePanel.EnterpriseServer
{
return RemoteDesktopServicesController.GetRdsCollectionSessionHosts(collectionId);
}
[WebMethod]
public RdsServerInfo GetRdsServerInfo(int itemId, string fqdnName)
{
return RemoteDesktopServicesController.GetRdsServerInfo(itemId, fqdnName);
}
[WebMethod]
public string GetRdsServerStatus(int itemId, string fqdnName)
{
return RemoteDesktopServicesController.GetRdsServerStatus(itemId, fqdnName);
}
[WebMethod]
public ResultObject ShutDownRdsServer(int itemId, string fqdnName)
{
return RemoteDesktopServicesController.ShutDownRdsServer(itemId, fqdnName);
}
[WebMethod]
public ResultObject RestartRdsServer(int itemId, string fqdnName)
{
return RemoteDesktopServicesController.RestartRdsServer(itemId, fqdnName);
}
[WebMethod]
public List<OrganizationUser> GetRdsCollectionLocalAdmins(int collectionId)
{
return RemoteDesktopServicesController.GetRdsCollectionLocalAdmins(collectionId);
}
[WebMethod]
public ResultObject SaveRdsCollectionLocalAdmins(OrganizationUser[] users, int collectionId)
{
return RemoteDesktopServicesController.SaveRdsCollectionLocalAdmins(users, collectionId);
}
[WebMethod]
public ResultObject InstallSessionHostsCertificate(int collectionId, byte[] certificate, string password)
{
return RemoteDesktopServicesController.InstallSessionHostsCertificate(collectionId, certificate, password);
}
}
}