Merge commit

This commit is contained in:
robvde 2015-02-06 06:46:08 +08:00
commit 71ea83b859
306 changed files with 20481 additions and 7981 deletions

View file

@ -40,6 +40,7 @@ namespace WebsitePanel.Providers.HostedSolution
User = 7,
SecurityGroup = 8,
DefaultSecurityGroup = 9,
SharedMailbox = 10
SharedMailbox = 10,
DeletedUser = 11
}
}

View file

@ -247,6 +247,13 @@ namespace WebsitePanel.Providers.HostedSolution
set { this.archiveWarningPct = value; }
}
bool enableForceArchiveDeletion;
public bool EnableForceArchiveDeletion
{
get { return this.enableForceArchiveDeletion; }
set { this.enableForceArchiveDeletion = value; }
}
public string WSPUniqueName
{
get

View file

@ -143,6 +143,7 @@ namespace WebsitePanel.Providers.HostedSolution
int RemoveDisclamerMember(string name, string member);
// Archiving
ResultObject ExportMailBox(string organizationId, string accountName, string storagePath);
ResultObject SetMailBoxArchiving(string organizationId, string accountName, bool archive, long archiveQuotaKB, long archiveWarningQuotaKB, string RetentionPolicy);
// Retention policy

View file

@ -39,6 +39,8 @@ namespace WebsitePanel.Providers.HostedSolution
int CreateUser(string organizationId, string loginName, string displayName, string upn, string password, bool enabled);
void DisableUser(string loginName, string organizationId);
void DeleteUser(string loginName, string organizationId);
OrganizationUser GetUserGeneralSettings(string loginName, string organizationId);

View file

@ -0,0 +1,53 @@
// Copyright (c) 2014, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,
// are permitted provided that the following conditions are met:
//
// - Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
//
// - Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
//
// - Neither the name of the Outercurve Foundation nor the names of its
// contributors may be used to endorse or promote products derived from this
// software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
using System;
namespace WebsitePanel.Providers.HostedSolution
{
public class OrganizationDeletedUser
{
public int Id { get; set; }
public int AccountId { get; set; }
public ExchangeAccountType OriginAT { get; set; }
public string StoragePath { get; set; }
public string FolderName { get; set; }
public string FileName { get; set; }
public DateTime ExpirationDate { get; set; }
public OrganizationUser User { get; set; }
public bool IsArchiveEmpty { get; set; }
}
}

View file

@ -0,0 +1,48 @@
// Copyright (c) 2014, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,
// are permitted provided that the following conditions are met:
//
// - Redistributions of source code must retain the above copyright notice, this
// list of conditions and the following disclaimer.
//
// - Redistributions in binary form must reproduce the above copyright notice,
// this list of conditions and the following disclaimer in the documentation
// and/or other materials provided with the distribution.
//
// - Neither the name of the Outercurve Foundation nor the names of its
// contributors may be used to endorse or promote products derived from this
// software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace WebsitePanel.Providers.HostedSolution
{
public class OrganizationDeletedUsersPaged
{
int recordsCount;
OrganizationDeletedUser[] pageDeletedUsers;
public int RecordsCount
{
get { return recordsCount; }
set { recordsCount = value; }
}
public OrganizationDeletedUser[] PageDeletedUsers
{
get { return pageDeletedUsers; }
set { pageDeletedUsers = value; }
}
}
}

View file

@ -82,6 +82,12 @@ namespace WebsitePanel.Providers.HostedSolution
private int createdProfessionalCRMUsers;
private int allocatedProfessionalCRMUsers;
private int allocatedDeletedUsers;
private int deletedUsers;
private int allocatedDeletedUsersBackupStorageSpace;
private int usedDeletedUsersBackupStorageSpace;
public int CreatedProfessionalCRMUsers
{
get { return createdProfessionalCRMUsers; }
@ -370,7 +376,35 @@ namespace WebsitePanel.Providers.HostedSolution
set { createdResourceMailboxes = value; }
}
public int AllocatedDeletedUsers
{
get { return allocatedDeletedUsers; }
set { allocatedDeletedUsers = value; }
}
public int DeletedUsers
{
get { return deletedUsers; }
set { deletedUsers = value; }
}
public int AllocatedDeletedUsersBackupStorageSpace
{
get { return allocatedDeletedUsersBackupStorageSpace; }
set { allocatedDeletedUsersBackupStorageSpace = value; }
}
public int UsedDeletedUsersBackupStorageSpace
{
get { return usedDeletedUsersBackupStorageSpace; }
set { usedDeletedUsersBackupStorageSpace = value; }
}
public int CreatedRdsServers { get; set; }
public int CreatedRdsCollections { get; set; }
public int CreatedRdsUsers { get; set; }
public int AllocatedRdsServers { get; set; }
public int AllocatedRdsCollections { get; set; }
public int AllocatedRdsUsers { get; set; }
}
}

