diff --git a/cable.php b/cable.php index 81a3f46..0ea4f68 100644 --- a/cable.php +++ b/cable.php @@ -150,12 +150,12 @@ $smarty->assign('description', $sth->fetchColumn()); $smarty->display('cabledel.tpl'); else: -// ========== UNBEKANNTE VARIANTE ============================================= +// ========== ERROR UNKNOWN VARIANT =========================================== echo "

Unknown function call: Please report to system development!

\n"; endif; // $action == ... // ========== END OF VARIANTS ================================================= -include("footer.php"); +$smarty->display('footer.tpl'); ?> diff --git a/images/asset.png b/images/asset.png new file mode 100644 index 0000000..78a80cd Binary files /dev/null and b/images/asset.png differ diff --git a/images/brick.png b/images/brick.png new file mode 100644 index 0000000..40d66f7 Binary files /dev/null and b/images/brick.png differ diff --git a/images/bricks.png b/images/bricks.png new file mode 100644 index 0000000..d297efb Binary files /dev/null and b/images/bricks.png differ diff --git a/images/disconnect.png b/images/disconnect.png new file mode 100644 index 0000000..299dea0 Binary files /dev/null and b/images/disconnect.png differ diff --git a/images/tag-blue.png b/images/tag-blue.png new file mode 100644 index 0000000..097624c Binary files /dev/null and b/images/tag-blue.png differ diff --git a/lang/de.php b/lang/de.php index 7839e91..b1c5e6f 100644 --- a/lang/de.php +++ b/lang/de.php @@ -228,12 +228,14 @@ $lang = array( 'lang_about_license_ext' => '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 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, 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.

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_v09' => 'v0.9 (mar 2023)', + 'lang_about_changelog_v09_ext' => '- Changed database interface to PDO / prepared statements
- LDAP authentication
- User rights
- Improved internal menu system', 'lang_about_changelog_v08' => 'v0.8 (feb 2023)', 'lang_about_changelog_v08_ext' => '- Some small improvements and bugfixing
- Code simplification as preparation for big refactoring', 'lang_about_changelog_v07' => 'v0.7 (oct 2018)', 'lang_about_changelog_v07_ext' => '- Added support for PHP7, switched to mysqli', 'lang_about_changelog_v06' => 'v0.6 (may 2011)', - 'lang_about_changelog_v06_ext' => '- Moved towards smarty template engine
- language support finalized
- added german language
- some small bug fixes', + 'lang_about_changelog_v06_ext' => '- Moved towards smarty template engine
- Language support finalized
- Added german language
- Some small bug fixes', 'lang_about_changelog_v05' => 'v0.5 (dec 2009)', 'lang_about_changelog_v05_ext' => '- Complete code rewrite
- Input sanitation
- Background image
- Added multiple counters
- HTML is now 100% W3C valid
- More user options', 'lang_about_changelog_v04' => 'v0.4 (jun 2008)', diff --git a/lang/en.php b/lang/en.php index ae3a365..9a908f4 100644 --- a/lang/en.php +++ b/lang/en.php @@ -228,12 +228,14 @@ $lang = array( 'lang_about_license_ext' => '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 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, 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.

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_v09' => 'v0.9 (mar 2023)', + 'lang_about_changelog_v09_ext' => '- Changed database interface to PDO / prepared statements
- LDAP authentication
- User rights
- Improved internal menu system', 'lang_about_changelog_v08' => 'v0.8 (feb 2023)', 'lang_about_changelog_v08_ext' => '- Some small improvements and bugfixing
- Code simplification as preparation for big refactoring', 'lang_about_changelog_v07' => 'v0.7 (oct 2018)', 'lang_about_changelog_v07_ext' => '- Added support for PHP7, switched to mysqli', 'lang_about_changelog_v06' => 'v0.6 (may 2011)', - 'lang_about_changelog_v06_ext' => '- Moved towards smarty template engine
- language support finalized
- added german language
- some small bug fixes', + 'lang_about_changelog_v06_ext' => '- Moved towards smarty template engine
- Language support finalized
- Added german language
- Some small bug fixes', 'lang_about_changelog_v05' => 'v0.5 (dec 2009)', 'lang_about_changelog_v05_ext' => '- Complete code rewrite
- Input sanitation
- Background image
- Added multiple counters
- HTML is now 100% W3C valid
- More user options', 'lang_about_changelog_v04' => 'v0.4 (jun 2008)', diff --git a/lib.php b/lib.php index a55513f..58d8a74 100644 --- a/lib.php +++ b/lib.php @@ -28,7 +28,7 @@ define ('ACT_VIEW_LIST', 13); // ========== GLOBAL PAGE START CODE ========================================== // global version string -$config_version = 'v0.8'; +$config_version = 'v0.9'; // available languages $config_lang = array('de', 'en'); diff --git a/subnetvlanadd.php b/subnetvlanadd.php index 203e5d1..181d49f 100644 --- a/subnetvlanadd.php +++ b/subnetvlanadd.php @@ -33,7 +33,7 @@ $sth->execute([$subnet_id]); $vlans = $sth->fetchAll(); 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); diff --git a/tpl/about.tpl b/tpl/about.tpl index ac6d7d6..a066407 100644 --- a/tpl/about.tpl +++ b/tpl/about.tpl @@ -83,6 +83,14 @@   + + + {$lang_about_changelog_v09} + + + {$lang_about_changelog_v09_ext} + + {$lang_about_changelog_v08} diff --git a/tpl/asset.tpl b/tpl/asset.tpl index e99164e..6fd3b61 100644 --- a/tpl/asset.tpl +++ b/tpl/asset.tpl @@ -1,6 +1,7 @@
+ {$lang_assets} ({$assets|@count} / {$assetcount}) diff --git a/tpl/assetclass.tpl b/tpl/assetclass.tpl index ef94660..00b27cf 100644 --- a/tpl/assetclass.tpl +++ b/tpl/assetclass.tpl @@ -1,6 +1,7 @@
+ {$lang_assetclasses} ({$assetclasses|@count}) diff --git a/tpl/assetclassgroup.tpl b/tpl/assetclassgroup.tpl index 0c49fc1..b84aed9 100644 --- a/tpl/assetclassgroup.tpl +++ b/tpl/assetclassgroup.tpl @@ -1,6 +1,7 @@
+ {$lang_assetclassgroups} ({$assetclassgroups|@count}) diff --git a/tpl/cable.tpl b/tpl/cable.tpl index 42aaaca..11a8440 100644 --- a/tpl/cable.tpl +++ b/tpl/cable.tpl @@ -1,6 +1,7 @@
+ {$lang_cable} ({$cables|@count}) diff --git a/tpl/cableview.tpl b/tpl/cableview.tpl index 89a878f..3e3b22f 100644 --- a/tpl/cableview.tpl +++ b/tpl/cableview.tpl @@ -1,7 +1,7 @@
- {$vlan_name} + {$cable->description} {$lang_cable_edit} @@ -29,7 +29,7 @@
- {$lang_cable_type} XXX + {$lang_cable_type} {$cable->cable_type} diff --git a/tpl/login.tpl b/tpl/login.tpl index e4cbe8e..038a12a 100644 --- a/tpl/login.tpl +++ b/tpl/login.tpl @@ -33,7 +33,7 @@ {$lang_ipreg} {$config_version} - +
diff --git a/tpl/vlan.tpl b/tpl/vlan.tpl index 585beba..ad122c9 100644 --- a/tpl/vlan.tpl +++ b/tpl/vlan.tpl @@ -1,6 +1,7 @@
+ {$lang_vlans} ({$vlans|@count})