From ac074eb944fdb190d88e1cf83f6eb416f486d2da Mon Sep 17 00:00:00 2001
From: Thomas Hooge <thomas@hoogi.de>
Date: Wed, 1 Mar 2023 10:02:42 +0100
Subject: [PATCH] Bumped version to 0.9

---
 cable.php               |   4 ++--
 images/asset.png        | Bin 0 -> 574 bytes
 images/brick.png        | Bin 0 -> 696 bytes
 images/bricks.png       | Bin 0 -> 884 bytes
 images/disconnect.png   | Bin 0 -> 883 bytes
 images/tag-blue.png     | Bin 0 -> 665 bytes
 lang/de.php             |   4 +++-
 lang/en.php             |   4 +++-
 lib.php                 |   2 +-
 subnetvlanadd.php       |   2 +-
 tpl/about.tpl           |   8 ++++++++
 tpl/asset.tpl           |   1 +
 tpl/assetclass.tpl      |   1 +
 tpl/assetclassgroup.tpl |   1 +
 tpl/cable.tpl           |   1 +
 tpl/cableview.tpl       |   4 ++--
 tpl/login.tpl           |   2 +-
 tpl/vlan.tpl            |   1 +
 18 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 images/asset.png
 create mode 100644 images/brick.png
 create mode 100644 images/bricks.png
 create mode 100644 images/disconnect.png
 create mode 100644 images/tag-blue.png

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 "<p>Unknown function call: Please report to system development!</p>\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 0000000000000000000000000000000000000000..78a80cda360f0f569b508c4c47ca33b25241bedf
GIT binary patch
literal 574
zcmV-E0>S->P)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz6i`f5MMrQ<|NsAbrreRa=!~)5d6~p+
zkHJuIs8DdIgsa{B{{H&?{rmm>^!WSy{r&y_|MmI%_xbzz`~39x`}zF*`u_fSq1bhw
z)pVWI_WJu-d$MJU!1DF`UV^z>eYE}l{`>y^S9-De{r&j-{P_L-R(P&pgu7LBtYe41
z_xt>9lge(E%>MuX{Qv)Jk;rF_!*ZL^`TP6x_xn?Hs`~u=c%s?$`1?|FsPXpu?)3Qh
z`~33v`tbGnd86Cy^Y>72sQ3E&>hJdV{QT?k_j#q<d869r>-BP+(r%T@Z<x+;na@yh
zsP_B&^7s2|lgaP%`s(oaQgW%}>hn`{t5<oj?DF{N?DpOO|6+!{U4XY=gu346^3W5`
zfdBvi3UpFVQvm<}|Mc|zscZdOg<(Gc0062<L_t&-(}m7876L&O1=06$dU_b#-QC^Y
z-43$<eLx5#+_-`QerXi4@x*Gg&z6h%R;dBB@=q#2_QeHs=+h0Tkg;hnwc6dm^!TI)
zU?rh!bW~0C#%O<~J76On7t9I0Sak0$<OS@+xQ+)y2EDj(lM~1jV~lelT<AMQIs+-n
zNR0V~x8a&jK$0je`Q8<?Sj=<)vR@x7K%H~NqaLp_5Q&v)JvIJ&0Z|(gx`hi{pa1{>
M07*qoM6N<$f|>V9TL1t6

literal 0
HcmV?d00001

diff --git a/images/brick.png b/images/brick.png
new file mode 100644
index 0000000000000000000000000000000000000000..40d66f7dda3e3704a285aa3b7213b59a84bb52b5
GIT binary patch
literal 696
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!WQl7;NpOBzNqJ&XDuZK6ep0G}
zXKrG8YEWuoN@d~6R2v2cM$-VF5LfpCpUs;$&zm=IAsDP!u>wdRI&=sq2xKo<uwc=m
zMUy5?nmc#y?Af!IELk!c2>`|C%$YN5)~xB%r%#<ab=tIPGiT160s~8zE(NLuia-<q
zg@KA^%$Tue%^IM|D_5>uwQAMs)vMR7TL)D6|NsBpyLVr_c=6ilTZa!HK5*c`-@ku>
z&bW5%+Ue7$Z{50e{P^*+XV0EFbLR8s&l@*x1ZsT#{P~L)FJ8ZX{qf_+y?giGy?gh`
zlPCA?-2)nX<j9d5H*Nq;K6mcig9i_QKH9o<E6^i<{``6T`0=MtpMd__eE%!ZkN5B2
z|N8aon>TN6-@XlW#;aGaK79Ca^5n^f4<EjJ_wMM?qn9pSI)DEB_3PJPzI=K0>eb)B
ze_y_QIc~<`K42*8mIV0)GdvMX{rl@*+x;K6*`!;wcN;$F&E<N()a}T=e``Mb{yg~M
z_lF<LK8OL0{XJhQW6~)<pvDKDE{-7*my;717|Yzu%-qV@ECQ0RvNDCqa`ew_K6?Dv
zl^gbFkF~clFX<B2c$vF;{rhLUDFsFb8P&@qq@#cQ`uQ{J$8xobRR$TA5mhg5H=WsV
zb-PhfP|AfZer08*hUR8w=AM@>dxs=k*ihEfz186I_3fK38XJ8IN)6cF$JbwE_}$=2
zv5}#nQE<`(Ztg9`oV^C7KyG1CS76$Ma;}0c#b)NEMn;#6jk~6#KS+CKw5hzn^y+2f
z%>}|DVvM_bI>WErJ$Ubwk&9ag`zvufLrw4H3Ym;8?<J0?s-{S8U}m^*O|472|ImA&
PUl}}I{an^LB{Ts5E)9ZE

literal 0
HcmV?d00001

diff --git a/images/bricks.png b/images/bricks.png
new file mode 100644
index 0000000000000000000000000000000000000000..d297efbbac9eb9ef36c7514fc58f388cecafba31
GIT binary patch
literal 884
zcmV-)1B?8LP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz=}=5mMMrQ<WRzfMe3`p+Y;KQi*;P!;
zc5%COZ1?x~%7=e#jca9lmR5J5Yn5klj%`|cpKXq7PIstwi>268NNR+nb$yjpeyqWI
zbG&nFYMx@wcXD8Ll1y}`f1Z88dvj8BpjC95Uv`w+SyOqPbZ(Aoy>o1IlyYjHW9eaD
z_mY<9U|U~_w~n*XVU4=tR!-?>V^MvvWske)U|jNhdti*X>~L=CVqoiMW%QDgcdKyY
zS5fO}W%;qR;#N>wh_+{tykCpB+)+s7TUqL5WP^8)le5vAxYKTz!HBBMoVwIkfU>?~
zUzD`bT!^>iT34pP*nFbLYocYyURUB*P@TKhX`y0pnZbUDrQ}yodZET-jJT@9+UH(c
zow(EJUt6TW*z9p_n81>ryVX^HvSN+9xXs~Hf3awwU{QUqqsN`=YG_%8wNQPpywKyY
z$lTynPUBZkfS$i|sA{Omp{vZLeR`D0U|CLkuJDP7p2e82&8YB<i{MvJ^N^5rscdMV
zVeD&ZRe-X^+Q3Y9s%M{H>~3wDs(|#Bm!-&^^p%$2QA@GTs`R0u^_7&vY+&PIUgKh5
zWS(4hr){apqv2Cc$==1G#+Zb(d+>8}j=F_+s&4RicfQuSv(T)Lx`w&bw0*C2d#rQZ
zSW;*lp-=z-04Q`)PE!E%WF}+&$S?s46g~9kJ?9Ai3jWAL{ySd&$VUDOJND~y{>WQf
zJN~BvonQa}0PRUcK~xyiV_?7rIOS9)*xL3>h;u>(q*~22X3x;bGG&7bC>d+&TUqIA
z8nZGpFvzN@OzP@sFw@l3ch=HlXJAmCzF^iAn_g?v1Sc(xV4#5d%xMetY&tEf<Ft%4
zKq@BAnP<7ky1lj{M#CsVSX79iW$OINZGAQ77G{2q-r->)4E0TOyF2Pi%L?*?Tnu$0
z1sNo(N{TCs%JT}NbaV{uwG9~fcmoqNEpu|CV*}jnv~|-M7&urML(>gX<NZAyv`usk
zz%Jzy5K9VibM@6VX_SFFo}1sx!zU%XSwR}+VGbsq<P3R51_l6p#ySsQ8|1720000<
KMNUMnLSTYc!?|ey

literal 0
HcmV?d00001

diff --git a/images/disconnect.png b/images/disconnect.png
new file mode 100644
index 0000000000000000000000000000000000000000..299dea04ac59190c98764c189e82309ed654ea25
GIT binary patch
literal 883
zcmV-(1C0EMP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz-B3(aMMrQ<puX&>#_%pkl%~Y*D?^YZ
zJ%uVljwnElCqRlOK8GhjiZ@DpEl87~!0d~z;4x5|oxSNOK#e9ohor;pm$>Gm!|Y8>
zO-)TrDngDsP=cGg=YFKupup^&zUrB{=5LqIG*+IOug+9dR4z%Bj<MpMot-dDmp^Q-
zoxSNZR-RUc!(ClnUyH^$VWx0!aAc0hS9hXAb+ufF!EkVJaE!Ehd3l0@f@WrBI9{fJ
zrrDU7n2DUVi;IhtwdF~Bx;tg6H(aAxhr~Z_uxXUdGgF;5S)p~E(^iGULv^)0Xsl?H
z%!;nxfTr1QmdTj5+;f=6d7jTSQJXwnqOi#6MQN&>yXShH%YmiWj;`0E!00khn2WC6
zsKe!FkHkc1r)rVIK3<`Lq|$4V!*Q6)ScJTLpwN1r%!;enQhK&uiMwQszI>q2Wsbv=
zwBw_`;-S6acbmwTw&Zr4&Ss9lk+9f3Vx^wC;Cr6SZ<WP@rO``qtYC+{qQK~rvf8J?
z=UalihK7b)hrM!{%ZRGjtj6evs@X|#vV*13fuql;sHj(Kh?BF~rNHBnvfyKjz<;65
zqQB*ml9IQ#x4gW(j<DOVuC7&mxo45aTZX@hs@0CJ+FOObm$lr1qtIN*cf<ey08VsL
zPE!EJ1UU)D2_6Xq9<K>@1UXK2+5`z69-k8R`r1w&uLg8<_}D!6oH_P6_V*b2`k#FI
zJU$Zn1E1JDg`fMMPPe!E`UwUGPPe!EbOv<#KlF^;0002eNkl<Z7}H~5fC45lO*<c7
zcW)S<g)ywCZ}!|k514>pR7h-r|EzhQP`<oseR)PwamO4lm<p@5y3&-m!ge<>Pgc#E
z!9d%uA~m5*9mo}tQ<^-*mcdA)p(HDsoq>T*x^|+?G;=c(ORefeAz=mv(Y)5)siwyI
z7CI`D+-yJ{{4x10J%NUkx|Aijz$VH>_~$ft26Q)yLoHNDi}cHF>aUUFf$&{)tJ1>*
zlC$G^p$eR4OsLEZ4Gv=EfC|{poUW%Rz|77GbF;I9qbmav007NfGFJg2{!Rb@002ov
JPDHLkV1jisx1Rt2

literal 0
HcmV?d00001

diff --git a/images/tag-blue.png b/images/tag-blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..097624cf6bdeb078201abb55fd6d35b717c0e144
GIT binary patch
literal 665
zcmV;K0%rY*P)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzI8aPfMMrQ<v9Ynp$jGXys;Q}|uCA`B
zsi~@}s;jH3tE;QEwY9{=#J#<}z`(${xw*^B%dD)dudlDMv9Zd^%FD~k%F4>Jva-p^
z$;ZdX$jHdW#l^I=w7tE(wzjsx!NIz^y12Nwz`(%6!^6D1y#4+C+1c6P;NZ>8&9>ss
zx3{;v;{DFf&f?<Y*6jPx(9qJ-(&XgiiqHRo%>SC!|M&Ozm(~BB*Z+sj{k65V`~3aa
z*VoI-%e}q5!^6YJ$H&0Hz`41(*x1<f_xak|+TPyY+}zxZ%=h>E{kq}()z#I}(b3e@
z)V<^VmeKl_(*67U`}6bjh|d4$^ZSj^|I^dci_ibn?ECBM>xs|){QUfx)&KhX`i0H?
zo7Vs7>FJl$|CQAL=jZ2$&i?1~`{?NC<>lq-_5IW9`;Y-m{{R30By>_vQvekeI35)t
zAs-<X6%`c~74|sx&Gz{?J@(=|_B%T}JNEYW_7!@z-~a#s$4Nv%R2b7^@buRA($iMw
zXMlka6%a5`XMzdntLSK}si^2!b3+C6RMZ)S1N>Fg?06vp+A3<Ik|seuDlWD>U;%X%
zl}MAc2qP^OS9?B?fJnGXbaGNcl%bZ2vkezeKwKhDCEY0A%or%5>c9vTky1)g(KR<U
zGY<4nv9e$VipVJ@f<$72-7Hl#IY7q9D5t9E#)SGhscLdUtd>_WPzm#MSJh;PIagL%
zM@2=|0?ub(5ED{!MCLOv2ntxRF`xiu76=Uh|H>XAJX=7`00000NkvXXu0mjfm^ONs

literal 0
HcmV?d00001

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)<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_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_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_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<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_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)',
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)<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_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_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_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<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_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)',
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 @@
         &nbsp;
     </td>
 </tr>
+<tr>
+    <td class="label">
+        {$lang_about_changelog_v09}
+    </td>
+    <td class="value">
+        {$lang_about_changelog_v09_ext}
+    </td>
+</tr>
 <tr>
     <td class="label">
         {$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 @@
 <table class="title">
 <tr>
     <td class="header">
+        <img class="icon" src="images/asset.png" alt="" />
         {$lang_assets} ({$assets|@count} / {$assetcount})
     </td>
     <td align="right">
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 @@
 <table class="title">
 <tr>
     <td class="header">
+        <img class="icon" src="images/brick.png" alt="" />
         {$lang_assetclasses} ({$assetclasses|@count})
     </td>
     <td align="right">
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 @@
 <table  class="title">
 <tr>
     <td class="header">
+        <img class="icon" src="images/bricks.png" alt="" />
         {$lang_assetclassgroups} ({$assetclassgroups|@count})
     </td>
     <td align="right">
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 @@
 <table class="title">
 <tr>
     <td class="header">
+        <img class="icon" src="images/disconnect.png" alt="" />
         {$lang_cable} ({$cables|@count})
     </td>
     <td align="right">
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 @@
 <table class="title">
     <tr>
         <td class="header">
-            {$vlan_name}
+            {$cable->description}
         </td>
         <td align="right">
             <a href="cable.php?f=edit&id={$cable->id}"><img src="image.php?icon=edit" alt="{$lang_cable_edit}"></a>
@@ -29,7 +29,7 @@
 </tr>
 <tr>
     <td class="label">
-        {$lang_cable_type} XXX
+        {$lang_cable_type}
     </td>
     <td class="value">
         {$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}&nbsp;{$config_version}
     </td>
     <td align="right">
-        <input type="image" src="images/control_fastforward_blue.png" alt="{$lang_login}">
+        <input type="image" src="images/control_fastforward_blue.png" alt="{$lang_login}" title="{$lang_login}">
     </td>
 </tr>
 </table>
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 @@
 <table class="title">
 <tr>
     <td class="header">
+        <img class="icon" src="images/tag-blue.png" alt="" />
         {$lang_vlans} ({$vlans|@count})
     </td>
     <td align="right">