thooge
/
ipreg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SQL Statements simplified and some bugfixing

This commit is contained in:
Thomas Hooge 2023-02-15 12:44:29 +01:00
parent ed33c0553d
commit 6df7a3f6a8
38 changed files with 694 additions and 678 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
asset.php
View File

@ -55,19 +55,17 @@
// build query // build query
$query = "SELECT $query = "SELECT
asset.asset_id AS asset_id, a.asset_id,
IF(LENGTH(asset.asset_name)>0, asset.asset_name, '...') AS asset_name, IF(LENGTH(a.asset_name)>0, a.asset_name, '...') AS asset_name,
asset.asset_info AS asset_info, a.asset_info,
assetclass.assetclass_id AS assetclass_id, c.assetclass_id,
assetclass.assetclass_name AS assetclass_name c.assetclass_name
FROM FROM
asset, asset AS a LEFT OUTER JOIN assetclass AS c USING (assetclass_id)
assetclass
WHERE WHERE
SUBSTRING(asset.asset_name,1,1) = '" . $asset_letter . "' SUBSTRING(a.asset_name,1,1) = '" . $asset_letter . "'
AND assetclass.assetclass_id=asset.assetclass_id
ORDER BY ORDER BY
asset.asset_name"; a.asset_name";
// run query // run query
$assets = $db->db_select($query); $assets = $db->db_select($query);

6
assetadd.php
View File

@ -36,12 +36,12 @@
// setup assetclass // setup assetclass
// build query // build query
$query = "SELECT $query = "SELECT
assetclass.assetclass_id AS assetclass_id, assetclass_id,
assetclass.assetclass_name AS assetclass_name assetclass_name
FROM FROM
assetclass assetclass
ORDER BY ORDER BY
assetclass.assetclass_name"; assetclass_name";
// run query // run query
$assetclasses = $db->db_select($query); $assetclasses = $db->db_select($query);

16
assetclass.php
View File

@ -33,17 +33,15 @@
// setup assetclass // setup assetclass
// build query // build query
$query = "SELECT $query = "SELECT
assetclass.assetclass_id AS assetclass_id, a.assetclass_id,
assetclass.assetclass_name AS assetclass_name, a.assetclass_name,
assetclassgroup.assetclassgroup_id AS assetclassgroup_id, g.assetclassgroup_id,
assetclassgroup.assetclassgroup_name AS assetclassgroup_name g.assetclassgroup_name,
g.assetclassgroup_color
FROM FROM
assetclass, assetclass AS a LEFT OUTER JOIN assetclassgroup AS g USING (assetclassgroup_id)
assetclassgroup
WHERE
assetclassgroup.assetclassgroup_id=assetclass.assetclassgroup_id
ORDER BY ORDER BY
assetclass.assetclass_name"; a.assetclass_name";
// run query // run query
$assetclasses = $db->db_select($query); $assetclasses = $db->db_select($query);

6
assetclassdel.php
View File

@ -36,12 +36,12 @@
// setup assetclass // setup assetclass
// build query // build query
$query = "SELECT $query = "SELECT
assetclass.assetclass_id AS assetclass_id, assetclass_id,
assetclass.assetclass_name AS assetclass_name assetclass_name
FROM FROM
assetclass assetclass
WHERE WHERE
assetclass.assetclass_id=" . $assetclass_id; assetclass_id=" . $assetclass_id;
// run query // run query
$assetclass = $db->db_select($query); $assetclass = $db->db_select($query);

8
assetclassedit.php
View File

@ -36,13 +36,13 @@
// setup assetclass // setup assetclass
// build query // build query
$query = "SELECT $query = "SELECT
assetclass.assetclass_id AS assetclass_id, assetclass_id,
assetclass.assetclass_name AS assetclass_name, assetclass_name,
assetclass.assetclassgroup_id AS assetclassgroup_id assetclassgroup_id
FROM FROM
assetclass assetclass
WHERE WHERE
assetclass.assetclass_id=" . $assetclass_id; assetclass_id=" . $assetclass_id;
// run query // run query
$assetclass = $db->db_select($query); $assetclass = $db->db_select($query);

8
assetclassgroup.php
View File

