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

Merge

Browse source
This commit is contained in:
Virtuworks 2012-08-15 10:25:13 -04:00
commit 4772b1d95e
11 changed files with 34 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe
View file

Binary file not shown.

2
WebsitePanel/Database/update_db.sql
View file

@ -875,7 +875,7 @@ INNER JOIN UsersDetailed AS U ON P.UserID = U.UserID
LEFT OUTER JOIN ServiceItems AS Z ON D.ZoneItemID = Z.ItemID
LEFT OUTER JOIN Services AS S ON Z.ServiceID = S.ServiceID
LEFT OUTER JOIN Servers AS SRV ON S.ServerID = SRV.ServerID
WHERE (D.IsInstantAlias = 0 AND D.IsDomainPointer = 0) AND
WHERE D.IsInstantAlias = 0 AND
((@Recursive = 0 AND D.PackageID = @PackageID)
OR (@Recursive = 1 AND dbo.CheckPackageParent(@PackageID, D.PackageID) = 1))
AND (@ServerID = 0 OR (@ServerID > 0 AND S.ServerID = @ServerID))

BIN
WebsitePanel/Lib/References/MySQL/MySql.Data.dll Normal file
View file

Binary file not shown.

9
WebsitePanel/Sources/VersionInfo.cs
View file

@ -1,4 +1,4 @@
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.269
@ -10,14 +10,13 @@
using System;
using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
[assembly: AssemblyCompany("Outercurve Foundation")]
[assembly: AssemblyCopyright("Copyright © 2012 Outercurve Foundation.")]
[assembly: AssemblyVersion("1.2.2")]
[assembly: AssemblyFileVersion("1.2.2")]
[assembly: AssemblyInformationalVersion("1.2.2")]
[assembly: AssemblyVersion("1.2.2.1")]
[assembly: AssemblyFileVersion("1.2.2.1")]
[assembly: AssemblyInformationalVersion("1.2.2.1")]

9
WebsitePanel/Sources/VersionInfo.vb
View file

@ -1,4 +1,4 @@
'------------------------------------------------------------------------------
'------------------------------------------------------------------------------
' <auto-generated>
' This code was generated by a tool.
' Runtime Version:4.0.30319.269
@ -13,12 +13,11 @@ Option Explicit On
Imports System
Imports System.Reflection
Imports System.Resources
Imports System.Runtime.CompilerServices
Imports System.Runtime.InteropServices
<Assembly: AssemblyCompany("Outercurve Foundation"), _
Assembly: AssemblyCopyright("Copyright © 2012 Outercurve Foundation."), _
Assembly: AssemblyVersion("1.2.2"), _
Assembly: AssemblyFileVersion("1.2.2"), _
Assembly: AssemblyInformationalVersion("1.2.2")>
Assembly: AssemblyVersion("1.2.2.1"), _
Assembly: AssemblyFileVersion("1.2.2.1"), _
Assembly: AssemblyInformationalVersion("1.2.2.1")>

13
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/ExchangeServer/ExchangeServerController.cs
View file

@ -109,6 +109,15 @@ namespace WebsitePanel.EnterpriseServer
delegate(ServiceProviderItem item) { return (Organization)item; }));
}
public static List<Organization> GetExchangeOrganizationsInternal(int packageId, bool recursive)
{
List<ServiceProviderItem> items = PackageController.GetPackageItemsByTypeInternal(packageId, null, typeof(Organization), recursive);
return items.ConvertAll<Organization>(
new Converter<ServiceProviderItem, Organization>(
delegate(ServiceProviderItem item) { return (Organization)item; }));
}
public static Organization GetOrganization(int itemId)
{
#region Demo Mode
@ -2554,12 +2563,12 @@ namespace WebsitePanel.EnterpriseServer
if ((Packages != null) & (Packages.Count > 0))
{
orgs = GetExchangeOrganizations(Packages[0].PackageId, false);
orgs = GetExchangeOrganizationsInternal(Packages[0].PackageId, false);
}
}
else
{
orgs = GetExchangeOrganizations(1, false);
orgs = GetExchangeOrganizationsInternal(1, false);
}
if ((orgs != null) &(orgs.Count > 0))

