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

merge commit

Browse source
This commit is contained in:
robvde 2013-01-25 17:50:50 +04:00
commit 4fcede5919
2 changed files with 39 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
WebsitePanel/Sources/Tools/WebsitePanel.Import.CsvBulk/ExchangeImport.cs
View file

@ -581,7 +581,8 @@ namespace WebsitePanel.Import.CsvBulk
Log.WriteError(string.Format("Error at line {0}: {1}", index + 1, errorMessage)); Log.WriteError(string.Format("Error at line {0}: {1}", index + 1, errorMessage));
return false; return false;
} }
ExchangeMailbox mailbox = ES.Services.ExchangeServer.GetMailboxGeneralSettings(orgId, accountId); //ExchangeMailbox mailbox = ES.Services.ExchangeServer.GetMailboxGeneralSettings(orgId, accountId);
OrganizationUser mailbox = ES.Services.Organizations.GetUserGeneralSettings(orgId, accountId);
mailbox.FirstName = firstName; mailbox.FirstName = firstName;
mailbox.Initials = middleName; mailbox.Initials = middleName;
@ -611,7 +612,14 @@ namespace WebsitePanel.Import.CsvBulk
mailbox.JobTitle, mailbox.Company, mailbox.Department, mailbox.Office, null, mailbox.BusinessPhone, mailbox.JobTitle, mailbox.Company, mailbox.Department, mailbox.Office, null, mailbox.BusinessPhone,
mailbox.Fax, mailbox.HomePhone, mailbox.MobilePhone, mailbox.Pager, mailbox.WebPage, mailbox.Notes); mailbox.Fax, mailbox.HomePhone, mailbox.MobilePhone, mailbox.Pager, mailbox.WebPage, mailbox.Notes);
*/ */
ret = true; ES.Services.Organizations.SetUserGeneralSettings(orgId, accountId, mailbox.DisplayName,
null, /*mailbox.HideFromAddressBook*/ false, mailbox.Disabled, mailbox.Locked, mailbox.FirstName, mailbox.Initials,
mailbox.LastName, mailbox.Address, mailbox.City, mailbox.State, mailbox.Zip, mailbox.Country,
mailbox.JobTitle, mailbox.Company, mailbox.Department, mailbox.Office, null, mailbox.BusinessPhone,
mailbox.Fax, mailbox.HomePhone, mailbox.MobilePhone, mailbox.Pager, mailbox.WebPage, mailbox.Notes,
// these are new and not in csv ...
mailbox.ExternalEmail, mailbox.SubscriberNumber);
ret = true;
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -750,13 +758,11 @@ namespace WebsitePanel.Import.CsvBulk
user.Notes = notes; user.Notes = notes;
//update //update
/*
ES.Services.Organizations.SetUserGeneralSettings(orgId, accountId, user.DisplayName, ES.Services.Organizations.SetUserGeneralSettings(orgId, accountId, user.DisplayName,
null, false, user.Disabled, user.Locked, user.FirstName, user.Initials, null, false, user.Disabled, user.Locked, user.FirstName, user.Initials,
user.LastName, user.Address, user.City, user.State, user.Zip, user.Country, user.LastName, user.Address, user.City, user.State, user.Zip, user.Country,
user.JobTitle, user.Company, user.Department, user.Office, null, user.BusinessPhone, user.JobTitle, user.Company, user.Department, user.Office, null, user.BusinessPhone,
user.Fax, user.HomePhone, user.MobilePhone, user.Pager, user.WebPage, user.Notes, user.ExternalEmail); user.Fax, user.HomePhone, user.MobilePhone, user.Pager, user.WebPage, user.Notes, user.ExternalEmail, user.SubscriberNumber);
*/
ret = true; ret = true;
} }
catch (Exception ex) catch (Exception ex)

37
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebSitesHeliconApeControl.ascx.cs
View file

@ -53,7 +53,20 @@ namespace WebsitePanel.Portal
private HeliconApeStatus HeliconApeStatus private HeliconApeStatus HeliconApeStatus
{ {
get { return (HeliconApeStatus)ViewState["HeliconApeStatus"]; } get
{
if (null == ViewState["HeliconApeStatus"])
{
HeliconApeStatus nullstatus = new HeliconApeStatus();
return nullstatus;
}
else
{
return (HeliconApeStatus)ViewState["HeliconApeStatus"];
}
}
set { ViewState["HeliconApeStatus"] = value; } set { ViewState["HeliconApeStatus"] = value; }
} }
@ -91,17 +104,23 @@ namespace WebsitePanel.Portal
// Render a warning message about the automatic site's settings change // Render a warning message about the automatic site's settings change
if (!HeliconApeStatus.IsEnabled && site.IIs7) if (site.IIs7)
{ {
// Ensure the message is displayed only when neccessary if (!HeliconApeStatus.IsEnabled)
if (site.EnableWindowsAuthentication || !site.AspNetInstalled.EndsWith("I") || site.SecuredFoldersInstalled)
{ {
// TODO: show warning, do not force to enable integrated pool // Ensure the message is displayed only when neccessary
string warningStr = GetLocalizedString("EnableFoldersIIs7Warning.Text"); if (site.EnableWindowsAuthentication || !site.AspNetInstalled.EndsWith("I") || site.SecuredFoldersInstalled)
// Render a warning only if specified {
if (!String.IsNullOrEmpty(warningStr)) // TODO: show warning, do not force to enable integrated pool
btnToggleHeliconApe.OnClientClick = String.Format("return confirm('{0}')", warningStr); string warningStr = GetLocalizedString("EnableFoldersIIs7Warning.Text");
// Render a warning only if specified
if (!String.IsNullOrEmpty(warningStr))
btnToggleHeliconApe.OnClientClick = String.Format("return confirm('{0}')", warningStr);
}
} }
} }
// toggle // toggle
ToggleControls(); ToggleControls();