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

Compare commits

base: thooge:0b2da1f00fd9800b3cfc202bc1a5ab17126d1603
Branches Tags
thooge:master
..
compare: thooge:db26ffa61178dcd895df8fc77041d9f76b3a94a6
Branches Tags
thooge:master

No commits in common. '0b2da1f00fd9800b3cfc202bc1a5ab17126d1603' and 'db26ffa61178dcd895df8fc77041d9f76b3a94a6' have entirely different histories.
0b2da1f00f ... db26ffa611

23 changed files with 27 additions and 50 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats
  1. 4
      cable.php
  2. BIN
      images/asset.png
  3. BIN
      images/brick.png
  4. BIN
      images/bricks.png
  5. BIN
      images/disconnect.png
  6. BIN
      images/tag-blue.png
  7. 4
      lang/de.php
  8. 4
      lang/en.php
  9. 2
      lib.php
  10. 2
      subnetvlanadd.php
  11. 8
      tpl/about.tpl
  12. 1
      tpl/asset.tpl
  13. 1
      tpl/assetclass.tpl
  14. 1
      tpl/assetclassgroup.tpl
  15. 1
      tpl/assetclassgroupview.tpl
  16. 1
      tpl/assetclassview.tpl
  17. 1
      tpl/assetview.tpl
  18. 1
      tpl/cable.tpl
  19. 21
      tpl/cableview.tpl
  20. 2
      tpl/login.tpl
  21. 1
      tpl/subnetview.tpl
  22. 1
      tpl/vlan.tpl
  23. 21
      tpl/vlanview.tpl

4
cable.php
Unescape View File

@ -150,12 +150,12 @@ $smarty->assign('description', $sth->fetchColumn());
$smarty->display('cabledel.tpl'); $smarty->display('cabledel.tpl');
else: else:
// ========== ERROR UNKNOWN VARIANT =========================================== // ========== UNBEKANNTE VARIANTE =============================================
echo "<p>Unknown function call: Please report to system development!</p>\n"; echo "<p>Unknown function call: Please report to system development!</p>\n";
endif; // $action == ... endif; // $action == ...
// ========== END OF VARIANTS ================================================= // ========== END OF VARIANTS =================================================
$smarty->display('footer.tpl'); include("footer.php");
?> ?>

BIN
images/asset.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 574 B

BIN
images/brick.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 696 B

BIN
images/bricks.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 884 B

BIN
images/disconnect.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 883 B

BIN
images/tag-blue.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 665 B

4
lang/de.php
Unescape View File

