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

Merge

Browse source
This commit is contained in:
vfedosevich 2015-02-26 23:19:19 -08:00
commit e9c7b0868b
580 changed files with 247313 additions and 5211 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel/Sources/WebsitePanel.Providers.Base/EnterpriseStorage/IEnterpriseStorage.cs
View file

@ -46,6 +46,6 @@ namespace WebsitePanel.Providers.EnterpriseStorage
bool SetFolderWebDavRules(string organizationId, string folder, WebDavSetting setting, WebDavFolderRule[] rules);
WebDavFolderRule[] GetFolderWebDavRules(string organizationId, string folder, WebDavSetting setting);
bool CheckFileServicesInstallation();
SystemFile[] Search(string organizationId, string[] searchPaths, string searchText, string userPrincipalName, bool recursive);
}
}

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

@ -62,6 +62,7 @@ namespace WebsitePanel.Providers.HostedSolution
public const string CustomAttribute2 = "extensionAttribute2";
public const string DistinguishedName = "distinguishedName";
public const string SID = "objectSid";
public const string PwdLastSet = "pwdLastSet";
public const string UserAccountControl = "UserAccountControl";
}
}

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

@ -64,7 +64,8 @@ namespace WebsitePanel.Providers.HostedSolution
string jobTitle,
string company, string department, string office, string managerAccountName,
string businessPhone, string fax, string homePhone, string mobilePhone, string pager,
string webPage, string notes, string externalEmail);
string webPage, string notes, string externalEmail,
bool userMustChangePassword);
void SetUserPassword(string organizationId, string accountName, string password);

7
WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/OrganizationUser.cs
View file

@ -327,5 +327,12 @@ namespace WebsitePanel.Providers.HostedSolution
set { isVip = value; }
}
private bool userMustChangePassword;
public bool UserMustChangePassword
{
get { return userMustChangePassword; }
set { userMustChangePassword = value; }
}
}
}

2
WebsitePanel/Sources/WebsitePanel.Providers.Base/Mail/MailAccount.cs
View file

@ -33,7 +33,7 @@ namespace WebsitePanel.Providers.Mail
[Serializable]
public class MailAccount : ServiceProviderItem
{
private bool enabled;
private bool enabled = true;
private string password;
private string replyTo;
private bool responderEnabled;

2
WebsitePanel/Sources/WebsitePanel.Providers.Base/OS/SystemFile.cs
View file

@ -144,6 +144,8 @@ namespace WebsitePanel.Providers.OS
set { this.url = value; }
}
public string RelativeUrl { get; set; }
public string DriveLetter
{
get { return this.driveLetter; }

7
WebsitePanel/Sources/WebsitePanel.Providers.Base/Web/WebSite.cs
View file

@ -55,6 +55,7 @@ namespace WebsitePanel.Providers.Web
private bool frontPageInstalled;
private bool coldFusionAvailable;
private bool createCFVirtualDirectories;
private bool createCFVirtualDirectoriesPol;
private string frontPageAccount;
private string frontPagePassword;
private string coldFusionVersion;
@ -157,6 +158,12 @@ namespace WebsitePanel.Providers.Web
get { return this.createCFVirtualDirectories; }
set { this.createCFVirtualDirectories = value; }
}
public bool CreateCFVirtualDirectoriesPol
{
get { return this.createCFVirtualDirectoriesPol; }
set { this.createCFVirtualDirectoriesPol = value; }
}
public ServerState SiteState
{