@ -33,13 +33,13 @@
// setup assetclassgroup // setup assetclassgroup
// build query // build query
$query = "SELECT $query = "SELECT
assetclassgroup.assetclassgroup_id AS assetclassgroup_id, assetclassgroup_id,
assetclassgroup.assetclassgroup_name AS assetclassgroup_name, assetclassgroup_name,
assetclassgroup.assetclassgroup_color AS assetclassgroup_color assetclassgroup_color
FROM FROM
assetclassgroup assetclassgroup
ORDER BY ORDER BY
assetclassgroup.assetclassgroup_name"; assetclassgroup_name";
// run query // run query
$assetclassgroups = $db->db_select($query); $assetclassgroups = $db->db_select($query);

6
assetclassgroupdel.php
View File

@ -36,12 +36,12 @@
// setup assetclassgroup // setup assetclassgroup
// build query // build query
$query = "SELECT $query = "SELECT
assetclassgroup.assetclassgroup_id AS assetclassgroup_id, assetclassgroup_id,
assetclassgroup.assetclassgroup_name AS assetclassgroup_name assetclassgroup_name
FROM FROM
assetclassgroup assetclassgroup
WHERE WHERE
assetclassgroup.assetclassgroup_id=" . $assetclassgroup_id; assetclassgroup_id=" . $assetclassgroup_id;
// run query // run query
$assetclassgroup = $db->db_select($query); $assetclassgroup = $db->db_select($query);

15
assetclassview.php
View File

@ -35,17 +35,13 @@
// setup assetclass // setup assetclass
// build query // build query
$query = "SELECT $query = "SELECT
assetclass.assetclass_id, a.assetclass_id, a.assetclass_name,
assetclass.assetclass_name, g.assetclassgroup_id, g.assetclassgroup_name, g.assetclassgroup_color
assetclassgroup.assetclassgroup_id AS assetclassgroup_id,
assetclassgroup.assetclassgroup_name AS assetclassgroup_name
FROM FROM
assetclass, assetclass AS a LEFT OUTER JOIN assetclassgroup AS g USING (assetclassgroup_id)
assetclassgroup
WHERE WHERE
assetclass.assetclass_id=" . $assetclass_id . " a.assetclass_id=" . $assetclass_id;
AND assetclassgroup.assetclassgroup_id=assetclass.assetclassgroup_id";
// run query // run query
$assetclass = $db->db_select($query); $assetclass = $db->db_select($query);
@ -57,6 +53,7 @@
$smarty->assign("assetclassgroup_id", $assetclass[0]['assetclassgroup_id']); $smarty->assign("assetclassgroup_id", $assetclass[0]['assetclassgroup_id']);
$smarty->assign("assetclassgroup_name", $assetclass[0]['assetclassgroup_name']); $smarty->assign("assetclassgroup_name", $assetclass[0]['assetclassgroup_name']);
$smarty->assign("assetclassgroup_color", $assetclass[0]['assetclassgroup_color']);
// send to tpl // send to tpl
// setup asset // setup asset

12
assetedit.php
View File

@ -36,15 +36,15 @@
// setup asset // setup asset
// build query // build query
$query = "SELECT $query = "SELECT
asset_id, asset_id,
asset.asset_name AS asset_name, asset_name,
asset.asset_hostname AS asset_hostname, asset_hostname,
asset.asset_info AS asset_info, asset_info,
asset.assetclass_id AS assetclass_id assetclass_id
FROM FROM
asset asset
WHERE WHERE
asset.asset_id=" . $asset_id; asset_id=" . $asset_id;
// run query // run query
$asset = $db->db_select($query); $asset = $db->db_select($query);

20
assetview.php
View File

@ -36,17 +36,15 @@
// setup asset // setup asset
// build query // build query
$query = "SELECT $query = "SELECT
asset.asset_name, a.asset_name,
asset.asset_hostname, a.asset_hostname,
asset.asset_info, a.asset_info,
assetclass.assetclass_id AS assetclass_id, c.assetclass_id,
assetclass.assetclass_name AS assetclass_name c.assetclass_name
FROM FROM
asset, asset AS a LEFT OUTER JOIN assetclass AS c USING (assetclass_id)
assetclass
WHERE WHERE
asset.asset_id=" . $asset_id . " a.asset_id=" . $asset_id;
AND assetclass.assetclass_id=asset.assetclass_id";
// run query // run query
$asset = $db->db_select($query); $asset = $db->db_select($query);
@ -69,9 +67,9 @@
FROM FROM
node node
WHERE WHERE
node.asset_id=" . $asset_id . " asset_id=" . $asset_id . "
ORDER BY ORDER BY
INET_ATON(node.node_ip)"; INET_ATON(node_ip)";
// run query // run query
$nodes = $db->db_select($query); $nodes = $db->db_select($query);

