merge commit

This commit is contained in:
robvde 2013-08-22 09:01:22 +04:00
commit 754d9127de
73 changed files with 6049 additions and 383 deletions

View file

@ -247,7 +247,25 @@ namespace WebsitePanel.Server
}
}
[WebMethod, SoapHeader("settings")]
public string[] GetPolicyList(LyncPolicyType type, string name)
{
string[] ret = null;
try
{
Log.WriteStart("{0}.GetPolicyList", ProviderSettings.ProviderName);
ret = Lync.GetPolicyList(type, name);
Log.WriteEnd("{0}.GetPolicyList", ProviderSettings.ProviderName);
}
catch (Exception ex)
{
Log.WriteError(String.Format("Error: {0}.GetPolicyList", ProviderSettings.ProviderName), ex);
throw;
}
return ret;
}
}