SQL Statements simplified and some bugfixing

This commit is contained in:
2023-02-15 12:44:29 +01:00
parent ed33c0553d
commit 6df7a3f6a8
38 changed files with 694 additions and 678 deletions

View File

@@ -135,10 +135,10 @@
$query = "INSERT
INTO
asset(
asset.asset_name,
asset.asset_hostname,
asset.assetclass_id,
asset.asset_info
asset_name,
asset_hostname,
assetclass_id,
asset_info
)
VALUE
(
@@ -163,8 +163,8 @@
$query = "INSERT
INTO
assetclass(
assetclass.assetclass_name,
assetclass.assetclassgroup_id
assetclass_name,
assetclassgroup_id
)
VALUE
(
@@ -187,8 +187,8 @@
$query = "INSERT
INTO
assetclassgroup(
assetclassgroup.assetclassgroup_name,
assetclassgroup.assetclassgroup_color
assetclassgroup_name,
assetclassgroup_color
)
VALUE
(
@@ -216,13 +216,13 @@
$query = "INSERT
INTO
node(
node.node_ip,
node.node_mac,
node.node_dns1,
node.node_dns2,
node.subnet_id,
node.asset_id,
node.node_info
node_ip,
node_mac,
node_dns1,
node_dns2,
subnet_id,
asset_id,
node_info
)
VALUE
(
@@ -250,8 +250,8 @@
$query = "INSERT
INTO
subnetlocation(
subnetlocation.location_id,
subnetlocation.subnet_id
location_id,
subnet_id
)
VALUE
(
@@ -274,9 +274,9 @@
$query = "UPDATE
subnet
SET
subnet.vlan_id='$vlan_id'
vlan_id='$vlan_id'
WHERE
subnet.subnet_id='$subnet_id'";
subnet_id='$subnet_id'";
// run query
$db->db_update($query);
@@ -294,9 +294,9 @@
$query = "INSERT
INTO
location(
location.location_name,
location.location_parent,
location.location_info
location_name,
location_parent,
location_info
)
VALUE
(
@@ -320,8 +320,8 @@
$query = "INSERT
INTO
subnetlocation(
subnetlocation.location_id,
subnetlocation.subnet_id
location_id,
subnet_id
)
VALUE
(
@@ -345,9 +345,9 @@
$query = "INSERT
INTO
nat(
nat.nat_ext,
nat.nat_int,
nat.nat_type
nat_ext,
nat_int,
nat_type
)
VALUE
(
@@ -378,9 +378,9 @@
$query = "INSERT
INTO
asset(
asset.asset_name,
asset.asset_hostname,
asset.assetclass_id
asset_name,
asset_hostname,
assetclass_id
)
VALUE
(
@@ -396,13 +396,13 @@
$query = "INSERT
INTO
node(
node.node_ip,
node.node_mac,
node.node_dns1,
node.node_dns2,
node.node_info,
node.subnet_id,
node.asset_id
node_ip,
node_mac,
node_dns1,
node_dns2,
node_info,
subnet_id,
asset_id
)
VALUE
(
@@ -431,9 +431,9 @@
$query = "INSERT
INTO
subnet(
subnet.subnet_address,
subnet.subnet_mask,
subnet.subnet_info
subnet_address,
subnet_mask,
subnet_info
)
VALUE
(
@@ -457,8 +457,8 @@
$query = "INSERT
INTO
subnetlocation(
subnetlocation.location_id,
subnetlocation.subnet_id
location_id,
subnet_id
)
VALUE
(
@@ -481,8 +481,8 @@
$query = "INSERT
INTO
subnetvlan(
subnetvlan.subnet_id,
subnetvlan.vlan_id
subnet_id,
vlan_id
)
VALUE
(
@@ -504,11 +504,11 @@
// build query
$query = "SELECT
user.user_name
user_name
FROM
user
WHERE
user.user_name='$user_name'";
user_name='$user_name'";
// run query
$users = $db->db_select($query);
@@ -522,9 +522,9 @@
$query = "INSERT
INTO
user(
user.user_name,
user.user_displayname,
user.user_pass
user_name,
user_displayname,
user_pass
)
VALUE
(
@@ -553,9 +553,9 @@
$query = "INSERT
INTO
vlan(
vlan.vlan_name,
vlan.vlan_number,
vlan.vlan_info
vlan_name,
vlan_number,
vlan_info
)
VALUE
(
@@ -579,8 +579,8 @@
$query = "INSERT
INTO
subnetvlan(
subnetvlan.subnet_id,
subnetvlan.vlan_id
subnet_id,
vlan_id
)
VALUE
(
@@ -616,21 +616,21 @@
$query = "INSERT
INTO
zone(
zone.zone_origin,
zone.zone_ttl_default,
zone.zone_soa,
zone.zone_hostmaster,
zone.zone_refresh,
zone.zone_retry,
zone.zone_expire,
zone.zone_ttl,
zone.zone_serial,
zone.zone_ns1,
zone.zone_ns2,
zone.zone_ns3,
zone.zone_mx1,
zone.zone_mx2,
zone.zone_info
zone_origin,
zone_ttl_default,
zone_soa,
zone_hostmaster,
zone_refresh,
zone_retry,
zone_expire,
zone_ttl,
zone_serial,
zone_ns1,
zone_ns2,
zone_ns3,
zone_mx1,
zone_mx2,
zone_info
)
VALUE
(
@@ -672,7 +672,7 @@
FROM
asset
WHERE
asset.asset_id=" . $asset_id;
asset_id=" . $asset_id;
// run query
$db->db_delete($query);
@@ -682,7 +682,7 @@
FROM
node
WHERE
node.asset_id=" . $asset_id;
asset_id=" . $asset_id;
// run query
$db->db_delete($query);
@@ -699,7 +699,7 @@
FROM
assetclass
WHERE
assetclass.assetclass_id=" . $assetclass_id;
assetclass_id=" . $assetclass_id;
// run query
$db->db_delete($query);
@@ -716,7 +716,7 @@
FROM
assetclassgroup
WHERE
assetclassgroup.assetclassgroup_id=" . $assetclassgroup_id;
assetclassgroup_id=" . $assetclassgroup_id;
// run query
$db->db_delete($query);
@@ -733,7 +733,7 @@
FROM
location
WHERE
location.location_id=" . $location_id;
location_id=" . $location_id;
// run query
$db->db_delete($query);
@@ -751,8 +751,8 @@
FROM
subnetlocation
WHERE
subnetlocation.location_id=" . $location_id . "
AND subnetlocation.subnet_id=" . $subnet_id;
location_id=" . $location_id . "
AND subnet_id=" . $subnet_id;
// run query
$db->db_delete($query);
@@ -770,8 +770,8 @@
FROM
nat
WHERE
nat.nat_ext=" . $node_id_ext . "
AND nat.nat_int=" . $node_id_int;
nat_ext=" . $node_id_ext . "
AND nat_int=" . $node_id_int;
// run query
$db->db_delete($query);
@@ -789,7 +789,7 @@
FROM
node
WHERE
node.node_id=" . $node_id;
node_id=" . $node_id;
// run query
$db->db_delete($query);
@@ -807,7 +807,7 @@
FROM
subnet
WHERE
subnet.subnet_id=" . $subnet_id;
subnet_id=" . $subnet_id;
// run query
$db->db_delete($query);
@@ -836,8 +836,8 @@
FROM
subnetlocation
WHERE
subnetlocation.location_id=" . $location_id . "
AND subnetlocation.subnet_id=" . $subnet_id;
location_id=" . $location_id . "
AND subnet_id=" . $subnet_id;
// run query
$db->db_delete($query);
@@ -855,8 +855,8 @@
FROM
subnetvlan
WHERE
subnetvlan.subnet_id=" . $subnet_id . "
AND subnetvlan.vlan_id=" . $vlan_id;
subnet_id=" . $subnet_id . "
AND vlan_id=" . $vlan_id;
// run query
$db->db_delete($query);
@@ -873,7 +873,7 @@
FROM
user
WHERE
user.user_id=" . $user_id;
user_id=" . $user_id;
// run query
$db->db_delete($query);
@@ -890,7 +890,7 @@
FROM
vlan
WHERE
vlan.vlan_id=" . $vlan_id;
vlan_id=" . $vlan_id;
// run query
$db->db_delete($query);
@@ -908,8 +908,8 @@
FROM
subnetvlan
WHERE
subnetvlan.subnet_id=" . $subnet_id . "
AND subnetvlan.vlan_id=" . $vlan_id;
subnet_id=" . $subnet_id . "
AND vlan_id=" . $vlan_id;
// run query
$db->db_delete($query);
@@ -951,12 +951,12 @@
$query = "UPDATE
asset
SET
asset.asset_name='$asset_name',
asset.asset_info='$asset_info',
asset.asset_hostname='$asset_hostname',
asset.assetclass_id='$assetclass_id'
asset_name='$asset_name',
asset_info='$asset_info',
asset_hostname='$asset_hostname',
assetclass_id='$assetclass_id'
WHERE
asset.asset_id=" . $asset_id;
asset_id=" . $asset_id;
// run query
$db->db_update($query);
@@ -973,10 +973,10 @@
$query = "UPDATE
assetclass
SET
assetclass.assetclass_name='$assetclass_name',
assetclass.assetclassgroup_id='$assetclassgroup_id'
assetclass_name='$assetclass_name',
assetclassgroup_id='$assetclassgroup_id'
WHERE
assetclass.assetclass_id=" . $assetclass_id;
assetclass_id=" . $assetclass_id;
// run query
$db->db_update($query);
@@ -994,10 +994,10 @@
$query = "UPDATE
assetclassgroup
SET
assetclassgroup.assetclassgroup_name='$assetclassgroup_name',
assetclassgroup.assetclassgroup_color='$assetclassgroup_color'
assetclassgroup_name='$assetclassgroup_name',
assetclassgroup_color='$assetclassgroup_color'
WHERE
assetclassgroup.assetclassgroup_id=" . $assetclassgroup_id;
assetclassgroup_id=" . $assetclassgroup_id;
// run query
$db->db_update($query);
@@ -1016,11 +1016,11 @@
$query = "UPDATE
location
SET
location.location_name='$location_name',
location.location_parent='$parentlocation_id',
location.location_info='$location_info'
location_name='$location_name',
location_parent='$parentlocation_id',
location_info='$location_info'
WHERE
location.location_id=" . $location_id;
location_id=" . $location_id;
// run query
$db->db_update($query);
@@ -1044,16 +1044,16 @@
$query = "UPDATE
node
SET
node.asset_id='$asset_id',
node.node_ip='$node_ip',
node.subnet_id='$subnet_id',
node.node_mac='$node_mac',
node.node_dns1='$node_dns1',
node.node_dns2='$node_dns2',
node.node_info='$node_info',
node.zone_id='$zone_id'
asset_id='$asset_id',
node_ip='$node_ip',
subnet_id='$subnet_id',
node_mac='$node_mac',
node_dns1='$node_dns1',
node_dns2='$node_dns2',
node_info='$node_info',
zone_id='$zone_id'
WHERE
node.node_id=" . $node_id;
node_id=" . $node_id;
// run query
$db->db_update($query);
@@ -1086,25 +1086,25 @@
$query = "UPDATE
user
SET
user.user_language='" . $user_language . "',
user.user_imagesize='" . $user_imagesize . "',
user.user_imagecount='" . $user_imagecount . "',
user.user_mac='" . $user_mac . "',
user.user_dateformat='" . $user_dateformat . "',
user.user_dns1suffix='" . $user_dns1suffix . "',
user.user_dns2suffix='" . $user_dns2suffix . "',
user.user_menu_assets='" . $user_menu_assets . "',
user.user_menu_assetclasses='" . $user_menu_assetclasses . "',
user.user_menu_assetclassgroups='" . $user_menu_assetclassgroups . "',
user.user_menu_locations='" . $user_menu_locations . "',
user.user_menu_nodes='" . $user_menu_nodes . "',
user.user_menu_subnets='" . $user_menu_subnets . "',
user.user_menu_users='" . $user_menu_users . "',
user.user_menu_vlans='" . $user_menu_vlans . "',
user.user_menu_zones='" . $user_menu_zones . "',
user.user_tooltips='" . $user_tooltips . "'
user_language='" . $user_language . "',
user_imagesize='" . $user_imagesize . "',
user_imagecount='" . $user_imagecount . "',
user_mac='" . $user_mac . "',
user_dateformat='" . $user_dateformat . "',
user_dns1suffix='" . $user_dns1suffix . "',
user_dns2suffix='" . $user_dns2suffix . "',
user_menu_assets='" . $user_menu_assets . "',
user_menu_assetclasses='" . $user_menu_assetclasses . "',
user_menu_assetclassgroups='" . $user_menu_assetclassgroups . "',
user_menu_locations='" . $user_menu_locations . "',
user_menu_nodes='" . $user_menu_nodes . "',
user_menu_subnets='" . $user_menu_subnets . "',
user_menu_users='" . $user_menu_users . "',
user_menu_vlans='" . $user_menu_vlans . "',
user_menu_zones='" . $user_menu_zones . "',
user_tooltips='" . $user_tooltips . "'
WHERE
user.user_id=" . $user_id;
user_id=" . $user_id;
// update session
$_SESSION['suser_language'] = $user_language;
@@ -1140,11 +1140,11 @@
// get current pass from db
$query = "SELECT
user.user_pass
user_pass
FROM
user
WHERE
user.user_id='" . $user_id . "'";
user_id='" . $user_id . "'";
// run query
$user = $db->db_select($query);
@@ -1156,9 +1156,9 @@
$query = "UPDATE
user
SET
user.user_pass='" . md5($user_newpass1) . "'
user_pass='" . md5($user_newpass1) . "'
WHERE
user.user_id=" . $user_id;
user_id=" . $user_id;
// run query
$db->db_update($query);
@@ -1209,10 +1209,10 @@
$query = "UPDATE
user
SET
user.user_name='" . $user_name . "',
user.user_displayname='" . $user_displayname . "'
user_name='" . $user_name . "',
user_displayname='" . $user_displayname . "'
WHERE
user.user_id=" . $user_id;
user_id=" . $user_id;
// run query
$db->db_update($query);
@@ -1231,11 +1231,11 @@
$query = "UPDATE
vlan
SET
vlan.vlan_name='$vlan_name',
vlan.vlan_number='$vlan_number',
vlan.vlan_info='$vlan_info'
vlan_name='$vlan_name',
vlan_number='$vlan_number',
vlan_info='$vlan_info'
WHERE
vlan.vlan_id=" . $vlan_id;
vlan_id=" . $vlan_id;
// run query
$db->db_update($query);