zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mergecommit

Browse source
This commit is contained in:
robvde 2013-09-10 15:17:13 +04:00
commit aed1199470
81 changed files with 2467 additions and 1113 deletions
Download patch file Download diff file Expand all files Collapse all files

4
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esExchangeServer.asmx.cs
View file

@ -190,12 +190,12 @@ namespace WebsitePanel.EnterpriseServer
[WebMethod]
public List<ExchangeAccount> SearchAccounts(int itemId,
bool includeMailboxes, bool includeContacts, bool includeDistributionLists,
bool includeRooms, bool includeEquipment,
bool includeRooms, bool includeEquipment, bool includeSecurityGroups,
string filterColumn, string filterValue, string sortColumn)
{
return ExchangeServerController.SearchAccounts(itemId,
includeMailboxes, includeContacts, includeDistributionLists,
includeRooms, includeEquipment,
includeRooms, includeEquipment, includeSecurityGroups,
filterColumn, filterValue, sortColumn);
}

20
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esOrganizations.asmx.cs
View file

@ -214,7 +214,7 @@ namespace WebsitePanel.EnterpriseServer
{
return OrganizationController.SetUserPassword(itemId, accountId, password);
}
[WebMethod]
@ -276,29 +276,31 @@ namespace WebsitePanel.EnterpriseServer
}
[WebMethod]
public int AddUserToSecurityGroup(int itemId, int userAccountId, string groupName)
public int AddObjectToSecurityGroup(int itemId, int accountId, string groupName)
{
return OrganizationController.AddUserToSecurityGroup(itemId, userAccountId, groupName);
return OrganizationController.AddObjectToSecurityGroup(itemId, accountId, groupName);
}
[WebMethod]
public int DeleteUserFromSecurityGroup(int itemId, int userAccountId, string groupName)
public int DeleteObjectFromSecurityGroup(int itemId, int accountId, string groupName)
{
return OrganizationController.DeleteUserFromSecurityGroup(itemId, userAccountId, groupName);
return OrganizationController.DeleteObjectFromSecurityGroup(itemId, accountId, groupName);
}
[WebMethod]
public ExchangeAccount[] GetSecurityGroupsByMember(int itemId, int accountId)
{
return OrganizationController.GetSecurityGroupsByMember(itemId, accountId);
return OrganizationController.GetSecurityGroupsByMember(itemId, accountId);
}
[WebMethod]
public List<ExchangeAccount> SearchSecurityGroups(int itemId, string filterColumn, string filterValue, string sortColumn)
public List<ExchangeAccount> SearchOrganizationAccounts(int itemId, string filterColumn, string filterValue,
string sortColumn, bool includeOnlySecurityGroups)
{
return OrganizationController.SearchSecurityGroups(itemId, filterColumn, filterValue, sortColumn);
return OrganizationController.SearchOrganizationAccounts(itemId, filterColumn, filterValue, sortColumn,
includeOnlySecurityGroups);
}
#endregion
}