merge commit

This commit is contained in:
robvde 2015-04-07 20:55:22 +08:00
commit 6bd2d6156d
22 changed files with 359 additions and 144 deletions

View file

@ -83,5 +83,6 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
void MoveSessionHostToRdsOU(string hostName);
void ApplyGPO(string organizationId, string collectionName, RdsServerSettings serverSettings);
void ShadowSession(string sessionId, bool control);
void MoveSessionHostsToCollectionOU(List<RdsServer> servers, string collectionName, string organizationId);
}
}

View file

@ -45,6 +45,9 @@ namespace WebsitePanel.EnterpriseServer.Base.RDS
public const string RDS_CONTROL_WITHOUT_PERMISSION = "RDSControlWithoutPermission";
public const string RDS_CONTROL_WITHOUT_PERMISSION_ADMINISTRATORS = "RDSControlWithoutPermissionAdministrators";
public const string RDS_CONTROL_WITHOUT_PERMISSION_Users = "RDSControlWithoutPermissionUsers";
public const string DISABLE_CMD = "DisableCMD";
public const string DISABLE_CMD_ADMINISTRATORS = "DisableCMDAdministrators";
public const string DISABLE_CMD_USERS = "DisableCMDUsers";
public string SettingsName { get; set; }
public int ServerId { get; set; }