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

Commit merge and fixed merging impact

Browse source
This commit is contained in:
robvde 2013-08-26 19:40:04 +04:00
commit 8bc4ebc9d9
31 changed files with 1422 additions and 241 deletions
Download patch file Download diff file Expand all files Collapse all files

1
WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ADAttributes.cs
View file

@ -61,7 +61,6 @@ namespace WebsitePanel.Providers.HostedSolution
public const string ExternalEmail = "mail";
public const string CustomAttribute2 = "extensionAttribute2";
public const string DistinguishedName = "distinguishedName";
public const string ManagedBy = "ManagedBy";
}
}

16
WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ActiveDirectoryUtils.cs
View file

@ -51,7 +51,7 @@ namespace WebsitePanel.Providers.HostedSolution
DirectorySearcher deSearch = new DirectorySearcher
{
Filter =
("(&(objectClass=user))")
"(&(objectClass=user))"
};
SearchResultCollection srcUsers = deSearch.FindAll();
@ -63,9 +63,19 @@ namespace WebsitePanel.Providers.HostedSolution
foreach (string str in props)
{
if (str.IndexOf(group) != -1)
string groupName = "";
string[] parts = str.Split(',');
for (int i = 0; i < parts.Length; i++)
{
rets.Add(de.Path);
if (parts[i].StartsWith("CN="))
{
if (parts[i].Substring(3) == group)
{
rets.Add(de.Path);
}
break;
}
}
}
}

6
WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/IOrganization.cs
View file

@ -42,16 +42,18 @@ namespace WebsitePanel.Providers.HostedSolution
OrganizationUser GetUserGeneralSettings(string loginName, string organizationId);
int CreateSecurityGroup(string organizationId, string groupName, string managedBy);
int CreateSecurityGroup(string organizationId, string groupName);
OrganizationSecurityGroup GetSecurityGroupGeneralSettings(string groupName, string organizationId);
void DeleteSecurityGroup(string groupName, string organizationId);
void SetSecurityGroupGeneralSettings(string organizationId, string groupName, string managedBy, string[] memberAccounts, string notes);
void SetSecurityGroupGeneralSettings(string organizationId, string groupName, string[] memberAccounts, string notes);
void AddUserToSecurityGroup(string organizationId, string loginName, string groupName);
void DeleteUserFromSecurityGroup(string organizationId, string loginName, string groupName);
void SetUserGeneralSettings(string organizationId, string accountName, string displayName, string password,
bool hideFromAddressBook, bool disabled, bool locked, string firstName, string initials,
string lastName,

6
WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/OrganizationSecurityGroup.cs
View file

@ -25,12 +25,6 @@ namespace WebsitePanel.Providers.HostedSolution
set;
}
public OrganizationUser ManagerAccount
{
get;
set;
}
public string Notes
{
get;