8
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Packages/PackageController.cs
View file

@ -1072,6 +1072,14 @@ namespace WebsitePanel.EnterpriseServer
return CreateServiceItemsList(dsItems, 0);
}
public static List<ServiceProviderItem> GetPackageItemsByTypeInternal(int packageId, string groupName, Type itemType, bool recursive)
{
string typeName = ObjectUtils.GetTypeFullName(itemType);
DataSet dsItems = DataProvider.GetServiceItems(-1, packageId, groupName, typeName, recursive);
return CreateServiceItemsList(dsItems, 0);
}
public static DataSet GetRawPackageItemsByType(int packageId, Type itemType, bool recursive)
{
return GetRawPackageItemsByType(packageId, null, itemType, recursive);

4
WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Web.config
View file

@ -5,11 +5,11 @@
</configSections>
<!-- Connection strings -->
<connectionStrings>
<add name="EnterpriseServer" connectionString="server=HSTPROV01;database=WebsitePanelMerge;uid=WebsitePanel;pwd=aj7ep6fyhmw3b5qeth7c;" providerName="System.Data.SqlClient" />
<add name="EnterpriseServer" connectionString="Server=(local)\SQLExpress;Database=WebsitePanel;uid=WebsitePanel;pwd=Password12" providerName="System.Data.SqlClient"/>
</connectionStrings>
<appSettings>
<!-- Encryption util settings -->
<add key="WebsitePanel.CryptoKey" value="3x7eqt7zabc5n5afs6dg" />
<add key="WebsitePanel.CryptoKey" value="1234567890" />
<!-- A1D4KDHUE83NKHddF -->
<add key="WebsitePanel.EncryptionEnabled" value="true"/>
<!-- Web Applications -->

2
WebsitePanel/Sources/WebsitePanel.Providers.DNS.PowerDNS/WebsitePanel.Providers.DNS.PowerDNS.csproj
View file

@ -56,7 +56,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="MySql.Data">
<HintPath>..\..\..\..\..\Program Files (x86)\MySQL\Connector NET 6.3.7\Assemblies\v2.0\MySql.Data.dll</HintPath>
<HintPath>..\..\Lib\References\MySQL\MySql.Data.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />

3
WebsitePanel/Sources/WebsitePanel.Providers.Database.MySQL/WebsitePanel.Providers.Database.MySQL.csproj
View file

@ -55,8 +55,7 @@
<WarningsAsErrors>618</WarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<Reference Include="MySql.Data, Version=6.3.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<Reference Include="MySql.Data">
<HintPath>..\..\Lib\References\MySQL\MySql.Data.dll</HintPath>
</Reference>
<Reference Include="System" />

4
WebsitePanel/Sources/WebsitePanel.WebPortal/App_Data/WebsitePanel_Pages.config
View file

@ -65,7 +65,7 @@
</Module>
</Content>
<Content id="ContentPane">
<Module moduleDefinitionID="UserSpaces" title="UserSpaces" icon="sphere_48.png" readOnlyRoles="PlatformHelpdesk,ResellerHelpdesk,User" />
<Module moduleDefinitionID="UserSpaces" title="UserSpaces" icon="sphere_48.png" readOnlyRoles="PlatformHelpdesk,ResellerHelpdesk" />
</Content>
</Page>
@ -175,7 +175,7 @@
</Module>
</Content>
<Content id="ContentPane">
<Module moduleDefinitionID="Domains" title="Domains" icon="world_48.png" readOnlyRoles="PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk,User"/>
<Module moduleDefinitionID="Domains" title="Domains" icon="world_48.png" readOnlyRoles="PlatformCSR,ResellerCSR,PlatformHelpdesk,ResellerHelpdesk"/>
</Content>
</Page>