merge commit

This commit is contained in:
robvde 2015-02-15 09:15:02 +08:00
commit 4a80b1bdce
197 changed files with 184514 additions and 1143 deletions

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";
}
}

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);

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; }
}
}
}

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
{