Interface count for asset

2 years ago · 42e327776c
parent 6c9a169600
commit 42e327776c
14 changed files with 133 additions and 18 deletions
--- a/assetedit.php
+++ b/assetedit.php
@ -13,7 +13,8 @@ $asset_id = sanitize($_GET['asset_id']);

 include("header.php");
 	
-$sql = "SELECT asset_id, asset_name, asset_hostname, asset_info, assetclass_id
+$sql = "SELECT asset_id, asset_name, asset_hostname, asset_info, asset_intf,
+            assetclass_id
 	FROM asset
 	WHERE asset_id=?";
 $sth = $dbh->prepare($sql);
--- a/assetview.php
+++ b/assetview.php
@ -14,7 +14,7 @@ $asset_id = sanitize($_GET['asset_id']);
 include("header.php");

 $sql = "SELECT a.asset_id, a.asset_name, a.asset_hostname, a.asset_info,
-            c.assetclass_id, c.assetclass_name
+            a.asset_intf, c.assetclass_id, c.assetclass_name
 	FROM asset AS a LEFT OUTER JOIN assetclass AS c USING (assetclass_id)
 	WHERE a.asset_id=?";
 $sth = $dbh->prepare($sql);
--- a/lang/de.php
+++ b/lang/de.php
@ -56,6 +56,7 @@ $lang = array(
    'lang_asset_name' => 'Objektname',
    'lang_asset_hostname' => 'Hostname',
    'lang_asset_none' => 'Es sind keine Objekte vorhanden',
+    'lang_asset_intf' => 'Anzahl Schnittstellen',

    'lang_assetclass_add' => 'Objektklasse hinzufügen',
    'lang_assetclass_del' => 'Objektklasse löschen',
--- a/lang/en.php
+++ b/lang/en.php
@ -56,6 +56,7 @@ $lang = array(
    'lang_asset_name' => 'Asset name',
    'lang_asset_hostname' => 'Hostname',
    'lang_asset_none' => 'There are no assets defined',
+    'lang_asset_intf' => 'Number of interfaces',

    'lang_assetclass_add' => 'Add assetclass',
    'lang_assetclass_del' => 'Delete assetclass',
--- a/lib.php
+++ b/lib.php
@ -39,7 +39,7 @@ function db_load_enum($table, $column) {
            WHERE table_name=? AND column_name=?";
    $sth = $dbh->prepare($sql);
    $sth->execute([$table, $column]);
-    return array_map(fn($x) => trim($x, "'"), explode(',', $sth->fetch(PDO::FETCH_NUM)));
+    return array_map(fn($x) => trim($x, "'"), explode(',', $sth->fetchColumn()));
 }

 function db_get_options_asset() {
--- a/nat.php
+++ b/nat.php
@ -0,0 +1,28 @@
+<?php
+/*****************************************************************************
+IP Reg, a PHP/MySQL IPAM tool
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
+
+SPDX-License-Identifier: GPL-3.0-or-later
+*****************************************************************************/
+
+include("includes.php");
+	
+include("header.php");
+	
+$sql = "SELECT n.nat_id AS id, n.nat_type, n.nat_ext, n.nat_int,
+            n.nat_ext_port AS port_ext, n.nat_int_port AS port_int,
+            n.nat_description AS description,
+            n1.node_ip AS node_ip_int, n2.node_ip AS node_ip_ext
+	FROM nat AS n
+	    LEFT JOIN node AS n1 ON (n.nat_int=n1.node_id)
+	    LEFT JOIN node AS n2 ON (n.nat_ext=n2.node_id)
+	ORDER BY INET_ATON(nat_ext)";
+$sth = $dbh->query($sql);
+$smarty->assign("nats", $sth->fetchAll());
+
+$smarty->display("nat.tpl");
+
+include("footer.php");
+?>
--- a/submit.php
+++ b/submit.php
@ -106,13 +106,14 @@ if (isset($_POST['add'])) {
            $hostname = sanitize($_POST['asset_hostname']);
            $assetclass_id = sanitize($_POST['assetclass_id']);
            $info = sanitize($_POST['asset_info']);
+            $intf = sanitize($_POST['asset_intf']);

            $sql = "INSERT INTO asset
-                        (asset_name, asset_hostname, assetclass_id, asset_info)
+                        (asset_name, asset_hostname, assetclass_id, asset_info, asset_intf)
                    VALUE 
-                        (?, ?, ?, ?)";
+                        (?, ?, ?, ?, ?)";
            $sth = $dbh->prepare($sql);
-            $sth->execute([$name, $hostname, $assetclass_id, $info]);
+            $sth->execute([$name, $hostname, $assetclass_id, $info, $intf]);

            header_location("assetview.php?asset_id=" . $dbh->lastInsertId());
            break;
@ -528,15 +529,18 @@ if (isset($_POST['edit'])) {
            $asset_id = sanitize($_POST['asset_id']);
            $asset_name = sanitize($_POST['asset_name']);
            $asset_info = sanitize($_POST['asset_info']);
+            $asset_intf = sanitize($_POST['asset_intf']);
            $asset_hostname = sanitize($_POST['asset_hostname']);
            $assetclass_id = sanitize($_POST['assetclass_id']);

            $sql = "UPDATE asset SET
                        asset_name=?, asset_info=?, asset_hostname=?,
-                        assetclass_id=?
+                        assetclass_id=?, asset_intf=?
                    WHERE asset_id=?";
            $sth = $dbh->prepare($sql);
-            $sth->execute([$asset_name, $asset_info, $asset_hostname, $assetclass_id, $asset_id]);
+            $sth->execute([$asset_name, $asset_info, $asset_hostname, 
+                           $assetclass_id, $asset_intf,
+                           $asset_id]);

            header_location("assetview.php?asset_id=" . $asset_id);

--- a/tpl/assetadd.tpl
+++ b/tpl/assetadd.tpl
@ -46,6 +46,14 @@
        <textarea name="asset_info" cols="30" rows="10"></textarea>
    </td>
 </tr>
+<tr>
+    <td class="label">
+        {$lang_asset_intf}
+    </td>
+    <td class="value">
+        <input type="text" size="6" maxlength="6" name="asset_intf" value="1">
+    </td>
+</tr>
 </table>

 <table class="info">
--- a/tpl/assetedit.tpl
+++ b/tpl/assetedit.tpl
@ -48,6 +48,14 @@
        <textarea name="asset_info" cols="30" rows="10">{$asset->asset_info}</textarea>
    </td>
 </tr>
+<tr>
+    <td class="label">
+        {$lang_asset_intf}
+    </td>
+    <td class="value">
+        <input type="text" size="6" maxlength="6" name="asset_intf" value="{$asset->asset_intf}">
+    </td>
+</tr>
 </table>

 <table class="info">
--- a/tpl/assetview.tpl
+++ b/tpl/assetview.tpl
@ -44,6 +44,14 @@
            {$asset->asset_info}
        </td>
    </tr>
+    <tr>
+        <td class="label">
+            {$lang_asset_intf}
+        </td>
+        <td class="value">
+            {$asset->asset_intf}
+        </td>
+    </tr>
 </table>


--- a/tpl/nat.tpl
+++ b/tpl/nat.tpl
@ -0,0 +1,50 @@
+<table class="title">
+<tr>
+    <td class="header">
+        {$lang_nat_rules} ({$nats|@count})
+    </td>
+    <td align="right">
+       &nbsp;
+    </td>
+</tr>
+</table>
+
+<table class="info">
+<tr>
+    <td class="header">
+        {$lang_nat}
+    </td>
+    <td class="header">
+        {$lang_source} (ext)
+    </td>
+    <td class="header">
+        {$lang_target} (int)
+    </td>
+    <td class="header">
+        {$lang_nat_type}
+    </td>
+</tr>
+{foreach item=nat from=$nats}
+<tr>
+    <td class="label">
+        Rule #{$nat.id} {$nat.description}
+    </td>
+    <td class="label">
+        <a href="nodeview.php?node_id={$nat.nat_ext}">{$nat.node_ip_ext}</a>
+{if $nat.port_ext}:{$nat.port_ext}{/if}
+    <td class="label">
+        <a href="nodeview.php?node_id={$nat.nat_int}">{$nat.node_ip_int}</a>
+{if $nat.port_int}:{$nat.port_int}{/if}
+    </td>
+    <td class="value">
+        {$nat.nat_type}
+    </td>
+</tr>
+{foreachelse}
+<tr>
+    <td colspan="3">
+        {$lang_nat_none}
+    </td>
+</tr>
+{/foreach}
+</table>
--- a/tpl/useradd.tpl
+++ b/tpl/useradd.tpl
@ -47,5 +47,13 @@
        <input type="text" name="user_password">
    </td>
 </tr>
+<tr>
+    <td class="label">
+        {$lang_user_realm}
+    </td>
+    <td class="value">
+        {html_radios name=user_realm values=$realm_ids output=$realm_names selected=$realm_selected}
+    </td>
+</tr>
 </table>
 </form>
--- a/tpl/userview.tpl
+++ b/tpl/userview.tpl
@ -19,14 +19,6 @@
    <td class="header_right">
        &nbsp;
    </td>
-    <tr>
-        <td class="label">
-            {$lang_user_realm}
-        </td>
-        <td class="value">
-            {$user_realm}
-        </td>
-    </tr>
 </tr>
 <tr>
    <td class="label">
@ -49,7 +41,7 @@
        {$lang_user_realm}
    </td>
    <td class="value">
-        {$user_realm}
+        {$user->realm}
    </td>
 </tr>
 </table>
--- a/useradd.php
+++ b/useradd.php
@ -10,6 +10,12 @@ SPDX-License-Identifier: GPL-3.0-or-later
 include("includes.php");
 include("header.php");

+$realms = db_load_enum('user','user_realm');
+
+$smarty->assign("realm_ids", $realms);
+$smarty->assign("realm_names", $realms);
+$smarty->assign("realm_selected", $realms[0]);
+
 $smarty->display("useradd.tpl");

 include("footer.php");