@ -228,14 +228,12 @@ $lang = array(
'lang_about_license_ext' => 'Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)<br>Copyright (C) 2011-2023 Thomas Hooge<p>This program is free software: you can redistribute it and/or modify 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.<p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<p> You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/.', 'lang_about_license_ext' => 'Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)<br>Copyright (C) 2011-2023 Thomas Hooge<p>This program is free software: you can redistribute it and/or modify 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.<p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<p> You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/.',
'lang_about_changelog' => 'Changelog (major changes only)', 'lang_about_changelog' => 'Changelog (major changes only)',
'lang_about_changelog_v09' => 'v0.9 (mar 2023)',
'lang_about_changelog_v09_ext' => '- Changed database interface to PDO / prepared statements<br>- LDAP authentication<br>- User rights<br>- Improved internal menu system',
'lang_about_changelog_v08' => 'v0.8 (feb 2023)', 'lang_about_changelog_v08' => 'v0.8 (feb 2023)',
'lang_about_changelog_v08_ext' => '- Some small improvements and bugfixing<br>- Code simplification as preparation for big refactoring', 'lang_about_changelog_v08_ext' => '- Some small improvements and bugfixing<br>- Code simplification as preparation for big refactoring',
'lang_about_changelog_v07' => 'v0.7 (oct 2018)', 'lang_about_changelog_v07' => 'v0.7 (oct 2018)',
'lang_about_changelog_v07_ext' => '- Added support for PHP7, switched to mysqli', 'lang_about_changelog_v07_ext' => '- Added support for PHP7, switched to mysqli',
'lang_about_changelog_v06' => 'v0.6 (may 2011)', 'lang_about_changelog_v06' => 'v0.6 (may 2011)',
'lang_about_changelog_v06_ext' => '- Moved towards smarty template engine<br />- Language support finalized<br>- Added german language<br>- Some small bug fixes', 'lang_about_changelog_v06_ext' => '- Moved towards smarty template engine<br />- language support finalized<br>- added german language<br>- some small bug fixes',
'lang_about_changelog_v05' => 'v0.5 (dec 2009)', 'lang_about_changelog_v05' => 'v0.5 (dec 2009)',
'lang_about_changelog_v05_ext' => '- Complete code rewrite<br>- Input sanitation<br>- Background image<br>- Added multiple counters<br>- HTML is now 100% W3C valid<br>- More user options', 'lang_about_changelog_v05_ext' => '- Complete code rewrite<br>- Input sanitation<br>- Background image<br>- Added multiple counters<br>- HTML is now 100% W3C valid<br>- More user options',
'lang_about_changelog_v04' => 'v0.4 (jun 2008)', 'lang_about_changelog_v04' => 'v0.4 (jun 2008)',

4
lang/en.php
Unescape View File

@ -228,14 +228,12 @@ $lang = array(
'lang_about_license_ext' => 'Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)<br>Copyright (C) 2011-2023 Thomas Hooge<p>This program is free software: you can redistribute it and/or modify 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.<p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<p> You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/.', 'lang_about_license_ext' => 'Copyright (C) 2007-2009 Wietse Warendorff (up to v0.5)<br>Copyright (C) 2011-2023 Thomas Hooge<p>This program is free software: you can redistribute it and/or modify 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.<p>This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<p> You should have received a copy of the GNU General Public License along with this program. If not, see http://www.gnu.org/licenses/.',
'lang_about_changelog' => 'Changelog (major changes only)', 'lang_about_changelog' => 'Changelog (major changes only)',
'lang_about_changelog_v09' => 'v0.9 (mar 2023)',
'lang_about_changelog_v09_ext' => '- Changed database interface to PDO / prepared statements<br>- LDAP authentication<br>- User rights<br>- Improved internal menu system',
'lang_about_changelog_v08' => 'v0.8 (feb 2023)', 'lang_about_changelog_v08' => 'v0.8 (feb 2023)',
'lang_about_changelog_v08_ext' => '- Some small improvements and bugfixing<br>- Code simplification as preparation for big refactoring', 'lang_about_changelog_v08_ext' => '- Some small improvements and bugfixing<br>- Code simplification as preparation for big refactoring',
'lang_about_changelog_v07' => 'v0.7 (oct 2018)', 'lang_about_changelog_v07' => 'v0.7 (oct 2018)',
'lang_about_changelog_v07_ext' => '- Added support for PHP7, switched to mysqli', 'lang_about_changelog_v07_ext' => '- Added support for PHP7, switched to mysqli',
'lang_about_changelog_v06' => 'v0.6 (may 2011)', 'lang_about_changelog_v06' => 'v0.6 (may 2011)',
'lang_about_changelog_v06_ext' => '- Moved towards smarty template engine<br />- Language support finalized<br>- Added german language<br>- Some small bug fixes', 'lang_about_changelog_v06_ext' => '- Moved towards smarty template engine<br />- language support finalized<br>- added german language<br>- some small bug fixes',
'lang_about_changelog_v05' => 'v0.5 (dec 2009)', 'lang_about_changelog_v05' => 'v0.5 (dec 2009)',
'lang_about_changelog_v05_ext' => '- Complete code rewrite<br>- Input sanitation<br>- Background image<br>- Added multiple counters<br>- HTML is now 100% W3C valid<br>- More user options', 'lang_about_changelog_v05_ext' => '- Complete code rewrite<br>- Input sanitation<br>- Background image<br>- Added multiple counters<br>- HTML is now 100% W3C valid<br>- More user options',
'lang_about_changelog_v04' => 'v0.4 (jun 2008)', 'lang_about_changelog_v04' => 'v0.4 (jun 2008)',

2
lib.php
Unescape View File

@ -28,7 +28,7 @@ define ('ACT_VIEW_LIST', 13);
// ========== GLOBAL PAGE START CODE ========================================== // ========== GLOBAL PAGE START CODE ==========================================
// global version string // global version string
$config_version = 'v0.9'; $config_version = 'v0.8';
// available languages // available languages
$config_lang = array('de', 'en'); $config_lang = array('de', 'en');

2
subnetvlanadd.php
Unescape View File

@ -33,7 +33,7 @@ $sth->execute([$subnet_id]);
$vlans = $sth->fetchAll(); $vlans = $sth->fetchAll();
foreach ($vlans as $vlan) { foreach ($vlans as $vlan) {
$vlan_options[$vlan['vlan_id']] = $vlan['vlan_name'] . ' (' . $vlan['vlan_number']. ')'; $vlan_options[$vlan['vlan_id']] = $vlan['vlan_name'] . '(' . $vlan['vlan_number']. ')';
} }
$smarty->assign("vlan_options", $vlan_options); $smarty->assign("vlan_options", $vlan_options);

8
tpl/about.tpl
Unescape View File

@ -83,14 +83,6 @@
&nbsp; &nbsp;
</td> </td>
</tr> </tr>
<tr>
<td class="label">
{$lang_about_changelog_v09}
</td>
<td class="value">
{$lang_about_changelog_v09_ext}
</td>
</tr>
<tr> <tr>
<td class="label"> <td class="label">
{$lang_about_changelog_v08} {$lang_about_changelog_v08}

1
tpl/asset.tpl
Unescape View File

@ -1,7 +1,6 @@
<table class="title"> <table class="title">
<tr> <tr>
<td class="header"> <td class="header">
<img class="icon" src="images/asset.png" alt="" />
{$lang_assets} ({$assets|@count} / {$assetcount}) {$lang_assets} ({$assets|@count} / {$assetcount})
</td> </td>
<td align="right"> <td align="right">

1
tpl/assetclass.tpl
Unescape View File

@ -1,7 +1,6 @@
<table class="title"> <table class="title">
<tr> <tr>
<td class="header"> <td class="header">
<img class="icon" src="images/brick.png" alt="" />
{$lang_assetclasses} ({$assetclasses|@count}) {$lang_assetclasses} ({$assetclasses|@count})
</td> </td>
<td align="right"> <td align="right">

1
tpl/assetclassgroup.tpl
Unescape View File

@ -1,7 +1,6 @@
<table class="title"> <table class="title">
<tr> <tr>
<td class="header"> <td class="header">
<img class="icon" src="images/bricks.png" alt="" />
{$lang_assetclassgroups} ({$assetclassgroups|@count}) {$lang_assetclassgroups} ({$assetclassgroups|@count})
</td> </td>
<td align="right"> <td align="right">

1
tpl/assetclassgroupview.tpl
Unescape View File

@ -1,7 +1,6 @@
<table class="title"> <table class="title">
<tr> <tr>
<td class="header"> <td class="header">
<img class="icon" src="images/bricks.png" alt="" />
{$assetclassgroup->name} {$assetclassgroup->name}
</td> </td>
<td align="right"> <td align="right">

1
tpl/assetclassview.tpl
Unescape View File

@ -1,7 +1,6 @@
<table class="title"> <table class="title">
<tr> <tr>
<td class="header"> <td class="header">
<img class="icon" src="images/brick.png" alt="" />
{$assetclass->assetclass_name} {$assetclass->assetclass_name}
</td> </td>
<td align="right"> <td align="right">

1
tpl/assetview.tpl
Unescape View File

@ -1,7 +1,6 @@
<table class="title"> <table class="title">
<tr> <tr>
<td class="header"> <td class="header">
<img class="icon" src="images/asset.png" alt="" />
{$asset->asset_name} {$asset->asset_name}
</td> </td>
<td align="right"> <td align="right">

1
tpl/cable.tpl
Unescape View File

@ -1,7 +1,6 @@
<table class="title"> <table class="title">
<tr> <tr>
<td class="header"> <td class="header">
<img class="icon" src="images/disconnect.png" alt="" />
{$lang_cable} ({$cables|@count}) {$lang_cable} ({$cables|@count})
</td> </td>
<td align="right"> <td align="right">

21
tpl/cableview.tpl
Unescape View File

@ -1,14 +1,13 @@
<table class="title"> <table class="title">
<tr> <tr>
<td class="header"> <td class="header">
<img class="icon" src="images/disconnect.png" alt="" /> {$vlan_name}
{$cable->description} </td>
</td> <td align="right">
<td align="right"> <a href="cable.php?f=edit&id={$cable->id}"><img src="image.php?icon=edit" alt="{$lang_cable_edit}"></a>
<a href="cable.php?f=edit&id={$cable->id}"><img src="image.php?icon=edit" alt="{$lang_cable_edit}"></a> <a href="cable.php?f=del&id={$cable->id}"><img src="image.php?icon=delete" alt="{$lang_cable_del}"></a>
<a href="cable.php?f=del&id={$cable->id}"><img src="image.php?icon=delete" alt="{$lang_cable_del}"></a> </td>
</td> </tr>
</tr>
</table> </table>
<table class="info"> <table class="info">
@ -30,7 +29,7 @@
</tr> </tr>
<tr> <tr>
<td class="label"> <td class="label">
{$lang_cable_type} {$lang_cable_type} XXX
</td> </td>
<td class="value"> <td class="value">
{$cable->cable_type} {$cable->cable_type}

2
tpl/login.tpl
Unescape View File

@ -33,7 +33,7 @@
{$lang_ipreg}&nbsp;{$config_version} {$lang_ipreg}&nbsp;{$config_version}
</td> </td>
<td align="right"> <td align="right">
<input type="image" src="images/control_fastforward_blue.png" alt="{$lang_login}" title="{$lang_login}"> <input type="image" src="images/control_fastforward_blue.png" alt="{$lang_login}">
</td> </td>
</tr> </tr>
</table> </table>

1
tpl/subnetview.tpl
Unescape View File

@ -1,7 +1,6 @@
<table class="title"> <table class="title">
<tr> <tr>
<td class="header"> <td class="header">
<img class="icon" src="images/plugin.png" alt="" />
{$subnet->address}/{$subnet->mask} {$subnet->address}/{$subnet->mask}
</td> </td>
<td align="right"> <td align="right">

1
tpl/vlan.tpl
Unescape View File

@ -1,7 +1,6 @@
<table class="title"> <table class="title">
<tr> <tr>
<td class="header"> <td class="header">
<img class="icon" src="images/tag-blue.png" alt="" />
{$lang_vlans} ({$vlans|@count}) {$lang_vlans} ({$vlans|@count})
</td> </td>
<td align="right"> <td align="right">

21
tpl/vlanview.tpl
Unescape View File

@ -1,15 +1,14 @@
<table class="title"> <table class="title">
<tr> <tr>
<td class="header"> <td class="header">
<img class="icon" src="images/tag-blue.png" alt="" /> {$vlan->name}
{$vlan->name} </td>
</td> <td align="right">
<td align="right"> <a href="assignvlantosubnet.php?vlan_id={$vlan->id}"><img src="image.php?icon=add" alt="{$lang_assignvlantosubnet}"></a>
<a href="assignvlantosubnet.php?vlan_id={$vlan->id}"><img src="image.php?icon=add" alt="{$lang_assignvlantosubnet}"></a> <a href="vlanedit.php?vlan_id={$vlan->id}"><img src="image.php?icon=edit" alt="{$lang_vlan_edit}"></a>
<a href="vlanedit.php?vlan_id={$vlan->id}"><img src="image.php?icon=edit" alt="{$lang_vlan_edit}"></a> <a href="vlandel.php?vlan_id={$vlan->id}"><img src="image.php?icon=delete" alt="{$lang_vlan_del}"></a>
<a href="vlandel.php?vlan_id={$vlan->id}"><img src="image.php?icon=delete" alt="{$lang_vlan_del}"></a> </td>
</td> </tr>
</tr>
</table> </table>
<table class="info"> <table class="info">