Preselect subnet in options if defined

assignnodetoasset.php

@@ -17,6 +17,7 @@ include("header.php");
 
 $smarty->assign("node_ip", $node_ip);
 $smarty->assign("asset_id", $asset_id);
+$smarty->assign("subnet_id", $subnet_id);
 
 $query = "SELECT
 		asset_id,

lib.php

@@ -26,6 +26,7 @@ $smarty = new Smarty();
 $smarty->template_dir = 'tpl';
 $smarty->compile_dir = 'tpl_c';
 $smarty->registerPlugin('function', 'treelist', 'print_tree');
-$smarty->assign("suser_tooltips", $_SESSION['suser_tooltips']);
+
+$smarty->assign("suser_tooltips", $_SESSION['suser_tooltips'] ?? 'off');
 
 ?>

lib/functions.php

@@ -1,27 +1,14 @@
 <?php
-    /*****************************************************************************
+/*****************************************************************************
-    IP Reg, a PHP/MySQL IPAM tool
+IP Reg, a PHP/MySQL IPAM tool
-    Copyright (C) 2007-2009 Wietse Warendorff
+Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)
+Copyright (C) 2011-2023 Thomas Hooge
 
-    This program is free software: you can redistribute it and/or modify
+SPDX-License-Identifier: GPL-3.0-or-later
-    it under the terms of the GNU General Public License as published by
+*****************************************************************************/
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+// strip mac address to 12 char string
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+function strip_mac($mac) {
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-    For more information, visit http://sourceforge.net/projects/ipreg,
-    or contact me at wietsew@users.sourceforge.net
-    *****************************************************************************/
-
-    // strip mac address to 12 char string
-    function strip_mac($mac) {
     // strip chars we don't need
     $mac = preg_replace("|[^a-fA-F0-9]|", "", $mac);
 
@@ -30,17 +17,17 @@
 
     // and return
     return ($mac);
-    }
+}
 
-    // rebuild mac address
+// rebuild mac address
-    function write_mac($mac) {
+function write_mac($mac) {
     // check string length
     if (strlen($mac)!=12) {
         // if the MAC is empty, or for whatever reason incorrect, just return
         return $mac;
     } else {
         // count to 12...
-            for($i=0;$i<12;$i++) {
+        for ($i=0; $i<12; $i++) {
             // ... and strip mac to pieces
             ${"mac".$i} = $mac{$i};
         }
@@ -49,7 +36,7 @@
         $user_mac = $_SESSION['suser_mac'];
 
         // count to 12 again...
-            for($i=0;$i<12;$i++) {
+        for($i=0; $i<12; $i++) {
             // ... and replace user preference with pieces
             $user_mac = preg_replace("/x/", ${"mac".$i}, $user_mac, 1);
         }
@@ -57,19 +44,19 @@
         // and return
         return $user_mac;
     }
-    }
+}
 
-    // redirect page
+// redirect page
-    function header_location($location) {
+function header_location($location) {
     // send header
     header("location: " . $location);
 
     // exit to be sure
     exit;
-    }
+}
 
-    // sanitize input
+// sanitize input
-    function sanitize($input) {
+function sanitize($input) {
     global $dblink;
 
     // trim whitespaces
@@ -92,17 +79,17 @@
 
     // and return
     return $input;
-    }
+}
 
-    function mysql_nullstring($input) {
+function mysql_nullstring($input) {
     if (isset($input)) {
         return $input;
     } else {
         return '';
     }
-    }
+}
 
-    function lang_getfrombrowser ($allowed_languages, $default_language, $lang_variable = null, $strict_mode = true) {
+function lang_getfrombrowser ($allowed_languages, $default_language, $lang_variable = null, $strict_mode = true) {
     if ($lang_variable === null) {
         $lang_variable = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
     }
@@ -139,9 +126,9 @@
         }
     }
     return $current_lang;
-    }
+}
 
-    function print_tree_rec($tree, $level) {
+function print_tree_rec($tree, $level) {
     $output = '<ul class="treelvl' . $level. '">' . "\n";
     foreach ($tree as $node) {
         $output .= '<li><a href="' . $node['href'] . '">' . $node['value'] . '</a>';
@@ -152,9 +139,10 @@
     }
     $output .= "</ul>\n";
     return $output;
-    }
+}
 
-    function print_tree ($params, &$smarty) {
+//function print_tree($params, &$smarty) {
+function print_tree($params, Smarty_Internal_Template $template) {
     if (empty($params['level'])) {
         $level = 0;
     } else {
@@ -165,6 +153,6 @@
     } else {
         return print_tree_rec($params['tree'], $level);
     }
-    }
+}
 
 ?>

node.php

@@ -15,7 +15,8 @@ if(isset($_GET['subnet_id'])) {
     $subnet_view = "WHERE node.subnet_id=" . $subnet_id;
     $smarty->assign("subnet_id", $subnet_id);
 } else {
-    $smarty->assign("subnet_id", "");
+    $smarty->assign("subnet_id", '');
+    $subnet_view = '';
 }
 
 $query = "SELECT

nodeadd.php

@@ -17,6 +17,7 @@ include("header.php");
 $smarty->assign("user_dns1suffix", $_SESSION['suser_dns1suffix']);
 $smarty->assign("user_dns2suffix", $_SESSION['suser_dns2suffix']);
 $smarty->assign("node_ip", $node_ip);
+$smarty->assign("subnet_id", $subnet_id);
 	
 $smarty->assign("subnet_options", $db->options_subnet());
 $smarty->assign("assetclass_options", $db->options_assetclass());

tpl/assignnodetoasset.tpl

@@ -97,7 +97,7 @@
         {$lang_subnet_subnetaddress}/{$lang_subnet_mask}
     </td>
     <td class="value">
-        {html_options name=subnet_id options=$subnet_options}
+        {html_options name=subnet_id options=$subnet_options selected=$subnet_id}
     </td>
 </tr>
 </table>

tpl/header.tpl

@@ -6,12 +6,16 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <link rel="shortcut icon" href="images/shield.ico">
 <link rel="stylesheet" href="tpl/style.css" type="text/css">
+{if isset($styles)}
 {foreach item=style from=$styles}
 <link rel="stylesheet" href="css/{$style[0]}" type="text/css" media="{$style[1]}" />
 {/foreach}
+{/if}
+{if isset($scripts)}
 {foreach item=script from=$scripts}
 <script type="text/javascript" src="lib/{$script}"></script>
 {/foreach}
+{/if}
 </head>
 
 <body>

tpl/node.tpl

@@ -2,7 +2,7 @@
 <tr>
     <td class="header">
         <img class="icon" src="images/network-ethernet.png" alt="" />
-        {$lang_nodes} ({$node|@count})
+        {$lang_nodes} ({$nodes|@count})
     </td>
     <td align="right">
         <a href="nodeadd.php?subnet_id={$subnet_id}"><img src="image.php?icon=add" alt="{$lang_node_add}"></a>

tpl/nodeadd.tpl

@@ -125,7 +125,7 @@
             {$lang_subnet_subnetaddress}/{$lang_subnet_mask}
         </td>
         <td class="value">
-            {html_options name=subnet_id options=$subnet_options}
+            {html_options name=subnet_id options=$subnet_options selected=$subnet_id}
         </td>
     </tr>
 </table>