6
assigniptonode.php
View File

@ -36,12 +36,12 @@
// build query // build query
$query = "SELECT $query = "SELECT
subnet.subnet_address AS subnet_address, subnet_address,
subnet.subnet_mask AS subnet_mask subnet_mask
FROM FROM
subnet subnet
WHERE WHERE
subnet.subnet_id=" . $subnet_id; subnet_id=" . $subnet_id;
// run query // run query
$subnet = $db->db_select($query); $subnet = $db->db_select($query);

BIN
images/arrow_left.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 388 B

BIN
images/arrow_right.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 379 B

22
install/mysql_sample.sql
View File

@ -1,19 +1,23 @@
INSERT INTO asset (asset_name, assetclass_id) VALUES INSERT INTO asset (asset_name, assetclass_id) VALUES
('Computer', 1), ('Computer', 1),
('Server', 2), ('Server', 3),
('Printer', 3); ('Printer', 4),
('Firewall', 6);
INSERT INTO assetclass (assetclassgroup_id, assetclass_name) VALUES INSERT INTO assetclass (assetclassgroup_id, assetclass_name) VALUES
(1, 'Desktop'), (1, 'Desktop'),
(1, 'Notebook'), (1, 'Notebook'),
(2, 'Server'), (2, 'Server'),
(3, 'Printers'), (3, 'Printer'),
(4, 'Scanners'); (4, 'Switch'),
(4, 'Firewall'),
(5, 'Scanner');
INSERT INTO assetclassgroup (assetclassgroup_name, assetclassgroup_color) VALUES INSERT INTO assetclassgroup (assetclassgroup_name, assetclassgroup_color) VALUES
('Personal Computer', '000000'), ('Personal Computer', '000000'),
('Servers', '0000CC'), ('Servers', '0000CC'),
('Periphery', '00CC00'), ('Periphery', '00CC00'),
('Network', 'CCCC00'),
('Miscellaneous', 'CC0000'); ('Miscellaneous', 'CC0000');
INSERT INTO location (location_name, location_parent) VALUES INSERT INTO location (location_name, location_parent) VALUES
@ -22,9 +26,13 @@ INSERT INTO location (location_name, location_parent) VALUES
('Branch Office B', 1); ('Branch Office B', 1);
INSERT INTO node (node_ip, node_mac, subnet_id, asset_id) VALUES INSERT INTO node (node_ip, node_mac, subnet_id, asset_id) VALUES
('192.168.1.2', '001122334455', 1, 1), ('192.168.0.10', '001122334455', 1, 1),
('192.168.1.1', 'aabbccddeeff', 1, 2), ('192.168.0.11', 'aabbccddeeff', 1, 2),
('192.168.0.1', '667755441122', 2, 3); ('192.168.0.12', '775544881199', 1, 3),
('192.168.0.1', '667755441122', 1, 4),
('192.168.1.1', '667755441123', 2, 4),
('192.168.10.1', '667755441124', 3, 4),
('192.168.20.1', '667755441125', 4, 4);
INSERT INTO subnet (subnet_address, subnet_mask) VALUES INSERT INTO subnet (subnet_address, subnet_mask) VALUES
('192.168.0.0', 24), ('192.168.0.0', 24),

3
lang/de.php
View File