View file

@ -65,5 +65,9 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
bool SetApplicationUsers(string collectionName, RemoteApplication remoteApp, string[] users);
bool CheckRDSServerAvaliable(string hostname);
List<string> GetServersExistingInCollections();
void EditRdsCollectionSettings(RdsCollection collection);
List<RdsUserSession> GetRdsUserSessions(string collectionName);
void LogOffRdsUser(string unifiedSessionId, string hostServer);
List<string> GetRdsCollectionSessionHosts(string collectionName);
}
}

View file

@ -37,13 +37,15 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
public RdsCollection()
{
Servers = new List<RdsServer>();
Settings = new RdsCollectionSettings();
}
public int Id { get; set; }
public int ItemId { get; set; }
public string Name { get; set; }
public string Description { get; set; }
public string DisplayName { get; set; }
public List<RdsServer> Servers { get; set; }
public RdsCollectionSettings Settings { get; set; }
}
}

View file

@ -0,0 +1,26 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace WebsitePanel.Providers.RemoteDesktopServices
{
[Serializable]
public class RdsCollectionSettings
{
public int Id { get; set; }
public int RdsCollectionId { get; set; }
public int DisconnectedSessionLimitMin { get; set; }
public int ActiveSessionLimitMin { get; set; }
public int IdleSessionLimitMin { get; set; }
public string BrokenConnectionAction { get; set; }
public bool AutomaticReconnectionEnabled { get; set; }
public bool TemporaryFoldersDeletedOnExit { get; set; }
public bool TemporaryFoldersPerSession { get; set; }
public string ClientDeviceRedirectionOptions { get; set; }
public bool ClientPrinterRedirected { get; set; }
public bool ClientPrinterAsDefault { get; set; }
public bool RDEasyPrintDriverEnabled { get; set; }
public int MaxRedirectedMonitors { get; set; }
}
}

View file

@ -0,0 +1,38 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace WebsitePanel.Providers.RemoteDesktopServices
{
public enum BrokenConnectionActionValues
{
Disconnect,
LogOff
}
public enum ClientDeviceRedirectionOptionValues
{
AudioVideoPlayBack,
AudioRecording,
SmartCard,
PlugAndPlayDevice,
Drive,
Clipboard
}
public enum SecurityLayerValues
{
RDP,
Negotiate,
SSL
}
public enum EncryptionLevel
{
Low,
ClientCompatible,
High,
FipsCompliant
}
}

View file

@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace WebsitePanel.Providers.RemoteDesktopServices
{
public class RdsUserSession
{
public string CollectionName { get; set; }
public string UserName { get; set; }
public string UnifiedSessionId { get; set; }
public string SessionState { get; set; }
public string HostServer { get; set; }
public string DomainName { get; set; }
}
}

View file

@ -35,5 +35,6 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
public string FilePath { get; set; }
public string FileVirtualPath { get; set; }
public bool ShowInWebAccess { get; set; }
public string RequiredCommandLine { get; set; }
}
}

View file

@ -33,5 +33,7 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
public string DisplayName { get; set; }
public string FilePath { get; set; }
public string FileVirtualPath { get; set; }
public string RequiredCommandLine { get; set; }
public string Alias { get; set; }
}
}

View file

@ -120,6 +120,8 @@
<Compile Include="HostedSolution\LyncUsersPaged.cs" />
<Compile Include="HostedSolution\LyncVoicePolicyType.cs" />
<Compile Include="HostedSolution\OrganizationSecurityGroup.cs" />
<Compile Include="HostedSolution\OrganizationDeletedUser.cs" />
<Compile Include="HostedSolution\OrganizationDeletedUsersPaged.cs" />
<Compile Include="HostedSolution\TransactionAction.cs" />
<Compile Include="OS\MappedDrivesPaged.cs" />
<Compile Include="OS\MappedDrive.cs" />
@ -129,9 +131,12 @@
<Compile Include="RemoteDesktopServices\IRemoteDesktopServices.cs" />
<Compile Include="RemoteDesktopServices\RdsCollection.cs" />
<Compile Include="RemoteDesktopServices\RdsCollectionPaged.cs" />
<Compile Include="RemoteDesktopServices\RdsCollectionSettings.cs" />
<Compile Include="RemoteDesktopServices\RdsEnums.cs" />
<Compile Include="RemoteDesktopServices\RdsPolicyTypes.cs" />
<Compile Include="RemoteDesktopServices\RdsServer.cs" />
<Compile Include="RemoteDesktopServices\RdsServersPaged.cs" />
<Compile Include="RemoteDesktopServices\RdsUserSession.cs" />
<Compile Include="RemoteDesktopServices\RemoteApplication.cs" />
<Compile Include="RemoteDesktopServices\SessionHostServer.cs" />
<Compile Include="RemoteDesktopServices\StartMenuApp.cs" />