This commit is contained in:
Sergey 2012-09-27 15:36:42 +03:00
commit e61bce879a
10 changed files with 45 additions and 21 deletions

View file

@ -31,7 +31,7 @@ namespace WebsitePanel.Setup
{ {
return UpdateBase(obj, return UpdateBase(obj,
minimalInstallerVersion: "2.0.0", minimalInstallerVersion: "2.0.0",
versionToUpgrade: "1.2.1", versionToUpgrade: "1.2.1,2.0.0",
updateSql: true); updateSql: true);
} }
} }

View file

@ -31,7 +31,7 @@ namespace WebsitePanel.Setup
{ {
return UpdateBase(obj, return UpdateBase(obj,
minimalInstallerVersion: "2.0.0", minimalInstallerVersion: "2.0.0",
versionsToUpgrade: "1.2.1", versionsToUpgrade: "1.2.1,2.0.0",
updateSql: false, updateSql: false,
versionSpecificAction: new InstallAction(ActionTypes.ConfigureSecureSessionModuleInWebConfig)); versionSpecificAction: new InstallAction(ActionTypes.ConfigureSecureSessionModuleInWebConfig));
} }

View file

@ -30,7 +30,7 @@ namespace WebsitePanel.Setup
{ {
return Server.UpdateBase(obj, return Server.UpdateBase(obj,
minimalInstallerVersion: "2.0.0", minimalInstallerVersion: "2.0.0",
versionToUpgrade: "1.2.1", versionToUpgrade: "1.2.1,2.0.0",
updateSql: false); updateSql: false);
} }
} }

View file

@ -325,12 +325,16 @@ namespace WebsitePanel.Setup
if (webServer != null) if (webServer != null)
{ {
var modules = doc.CreateElement(iis6 ? "httpModules" : "modules"); string modulesNodeName = iis6 ? "httpModules" : "modules";
webServer.AppendChild(modules); if (webServer.SelectSingleNode(modulesNodeName + "/add[@name='SecureSession']") == null)
var sessionModule = doc.CreateElement("add"); {
sessionModule.SetAttribute("name", "SecureSession"); var modules = doc.CreateElement(modulesNodeName);
sessionModule.SetAttribute("type", "WebsitePanel.WebPortal.SecureSessionModule"); webServer.AppendChild(modules);
modules.AppendChild(sessionModule); var sessionModule = doc.CreateElement("add");
sessionModule.SetAttribute("name", "SecureSession");
sessionModule.SetAttribute("type", "WebsitePanel.WebPortal.SecureSessionModule");
modules.AppendChild(sessionModule);
}
} }
// update /system.web/httpRuntime element // update /system.web/httpRuntime element
@ -343,7 +347,7 @@ namespace WebsitePanel.Setup
// <add key="SessionValidationKey" value="XXXXXX" /> // <add key="SessionValidationKey" value="XXXXXX" />
//</appSettings> //</appSettings>
var appSettings = doc.SelectSingleNode("configuration/appSettings"); var appSettings = doc.SelectSingleNode("configuration/appSettings");
if (appSettings != null) if (appSettings != null && appSettings.SelectSingleNode("add[@key='SessionValidationKey']") == null)
{ {
var sessionKey = doc.CreateElement("add"); var sessionKey = doc.CreateElement("add");
sessionKey.SetAttribute("key", "SessionValidationKey"); sessionKey.SetAttribute("key", "SessionValidationKey");

View file

@ -133,6 +133,18 @@ namespace WebsitePanel.EnterpriseServer
if(ip != null) if(ip != null)
site.SiteIPAddress = ip.ExternalIP; site.SiteIPAddress = ip.ExternalIP;
// check if site has dedicated IP assigned
var siteIpAddresses = ServerController.GetItemIPAddresses(siteItemId, IPAddressPool.None);
foreach (var siteIp in siteIpAddresses)
{
var packageIpAddress = ServerController.GetPackageIPAddress(siteIp.AddressID);
if (packageIpAddress != null && packageIpAddress.ExternalIP == site.SiteIPAddress)
{
site.IsDedicatedIP = true;
break;
}
}
// truncate home folder // truncate home folder
site.ContentPath = FilesController.GetVirtualPackagePath(siteItem.PackageId, site.ContentPath); site.ContentPath = FilesController.GetVirtualPackagePath(siteItem.PackageId, site.ContentPath);
@ -654,8 +666,6 @@ namespace WebsitePanel.EnterpriseServer
{ {
TaskManager.CompleteTask(); TaskManager.CompleteTask();
} }
return 0;
} }
public static int SwitchWebSiteToSharedIP(int siteItemId) public static int SwitchWebSiteToSharedIP(int siteItemId)
@ -717,9 +727,6 @@ namespace WebsitePanel.EnterpriseServer
{ {
TaskManager.CompleteTask(); TaskManager.CompleteTask();
} }
return 0;
} }
private static void FillWebServerBindings(List<ServerBinding> bindings, List<GlobalDnsRecord> dnsRecords, private static void FillWebServerBindings(List<ServerBinding> bindings, List<GlobalDnsRecord> dnsRecords,

View file

@ -47,6 +47,7 @@ namespace WebsitePanel.Providers.Web
private string siteId; private string siteId;
private string siteIPAddress; private string siteIPAddress;
private int siteIPAddressId; private int siteIPAddressId;
private bool isDedicatedIP;
private string dataPath; private string dataPath;
private ServerBinding[] bindings; private ServerBinding[] bindings;
private bool frontPageAvailable; private bool frontPageAvailable;
@ -85,6 +86,12 @@ namespace WebsitePanel.Providers.Web
set { siteIPAddressId = value; } set { siteIPAddressId = value; }
} }
public bool IsDedicatedIP
{
get { return isDedicatedIP; }
set { isDedicatedIP = value; }
}
/// <summary> /// <summary>
/// Gets or sets logs path for the web site /// Gets or sets logs path for the web site
/// </summary> /// </summary>