@ -197,7 +197,8 @@ $lang = array(
'lang_options_tooltips_help' => 'Tooltips anzeigen', 'lang_options_tooltips_help' => 'Tooltips anzeigen',
'lang_options_language_help' => 'Sprache für diesen Benutzer', 'lang_options_language_help' => 'Sprache für diesen Benutzer',
'lang_about_sfprojectpage' => 'Sourceforge Project Page', 'lang_about_projectpage' => 'Aktuelle Projektseite',
'lang_about_sfprojectpage' => 'Sourceforge Projektseite',
'lang_about_license' => 'Lizenz', 'lang_about_license' => 'Lizenz',
'lang_about_gpl' => 'GNU General Public License (GPL)', 'lang_about_gpl' => 'GNU General Public License (GPL)',
'lang_about_smarty' => 'Smarty Template Engine', 'lang_about_smarty' => 'Smarty Template Engine',

1
lang/en.php
View File

@ -197,6 +197,7 @@ $lang = array(
'lang_options_tooltips_help' => 'Show tooltips', 'lang_options_tooltips_help' => 'Show tooltips',
'lang_options_language_help' => 'Language for this user', 'lang_options_language_help' => 'Language for this user',
'lang_about_projectpage' => 'Current Project Page',
'lang_about_sfprojectpage' => 'Sourceforge Project Page', 'lang_about_sfprojectpage' => 'Sourceforge Project Page',
'lang_about_license' => 'License', 'lang_about_license' => 'License',
'lang_about_gpl' => 'GNU General Public License (GPL)', 'lang_about_gpl' => 'GNU General Public License (GPL)',

4
locationdel.php
View File

@ -36,11 +36,11 @@
// setup location // setup location
// build query // build query
$query = "SELECT $query = "SELECT
location.location_name AS location_name location_name
FROM FROM
location location
WHERE WHERE
location.location_id=" . $location_id; location_id=" . $location_id;
// run query // run query
$location = $db->db_select($query); $location = $db->db_select($query);

8
locationedit.php
View File

@ -61,11 +61,13 @@
// look for locations // look for locations
// build query // build query
$query = "SELECT $query = "SELECT
location.location_id AS location_id, location_id,
location.location_name AS location_name, location_name,
location.location_parent AS location_parent location_parent
FROM FROM
location location
WHERE
location_id != " . $location_id . "
ORDER BY ORDER BY
location.location_name"; location.location_name";

4
locationsubnetadd.php
View File

@ -36,11 +36,11 @@
// setup location // setup location
// build query // build query
$query = "SELECT $query = "SELECT
location.location_name AS location_name location_name
FROM FROM
location location
WHERE WHERE
location.location_id=" . $location_id; location_id=" . $location_id;
// run query // run query
$location = $db->db_select($query); $location = $db->db_select($query);

4
locationsubnetedit.php
View File

@ -36,11 +36,11 @@
// setup location // setup location
// build query // build query
$query = "SELECT $query = "SELECT
location.location_name AS location_name location_name
FROM FROM
location location
WHERE WHERE
location.location_id=" . $location_id; location_id=" . $location_id;
// run query // run query
$location = $db->db_select($query); $location = $db->db_select($query);

12
locationview.php
View File

@ -85,17 +85,15 @@
// setup subnets // setup subnets
// build query // build query
$query = "SELECT $query = "SELECT
subnet.subnet_id AS subnet_id, s.subnet_id,
subnet.subnet_address AS subnet_address, s.subnet_address,
subnet.subnet_mask AS subnet_mask s.subnet_mask
FROM FROM
subnet, subnet AS s LEFT JOIN subnetlocation USING (subnet_id)
subnetlocation
WHERE WHERE
subnetlocation.location_id=" . $location_id . " subnetlocation.location_id=" . $location_id . "
AND subnetlocation.subnet_id=subnet.subnet_id
ORDER BY ORDER BY
INET_ATON(subnet.subnet_address)"; INET_ATON(s.subnet_address)";
// run query // run query
$subnets = $db->db_select($query); $subnets = $db->db_select($query);

20
natadd.php
View File

@ -36,11 +36,11 @@
// setup node_ext // setup node_ext
// build query // build query
$query = "SELECT $query = "SELECT
node.node_ip AS node_ip_ext node_ip AS node_ip_ext
FROM FROM
node node
WHERE WHERE
node.node_id=" . $node_id; node_id=" . $node_id;
// run query // run query
$node = $db->db_select($query); $node = $db->db_select($query);
@ -51,14 +51,13 @@
// setup node_int // setup node_int
// build query // build query
$query = "SELECT $query = "SELECT
asset.asset_name AS asset_name, a.asset_name,
node.node_id AS node_id_int, n.node_id AS node_id_int,
node.node_ip AS node_ip_int n.node_ip AS node_ip_int
FROM FROM
asset, asset AS a LEFT JOIN node AS n USING (asset_id)
node
WHERE WHERE
node.node_id NOT IN ( n.node_id NOT IN (
SELECT SELECT
nat_int nat_int
FROM FROM
@ -66,10 +65,9 @@
WHERE WHERE
nat_ext=" . $node_id . " nat_ext=" . $node_id . "
) )
AND node.node_id!=" . $node_id . " AND n.node_id!=" . $node_id . "
AND asset.asset_id=node.asset_id
ORDER BY ORDER BY
INET_ATON(node.node_ip)"; INET_ATON(n.node_ip)";
// run query // run query
$nodes = $db->db_select($query); $nodes = $db->db_select($query);

33
natdel.php
View File

@ -36,11 +36,11 @@
// setup node_ext // setup node_ext
// build query // build query
$query = "SELECT $query = "SELECT
node.node_ip AS node_ip_ext node_ip AS node_ip_ext
FROM FROM
node node
WHERE WHERE
node.node_id=" . $node_id; node_id=" . $node_id;
// run query // run query
$node = $db->db_select($query); $node = $db->db_select($query);
@ -48,28 +48,31 @@
$smarty->assign("node_id_ext", $node_id); $smarty->assign("node_id_ext", $node_id);
$smarty->assign("node_ip_ext", $node[0]['node_ip_ext']); $smarty->assign("node_ip_ext", $node[0]['node_ip_ext']);
// setup node // setup options
// build query // build query
$query = "SELECT $query = "SELECT
asset.asset_name AS asset_name, a.asset_name,
node.node_id AS node_id_int, n.node_ip,
node.node_ip AS node_ip_int x.nat_ext
FROM FROM
asset, asset AS a,
nat, nat AS x,
node node AS n
WHERE WHERE
nat.nat_ext=" . $node_id . " x.nat_ext=" . $node_id . "
AND node.node_id=nat.nat_int AND n.node_id=x.nat_int
AND asset.asset_id=node.asset_id AND a.asset_id=n.asset_id
ORDER BY ORDER BY
INET_ATON(node.node_ip)"; INET_ATON(n.node_ip)";
// run query // run query
$nodes = $db->db_select($query); $nodes = $db->db_select($query);
$smarty->assign("nodes", $nodes);
// *** <option value="{node_id_int}">{node_ip_int}/{asset_name}</option> $options = array();
foreach ($nodes as $rec) {
$options[$rec['nat_ext']] = $rec['node_ip'] . '/' . $rec['asset_name'];
}
$smarty->assign("nat_options", $options);
// end page // end page
// output // output

6
nodedel.php
View File

@ -36,12 +36,12 @@
// setup node // setup node
// build query // build query
$query = "SELECT $query = "SELECT
node.asset_id AS asset_id, asset_id,
node.node_ip AS node_ip node_ip
FROM FROM
node node
WHERE WHERE
node.node_id=" . $node_id; node_id=" . $node_id;
// run query // run query
$node = $db->db_select($query); $node = $db->db_select($query);

30
nodeedit.php
View File

@ -36,23 +36,23 @@
// setup node // setup node
// build query // build query
$query = "SELECT $query = "SELECT
asset.asset_id AS asset_id, a.asset_id,
node.node_id AS node_id, n.node_id,
node.node_ip AS node_ip, n.node_ip,
node.node_mac AS node_mac, n.node_mac,
node.node_dns1 AS node_dns1, n.node_dns1,
node.node_dns2 AS node_dns2, n.node_dns2,
node.node_info AS node_info, n.node_info,
subnet.subnet_id AS subnet_id, s.subnet_id,
node.zone_id AS zone_id n.zone_id
FROM FROM
asset, asset AS a,
node, node AS n,
subnet subnet AS s
WHERE WHERE
asset.asset_id=node.asset_id a.asset_id=n.asset_id
AND node.node_id=" . $node_id . " AND n.node_id=" . $node_id . "
AND subnet.subnet_id=node.subnet_id"; AND s.subnet_id=n.subnet_id";
// run query // run query
$node = $db->db_select($query); $node = $db->db_select($query);

12
nodeview.php
View File

@ -74,13 +74,15 @@
nat.nat_ext AS nat_ext, nat.nat_ext AS nat_ext,
nat.nat_int AS nat_int, nat.nat_int AS nat_int,
node_ext.node_ip AS node_ip_ext, node_ext.node_ip AS node_ip_ext,
node_int.node_ip AS node_ip_int node_int.node_ip AS node_ip_int,
node_int.node_id AS node_id_int,
node_ext.node_id AS node_id_ext
FROM FROM
asset asset_ext, asset AS asset_ext,
asset asset_int, asset AS asset_int,
nat, nat,
node node_ext, node AS node_ext,
node node_int node AS node_int
WHERE WHERE
(nat.nat_ext=" . $node_id . " (nat.nat_ext=" . $node_id . "
OR nat.nat_int=" . $node_id . ") OR nat.nat_int=" . $node_id . ")

282
submit.php
View File

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

6
subnet.php
View File

@ -41,11 +41,7 @@
CHAR_LENGTH(s.subnet_info) AS subnet_length, CHAR_LENGTH(s.subnet_info) AS subnet_length,
COUNT(node.subnet_id) AS node_counter COUNT(node.subnet_id) AS node_counter
FROM FROM
subnet AS s subnet AS s LEFT JOIN node USING (subnet_id)
LEFT JOIN
node
ON
node.subnet_id=s.subnet_id
GROUP BY GROUP BY
s.subnet_id s.subnet_id
ORDER BY ORDER BY

8
subnetadd.php
View File

@ -36,13 +36,13 @@
// setup vlan // setup vlan
// build query // build query
$query = "SELECT $query = "SELECT
vlan.vlan_id AS vlan_id, vlan_id,
vlan.vlan_number AS vlan_number, vlan_number,
vlan.vlan_name AS vlan_name vlan_name
FROM FROM
vlan vlan
ORDER BY ORDER BY
vlan.vlan_name"; vlan_name";
// run query // run query
$vlans = $db->db_select($query); $vlans = $db->db_select($query);

14
subnetdel.php
View File

@ -36,12 +36,12 @@
// setup subnet // setup subnet
// build query // build query
$query = "SELECT $query = "SELECT
subnet.subnet_address AS subnet_address, subnet_address,
subnet.subnet_mask AS subnet_mask subnet_mask
FROM FROM
subnet subnet
WHERE WHERE
subnet.subnet_id=" . $subnet_id; subnet_id=" . $subnet_id;
// run query // run query
$subnet = $db->db_select($query); $subnet = $db->db_select($query);
@ -54,14 +54,14 @@
// setup node // setup node
// build query // build query
$query = "SELECT $query = "SELECT
node.node_id AS node_id, node_id,
node.node_ip AS node_ip node_ip
FROM FROM
node node
WHERE WHERE
node.subnet_id=" . $subnet_id . " subnet_id=" . $subnet_id . "
ORDER BY ORDER BY
INET_ATON(node.node_ip)"; INET_ATON(node_ip)";
// run query // run query
$nodes = $db->db_select($query); $nodes = $db->db_select($query);

38
subnetview.php
View File

@ -42,24 +42,20 @@
// setup subnet // setup subnet
// build query // build query
$query = "SELECT $query = "SELECT
subnet.subnet_address, s.subnet_address,
subnet.subnet_mask, s.subnet_mask,
subnet.subnet_dhcp_start, s.subnet_dhcp_start,
subnet.subnet_dhcp_end, s.subnet_dhcp_end,
subnet.subnet_info, s.subnet_info,
subnet.protocol_version, s.protocol_version,
subnet.ntp_server, s.ntp_server,
COUNT(node.subnet_id) AS node_counter COUNT(node.subnet_id) AS node_counter
FROM FROM
subnet subnet AS s LEFT JOIN node USING (subnet_id)
LEFT JOIN
node
ON
node.subnet_id=subnet.subnet_id
WHERE WHERE
subnet.subnet_id=" . $subnet_id . " s.subnet_id=" . $subnet_id . "
GROUP BY GROUP BY
subnet.subnet_id"; s.subnet_id";
// run query // run query
$subnet = $db->db_select($query); $subnet = $db->db_select($query);
@ -394,18 +390,14 @@
// setup location // setup location
// build query // build query
$query = "SELECT $query = "SELECT
location.location_id, l.location_id,
location.location_name l.location_name
FROM FROM
location location AS l LEFT JOIN subnetlocation AS s USING (location_id)
LEFT JOIN
subnetlocation
ON
subnetlocation.location_id=location.location_id
WHERE WHERE
subnetlocation.subnet_id=". $subnet_id . " s.subnet_id=". $subnet_id . "
ORDER BY ORDER BY
location.location_name"; l.location_name";
// run query // run query
$locations = $db->db_select($query); $locations = $db->db_select($query);

8
tpl/about.tpl
View File

@ -15,6 +15,14 @@
&nbsp; &nbsp;
</td> </td>
</tr> </tr>
<tr>
<td class="label">
{$lang_about_projectpage}
</td>
<td class="value">
<a href="https://git.piratenpartei-sh.de/thooge/ipreg">https://git.piratenpartei-sh.de/thooge/ipreg</a>
</td>
</tr>
<tr> <tr>
<td class="label"> <td class="label">
{$lang_about_sfprojectpage} {$lang_about_sfprojectpage}

1
tpl/assetclass.tpl
View File

@ -24,6 +24,7 @@
<a href="assetclassview.php?assetclass_id={$assetclass.assetclass_id}">{$assetclass.assetclass_name}</a> <a href="assetclassview.php?assetclass_id={$assetclass.assetclass_id}">{$assetclass.assetclass_name}</a>
</td> </td>
<td class="value"> <td class="value">
<img src="image.php?color={$assetclass.assetclassgroup_color}" alt="#{$assetclass.assetclassgroup_color}">
<a href="assetclassgroupview.php?assetclassgroup_id={$assetclass.assetclassgroup_id}">{$assetclass.assetclassgroup_name}</a> <a href="assetclassgroupview.php?assetclassgroup_id={$assetclass.assetclassgroup_id}">{$assetclass.assetclassgroup_name}</a>
</td> </td>
</tr> </tr>

1
tpl/assetclassview.tpl
View File

@ -44,6 +44,7 @@
{$lang_assetclassgroup_name} {$lang_assetclassgroup_name}
</td> </td>
<td class="value"> <td class="value">
<img src="image.php?color={$assetclassgroup_color}" alt="#{$assetclassgroup_color}">
<a href="assetclassgroupview.php?assetclassgroup_id={$assetclassgroup_id}">{$assetclassgroup_name}</a><br> <a href="assetclassgroupview.php?assetclassgroup_id={$assetclassgroup_id}">{$assetclassgroup_name}</a><br>
</td> </td>
</tr> </tr>

12
tpl/natdel.tpl
View File

@ -5,11 +5,13 @@
<table class="title"> <table class="title">
<tr> <tr>
<td class="header"> <td class="header">
{lang_nat} {$lang_nat}
</td> </td>
<td align="right"> <td align="right">
<a href="#" onClick="history.go(-1)"><img src="image.php?icon=back" alt="{$lang_cancel}"></a> <a href="#" onClick="history.go(-1)"><img src="image.php?icon=back" alt="{$lang_cancel}"></a>
{if $nat_options}
<input type="image" src="image.php?icon=save" alt="{$lang_submit}"> <input type="image" src="image.php?icon=save" alt="{$lang_submit}">
{/if}
</td> </td>
</tr> </tr>
</table> </table>
@ -43,11 +45,17 @@
</td> </td>
</tr> </tr>
<tr> <tr>
{if $nat_options}
<td class="label"> <td class="label">
{$lang_node} {$lang_node}
</td> </td>
<td class="value"> <td class="value">
{html_options name=node_id_int options=$node_id_int_options} {html_options name=nat_ext options=$nat_options}
</td> </td>
{else}
<td colspan="2">
No NAT rule to delete
</td>
{/if}
</tr> </tr>
</table> </table>

8
tpl/nodeview.tpl
View File

@ -131,7 +131,13 @@
</td> </td>
<td class="value"> <td class="value">
{foreach item=rule from=$natrules} {foreach item=rule from=$natrules}
<a href="nodeview.php?node_id={$rule.nat_node_id}">{$rule.nat_node_ip}</a>/<a href="assetview.php?asset_id={$rule.nat_asset_id}">{$rule.nat_asset_name}</a> ({$rule.nat_type})<br /> {if $rule.node_id_int eq $node.node_id}
<img src="images/arrow_left.png" alt="incoming" title="coming from">
<a href="nodeview.php?node_id={$rule.node_id_ext}">{$rule.node_ip_ext}</a>/<a href="assetview.php?asset_id={$rule.asset_id_ext}">{$rule.asset_name_ext}</a> ({$rule.nat_type})<br />
{else}
<img src="images/arrow_right.png" alt="outgoing" title="forwarding to">
<a href="nodeview.php?node_id={$rule.node_id_int}">{$rule.node_ip_int}</a>/<a href="assetview.php?asset_id={$rule.asset_id_int}">{$rule.asset_name_int}</a> ({$rule.nat_type})<br />
{/if}
{/foreach} {/foreach}
</td> </td>
</tr> </tr>