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 2013-11-21 11:58:09 -05:00
commit 3418676133
51 changed files with 5795 additions and 5058 deletions
Download patch file Download diff file Expand all files Collapse all files

9
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs
View file

@ -3245,23 +3245,25 @@ namespace WebsitePanel.EnterpriseServer
}
public static void AllocatePackageIPAddresses(int packageId, string xml)
public static void AllocatePackageIPAddresses(int packageId, int orgId, string xml)
{
SqlParameter[] param = new[]
{
new SqlParameter("@PackageID", packageId),
new SqlParameter("@OrgID", orgId),
new SqlParameter("@xml", xml)
};
ExecuteLongNonQuery("AllocatePackageIPAddresses", param);
}
public static IDataReader GetPackageIPAddresses(int packageId, int poolId, string filterColumn, string filterValue,
public static IDataReader GetPackageIPAddresses(int packageId, int orgId, int poolId, string filterColumn, string filterValue,
string sortColumn, int startRow, int maximumRows, bool recursive)
{
IDataReader reader = SqlHelper.ExecuteReader(ConnectionString, CommandType.StoredProcedure,
"GetPackageIPAddresses",
new SqlParameter("@PackageID", packageId),
new SqlParameter("@OrgID", orgId),
new SqlParameter("@PoolId", poolId),
new SqlParameter("@FilterColumn", VerifyColumnName(filterColumn)),
new SqlParameter("@FilterValue", VerifyColumnValue(filterValue)),
@ -3306,12 +3308,13 @@ namespace WebsitePanel.EnterpriseServer
#endregion
#region VPS - External Network Adapter
public static IDataReader GetPackageUnassignedIPAddresses(int actorId, int packageId, int poolId)
public static IDataReader GetPackageUnassignedIPAddresses(int actorId, int packageId, int orgId, int poolId)
{
return SqlHelper.ExecuteReader(ConnectionString, CommandType.StoredProcedure,
"GetPackageUnassignedIPAddresses",
new SqlParameter("@ActorID", actorId),
new SqlParameter("@PackageID", packageId),
new SqlParameter("@OrgID", orgId),
new SqlParameter("@PoolId", poolId));
}