View file

@ -41,7 +41,7 @@
<asp:Label ID="lblSubscriberNumber" runat="server" meta:resourcekey="lblSubscriberNumber" Text="Account Number:"></asp:Label> <asp:Label ID="lblSubscriberNumber" runat="server" meta:resourcekey="lblSubscriberNumber" Text="Account Number:"></asp:Label>
</td> </td>
<td class="NormalBold"> <td class="NormalBold">
<asp:TextBox id="txtSubscriberNumber" runat="server" CssClass="NormalTextBox"></asp:TextBox> <asp:TextBox id="txtSubscriberNumber" runat="server" CssClass="NormalTextBox" ></asp:TextBox>
</td> </td>
</tr> </tr>

View file

@ -43,6 +43,13 @@ namespace WebsitePanel.Portal
if (PortalUtils.GetHideDemoCheckbox()) rowDemo.Visible = false; if (PortalUtils.GetHideDemoCheckbox()) rowDemo.Visible = false;
} }
if (PanelSecurity.LoggedUser.Role == UserRole.User)
{
txtSubscriberNumber.ReadOnly = true;
}
} }
private void BindUser() private void BindUser()

View file

@ -176,15 +176,13 @@ namespace WebsitePanel.Portal
ddlIpAddresses.Items.Add(new ListItem(fullIP, ip.PackageAddressID.ToString())); ddlIpAddresses.Items.Add(new ListItem(fullIP, ip.PackageAddressID.ToString()));
} }
bool isDedicatedIP = false; if (site.IsDedicatedIP)
if (!String.IsNullOrEmpty(site.SiteIPAddress))
{ {
litIPAddress.Text = site.SiteIPAddress; litIPAddress.Text = site.SiteIPAddress;
isDedicatedIP = true;
} }
dedicatedIP.Visible = isDedicatedIP; dedicatedIP.Visible = site.IsDedicatedIP;
sharedIP.Visible = !isDedicatedIP; sharedIP.Visible = !site.IsDedicatedIP;
cmdSwitchToDedicatedIP.Visible = (ddlIpAddresses.Items.Count > 0); cmdSwitchToDedicatedIP.Visible = (ddlIpAddresses.Items.Count > 0);

View file

@ -571,6 +571,7 @@
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(ToolsFolder)\WebsitePanel-WSPTransportAgent-$(Version).zip" RemoteFiles="WebsitePanel-WSPTransportAgent-$(Version).zip" /> <FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(ToolsFolder)\WebsitePanel-WSPTransportAgent-$(Version).zip" RemoteFiles="WebsitePanel-WSPTransportAgent-$(Version).zip" />
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(ToolsFolder)\WebsitePanel.LocalizationToolkit.msi" RemoteFiles="WebsitePanel.LocalizationToolkit-$(Version).msi" /> <FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(ToolsFolder)\WebsitePanel.LocalizationToolkit.msi" RemoteFiles="WebsitePanel.LocalizationToolkit-$(Version).msi" />
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(DeployFolder)\WebsitePanelInstaller.msi" RemoteFiles="WebsitePanelInstaller-$(Version).msi" /> <FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(DeployFolder)\WebsitePanelInstaller.msi" RemoteFiles="WebsitePanelInstaller-$(Version).msi" />
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/" LocalFiles="$(DeployFolder)\Manual-Update.zip" RemoteFiles="Manual-Update-$(Version).zip" />
</Target> </Target>
<Target Name="uploadtocodeplex"> <Target Name="uploadtocodeplex">