Merge commit
This commit is contained in:
commit
282fc37fb9
120 changed files with 7282 additions and 4198 deletions
|
@ -0,0 +1,18 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using WebsitePanel.Providers.DNS;
|
||||
|
||||
namespace WebsitePanel.Providers.DomainLookup
|
||||
{
|
||||
public class DnsRecordInfo
|
||||
{
|
||||
public int Id { get; set; }
|
||||
public int DomainId { get; set; }
|
||||
public string DnsServer { get; set; }
|
||||
public DnsRecordType RecordType { get; set; }
|
||||
public string Value { get; set; }
|
||||
public DateTime Date { get; set; }
|
||||
}
|
||||
}
|
|
@ -0,0 +1,16 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using WebsitePanel.Providers.DNS;
|
||||
|
||||
namespace WebsitePanel.Providers.DomainLookup
|
||||
{
|
||||
public class DnsRecordInfoChange
|
||||
{
|
||||
public string DnsServer { get; set; }
|
||||
public DnsRecordInfo Record { get; set; }
|
||||
public DomainDnsRecordStatuses Status { get; set; }
|
||||
public DnsRecordType Type { get; set; }
|
||||
}
|
||||
}
|
|
@ -0,0 +1,19 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
namespace WebsitePanel.Providers.DomainLookup
|
||||
{
|
||||
public class DomainDnsChanges
|
||||
{
|
||||
public string DomainName { get; set; }
|
||||
|
||||
public List<DnsRecordInfoChange> DnsChanges { get; set; }
|
||||
|
||||
public DomainDnsChanges()
|
||||
{
|
||||
DnsChanges = new List<DnsRecordInfoChange>();
|
||||
}
|
||||
}
|
||||
}
|
|
@ -0,0 +1,14 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
namespace WebsitePanel.Providers.DomainLookup
|
||||
{
|
||||
public enum DomainDnsRecordStatuses
|
||||
{
|
||||
NotChanged,
|
||||
Removed,
|
||||
Added
|
||||
}
|
||||
}
|
|
@ -40,7 +40,6 @@ namespace WebsitePanel.Providers.HostedSolution
|
|||
User = 7,
|
||||
SecurityGroup = 8,
|
||||
DefaultSecurityGroup = 9,
|
||||
SharedMailbox = 10,
|
||||
ResourceMailbox = 11
|
||||
SharedMailbox = 10
|
||||
}
|
||||
}
|
||||
|
|
|
@ -38,6 +38,15 @@ namespace WebsitePanel.Providers.HostedSolution
|
|||
int itemId;
|
||||
int mailboxPlanId;
|
||||
string mailboxPlan;
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
if (mailboxPlan != null)
|
||||
return mailboxPlan;
|
||||
|
||||
return base.ToString();
|
||||
}
|
||||
|
||||
int mailboxSizeMB;
|
||||
int maxRecipients;
|
||||
int maxSendMessageSizeKB;
|
||||
|
@ -63,7 +72,6 @@ namespace WebsitePanel.Providers.HostedSolution
|
|||
string litigationHoldUrl;
|
||||
string litigationHoldMsg;
|
||||
|
||||
|
||||
public int ItemId
|
||||
{
|
||||
get { return this.itemId; }
|
||||
|
|
|
@ -28,6 +28,9 @@
|
|||
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using WebsitePanel.Providers.DNS;
|
||||
using WebsitePanel.Providers.DomainLookup;
|
||||
|
||||
namespace WebsitePanel.Providers.OS
|
||||
{
|
||||
|
|
|
@ -48,6 +48,8 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
|
|||
void RemoveSessionHostServerFromCollection(string organizationId, string collectionName, RdsServer server);
|
||||
void RemoveSessionHostServersFromCollection(string organizationId, string collectionName, List<RdsServer> servers);
|
||||
|
||||
void SetRDServerNewConnectionAllowed(bool newConnectionAllowed, RdsServer server);
|
||||
|
||||
List<StartMenuApp> GetAvailableRemoteApplications(string collectionName);
|
||||
List<RemoteApplication> GetCollectionRemoteApplications(string collectionName);
|
||||
bool AddRemoteApplication(string collectionName, RemoteApplication remoteApp);
|
||||
|
|
|
@ -18,5 +18,6 @@ namespace WebsitePanel.Providers.RemoteDesktopServices
|
|||
public string Address { get; set; }
|
||||
public string ItemName { get; set; }
|
||||
public int? RdsCollectionId { get; set; }
|
||||
public bool ConnectionEnabled { get; set; }
|
||||
}
|
||||
}
|
|
@ -85,6 +85,10 @@
|
|||
<Compile Include="Common\ErrorCodes.cs" />
|
||||
<Compile Include="Common\PasswdHelper.cs" />
|
||||
<Compile Include="Common\WPIEntries.cs" />
|
||||
<Compile Include="DomainLookup\DnsRecordInfo.cs" />
|
||||
<Compile Include="DomainLookup\DnsRecordInfoChange.cs" />
|
||||
<Compile Include="DomainLookup\DomainDnsChanges.cs" />
|
||||
<Compile Include="DomainLookup\DomainDnsRecordStatuses.cs" />
|
||||
<Compile Include="EnterpriseStorage\IEnterpriseStorage.cs" />
|
||||
<Compile Include="HeliconZoo\IHeliconZooServer.cs" />
|
||||
<Compile Include="HostedSolution\BaseReport.cs" />
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue