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

Subsequent fixes after major changes for PDO

Browse Source
This commit is contained in:
Thomas Hooge
2023-02-24 12:16:25 +01:00
parent 7c300e0a8f
commit e74bde2d14
46 changed files with 289 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tpl/assetclassgroup.tpl
View File

@@ -14,17 +14,23 @@
<td class="header">
{$lang_assetclassgroup_name}
</td>
<td class="header">
{$lang_description}
</td>
</tr>
{foreach item=assetclassgroup from=$assetclassgroups}
{foreach item=acg from=$assetclassgroups}
<tr>
<td class="label">
<img src="image.php?color={$assetclassgroup.assetclassgroup_color}" alt="#{$assetclassgroup.assetclassgroup_color}">
<a href="assetclassgroupview.php?assetclassgroup_id={$assetclassgroup.assetclassgroup_id}">{$assetclassgroup.assetclassgroup_name}</a>
<img src="image.php?color={$acg.color}" alt="#{$acg.color}">
<a href="assetclassgroupview.php?assetclassgroup_id={$acg.id}">{$acg.name}</a>
</td>
<td>
{$acg.description}
</td>
</tr>
{foreachelse}
<tr>
<td>
<td colspan="2">
{$lang_assetclassgroup_none}
</td>
</tr>

12
tpl/assetclassgroupadd.tpl
View File

@@ -27,7 +27,15 @@
{$lang_assetclassgroup_name}
</td>
<td class="value">
<input type="text" name="assetclassgroup_name">
<input type="text" name="acg_name">
</td>
</tr>
<tr>
<td class="label">
{$lang_description}
</td>
<td class="value">
<input type="text" name="acg_description" size="80" maxlength="100">
</td>
</tr>
<tr>
@@ -35,7 +43,7 @@
{$lang_color}
</td>
<td class="value">
<input type="text" name="assetclassgroup_color">
#<input type="text" {literal}class="color {pickerPosition:'right'}"{/literal} name="acg_color" size="6" maxlength="6" value="{$assetclassgroup->color}">
</td>
</tr>
</table>

14
tpl/assetclassgroupedit.tpl
View File

@@ -1,6 +1,6 @@
<form method="POST" action="submit.php">
<input type="hidden" name="edit" value="assetclassgroup">
<input type="hidden" name="assetclassgroup_id" value="{$assetclassgroup->id}">
<input type="hidden" name="acg_id" value="{$assetclassgroup->id}">
<table class="title">
<tr>
@@ -28,7 +28,15 @@
{$lang_assetclassgroup_name}
</td>
<td class="value">
<input type="text" name="assetclassgroup_name" value="{$assetclassgroup->name}">
<input type="text" name="acg_name" value="{$assetclassgroup->name}">
</td>
</tr>
<tr>
<td class="label">
{$lang_description}
</td>
<td class="value">
<input type="text" name="acg_description" size="80" maxlength="100" value="{$assetclassgroup->description}">
</td>
</tr>
<tr>
@@ -36,7 +44,7 @@
{$lang_color}
</td>
<td class="value">
#<input type="text" {literal}class="color {pickerPosition:'right'}"{/literal} name="assetclassgroup_color" size="6" maxlength="6" value="{$assetclassgroup->color}">
#<input type="text" {literal}class="color {pickerPosition:'right'}"{/literal} name="acg_color" size="6" maxlength="6" value="{$assetclassgroup->color}">
</td>
</tr>
</table>

10
tpl/assetclassgroupview.tpl
View File

@@ -1,7 +1,7 @@
<table class="title">
<tr>
<td class="header">
{$assetclassgroup_name}
{$assetclassgroup->name}
</td>
<td align="right">
<a href="assetclassgroupadd.php?assetclassgroup_id={$assetclassgroup->id}"><img src="image.php?icon=add" alt="{$lang_assetclassgroup_add}" {if $suser_tooltips}title="{$lang_assetclassgroup_add}" {/if}/></a>
@@ -28,6 +28,14 @@
<a href="assetclassgroupview.php?assetclassgroup_id={$assetclassgroup->id}">{$assetclassgroup->name}</a>
</td>
</tr>
<tr>
<td class="label">
{$lang_description}
</td>
<td class="value">
{$assetclassgroup->description}
</td>
</tr>
<tr>
<td class="label">
{$lang_color}

4
tpl/locationview.tpl
View File

@@ -38,7 +38,7 @@
{$lang_location_info}
</td>
<td class="value">
{$location_info}
{$location->info}
</td>
</tr>
</table>
@@ -72,7 +72,7 @@
{$lang_subnet}
</td>
<td class="header_right">
<a href="locationsubnetedit.php?location_id={$location_id}"><img src="image.php?icon=edit" alt="{$lang_locationsubnet_edit}"></a>
<a href="locationsubnetedit.php?location_id={$location->id}"><img src="image.php?icon=edit" alt="{$lang_locationsubnet_edit}"></a>
</td>
</tr>
<tr>

2
tpl/nodeview.tpl
View File

@@ -131,7 +131,7 @@
</td>
<td class="value">
{foreach item=rule from=$natrules}
{if $rule.node_id_int eq $node.node_id}
{if $rule.node_id_int eq $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}

2
tpl/subnetdel.tpl
View File

@@ -43,7 +43,7 @@
{$lang_ip}
</td>
<td class="value">
<a href="nodeview.php?node_id={$node.node_id}">{$node.node_ip}</a>
<a href="nodeview.php?node_id={$node.id}">{$node.ip}</a>
</td>
</tr>
{/foreach}

16
tpl/subnetedit.tpl
View File

@@ -1,6 +1,6 @@
<form method="POST" action="submit.php">
<input type="hidden" name="edit" value="subnet">
<input type="hidden" name="subnet_id" value="{$subnet_id}">
<input type="hidden" name="subnet_id" value="{$subnet->id}">
<table class="title">
<tr>
@@ -28,7 +28,7 @@
{$lang_subnet_subnetaddress}
</td>
<td class="value">
<input type="text" name="subnet_address" value="{$subnet_address}">
<input type="text" name="subnet_address" value="{$subnet->address}">
</td>
</tr>
<tr>
@@ -36,7 +36,7 @@
{$lang_subnet_mask}
</td>
<td class="value">
<input type="text" name="subnet_mask" size="2" value="{$subnet_mask}">
<input type="text" name="subnet_mask" size="2" value="{$subnet->mask}">
</td>
</tr>
<tr>
@@ -44,7 +44,7 @@
{$lang_proto_vers}
</td>
<td class="value">
<input type="text" name="subnet_proto_vers" size="2" value="{$subnet_proto_vers}">
<input type="text" name="subnet_proto_vers" size="2" value="{$subnet->proto_vers}">
</td>
</tr>
<tr>
@@ -52,7 +52,7 @@
{$lang_subnet_dhcpstart}
</td>
<td class="value">
<input type="text" name="subnet_dhcpstart" size="15" value="{$subnet_dhcpstart}">
<input type="text" name="subnet_dhcpstart" size="15" value="{$subnet->dhcp_start}">
</td>
</tr>
<tr>
@@ -60,7 +60,7 @@
{$lang_subnet_dhcpend}
</td>
<td class="value">
<input type="text" name="subnet_dhcpend" size="15" value="{$subnet_dhcpend}">
<input type="text" name="subnet_dhcpend" size="15" value="{$subnet->dhcp_end}">
</td>
</tr>
<tr>
@@ -68,7 +68,7 @@
NTP Server
</td>
<td class="value">
<input type="text" name="subnet_ntp_server" size="45" value="{$subnet_ntp_server}">
<input type="text" name="subnet_ntp_server" size="45" value="{$subnet->ntp_server}">
</td>
</tr>
<tr>
@@ -76,7 +76,7 @@
{$lang_subnet_info}
</td>
<td class="value">
<textarea name="subnet_info" cols="30" rows="10">{$subnet_info}</textarea>
<textarea name="subnet_info" cols="30" rows="10">{$subnet->info}</textarea>
</td>
</tr>
</table>

4
tpl/subnetlocationadd.tpl
View File

@@ -1,6 +1,6 @@
<form method="POST" action="submit.php">
<input type="hidden" name="add" value="subnetlocation">
<input type="hidden" name="subnet_id" value="{$subnet_id}">
<input type="hidden" name="subnet_id" value="{$subnet->id}">
<table class="title">
<tr>
@@ -30,7 +30,7 @@
{$lang_subnet_subnetaddress}/{$lang_subnet_mask}
</td>
<td class="value">
<a href="subnetview.php?subnet_id={$subnet_id}">{$subnet_address}/{$subnet_mask}</a>
<a href="subnetview.php?subnet_id={$subnet->id}">{$subnet->address}/{$subnet->mask}</a>
</td>
</tr>
</table>

4
tpl/subnetlocationedit.tpl
View File

@@ -1,6 +1,6 @@
<form method="POST" action="submit.php">
<input type="hidden" name="redirect" value="subnetlocation">
<input type="hidden" name="subnet_id" value="{$subnet_id}">
<input type="hidden" name="subnet_id" value="{$subnet->id}">
<table class="title">
<tr>
@@ -28,7 +28,7 @@
{$lang_subnet_subnetaddress}/{$lang_subnet_mask}
</td>
<td class="value">
<a href="subnetview.php?subnet_id={$subnet_id}">{$subnet_address}/{$subnet_mask}</a>
<a href="subnetview.php?subnet_id={$subnet->id}">{$subnet->address}/{$subnet->mask}</a>
</td>
</tr>
</table>

4
tpl/subnetview.tpl
View File

@@ -47,7 +47,7 @@
{$lang_subnet_subnetaddress}
</td>
<td class="value">
{if $subnet_proto_vers eq 4}
{if $subnet->proto_vers eq 4}
<a href="subnetview.php?subnet_id={$subnet->id}">{$subnet->address}</a>
{else}
{$subnet->address}&nbsp;/&nbsp;{$subnet->mask}
@@ -62,7 +62,7 @@
{$subnet->proto_vers}
</td>
</tr>
{if $subnet_proto_vers eq 4}
{if $subnet->proto_vers eq 4}
<tr>
<td class="label">
{$lang_subnet_mask}

4
tpl/subnetvlanadd.tpl
View File

@@ -1,6 +1,6 @@
<form method="POST" action="submit.php">
<input type="hidden" name="add" value="subnetvlan">
<input type="hidden" name="subnet_id" value="{$subnet_id}">
<input type="hidden" name="subnet_id" value="{$subnet->id}">
<table class="title">
<tr>
@@ -28,7 +28,7 @@
{$lang_subnet_subnetaddress}/{$lang_subnet_mask}
</td>
<td class="value">
<a href="subnetview.php?subnet_id={$subnet_id}">{$subnet_address}/{$subnet_mask}</a>
<a href="subnetview.php?subnet_id={$subnet->id}">{$subnet->address}/{$subnet->mask}</a>
</td>
</tr>
</table>

4
tpl/subnetvlanedit.tpl
View File

@@ -1,6 +1,6 @@
<form method="POST" action="submit.php">
<input type="hidden" name="redirect" value="subnetvlan">
<input type="hidden" name="subnet_id" value="{$subnet_id}">
<input type="hidden" name="subnet_id" value="{$subnet->id}">
<table class="title">
<tr>
@@ -28,7 +28,7 @@
{$lang_subnet_subnetaddress}/{$lang_subnet_mask}
</td>
<td class="value">
<a href="subnetview.php?subnet_id={$subnet_id}">{$subnet_address}/{$subnet_mask}</a>
<a href="subnetview.php?subnet_id={$subnet->id}">{$subnet->address}/{$subnet->mask}</a>
</td>
</tr>
</table>

6
tpl/useredit.tpl
View File

@@ -1,6 +1,6 @@
<form method="POST" action="submit.php">
<input type="hidden" name="edit" value="user">
<input type="hidden" name="user_id" value="{$user_id}">
<input type="hidden" name="user_id" value="{$user->id}">
<table class="title">
<tr>
@@ -29,7 +29,7 @@
{$lang_user_name}
</td>
<td class="value">
<input type="text" name="user_name" value="{$user_name}">
<input type="text" name="user_name" value="{$user->name}">
</td>
</tr>
<tr>
@@ -37,7 +37,7 @@
{$lang_user_displayname}
</td>
<td class="value">
<input type="text" name="user_displayname" value="{$user_displayname}">
<input type="text" name="user_displayname" value="{$user->displayname}">
</td>
</tr>
</table>

4
tpl/vlansubnetadd.tpl
View File

@@ -1,6 +1,6 @@
<form method="POST" action="submit.php">
<input type="hidden" name="add" value="vlansubnet">
<input type="hidden" name="vlan_id" value="{$vlan_id}">
<input type="hidden" name="vlan_id" value="{$vlan->id}">
<table class="title">
<tr>
@@ -28,7 +28,7 @@
{$lang_vlan_name} ({$lang_vlan_number})
</td>
<td class="value">
<a href="vlanview.php?vlan_id={$vlan_id}">{$vlan_name} ({$vlan_number})</a>
<a href="vlanview.php?vlan_id={$vlan->id}">{$vlan->name} ({$vlan->number})</a>
</td>
</tr>
</table>