From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 29/54] samba: Remove move unused network variables
Date: Tue, 13 Oct 2020 16:07:47 +0000
Message-ID: <20201013160812.27754-29-michael.tremer@ipfire.org>
In-Reply-To: <20201013160812.27754-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6435769984706514935=="
List-Id: <development.lists.ipfire.org>

--===============6435769984706514935==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 html/cgi-bin/samba.cgi | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 536d7f1d6..5d0d95b38 100644
--- a/html/cgi-bin/samba.cgi
+++ b/html/cgi-bin/samba.cgi
@@ -32,7 +32,6 @@ my %sambasettings =3D ();
 my %cgisettings =3D ();
 my %checked =3D ();
 my %netsettings =3D ();
-my %ovpnsettings =3D ();
 my %color =3D ();
 my %mainsettings =3D ();
 my $message =3D "";
@@ -51,14 +50,9 @@ my $defaultoption=3D "[Share]\npath =3D /var/ipfire/samba/=
share1\ncomment =3D Share -
 my %shares =3D ();
=20
 &General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
-&General::readhash("${General::swroot}/ovpn/settings", \%ovpnsettings);
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
 &General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/i=
nclude/colors.txt", \%color);
=20
-my @ovpnnetwork =3D split(/\//,$ovpnsettings{'DOVPN_SUBNET'});
-my @ovpnip      =3D split(/\./,$ovpnnetwork[0]);
-$ovpnip[3]=3D$ovpnip[3]+1;
-
 ############################################################################=
################################################
 ############################################# Samba Dienste fr Statusberprfu=
ng ##########################################
=20
@@ -72,14 +66,9 @@ my %servicenames =3D ('SMB Daemon' =3D> 'smbd', 'NetBIOS N=
ameserver' =3D> 'nmbd', 'Win
 $sambasettings{'WORKGRP'} =3D 'homeip.net';
 $sambasettings{'INTERFACES'} =3D '';
 $sambasettings{'SECURITY'} =3D 'user';
-$sambasettings{'GREEN'} =3D 'on';
-$sambasettings{'BLUE'} =3D 'off';
-$sambasettings{'ORANGE'} =3D 'off';
-$sambasettings{'VPN'} =3D 'off';
 $sambasettings{'REMOTEANNOUNCE'} =3D '';
 $sambasettings{'REMOTESYNC'} =3D '';
 $sambasettings{'PASSWORDSYNC'} =3D 'off';
-$sambasettings{'OTHERINTERFACES'} =3D '127.0.0.1';
 $sambasettings{'GUESTACCOUNT'} =3D 'samba';
 $sambasettings{'MAPTOGUEST'} =3D 'Bad User';
 $sambasettings{'WIDELINKS'} =3D 'on';
@@ -128,13 +117,6 @@ if ($sambasettings{'ACTION'} eq 'userdelete'){system("/u=
sr/local/bin/sambactrl s
=20
 if ($sambasettings{'ACTION'} eq $Lang::tr{'save'})
 {
-$sambasettings{'INTERFACES'} =3D '';
-if ($sambasettings{'GREEN'} eq 'on'){ $sambasettings{'INTERFACES'} .=3D " $n=
etsettings{'GREEN_DEV'}";}
-if ($sambasettings{'BLUE'} eq 'on'){ $sambasettings{'INTERFACES'} .=3D " $ne=
tsettings{'BLUE_DEV'}";}
-if ($sambasettings{'ORANGE'} eq 'on'){ $sambasettings{'INTERFACES'} .=3D " $=
netsettings{'ORANGE_DEV'}";}
-if ($sambasettings{'VPN'} eq 'on'){$sambasettings{'INTERFACES'} .=3D " ";}
-if ($sambasettings{'OTHERINTERFACES'} ne ''){ $sambasettings{'INTERFACES'} .=
=3D " $sambasettings{'OTHERINTERFACES'}";}
-
 ############################################################################=
################################################
 ##################################### Schreiben settings und bersetzen fr sm=
b.conf #######################################
=20
@@ -235,18 +217,6 @@ $checked{'WIDELINKS'}{$sambasettings{'WIDELINKS'}} =3D "=
checked=3D'checked'";
 $checked{'UNIXEXTENSION'}{'off'} =3D '';
 $checked{'UNIXEXTENSION'}{'on'} =3D '';
 $checked{'UNIXEXTENSION'}{$sambasettings{'UNIXEXTENSION'}} =3D "checked=3D'c=
hecked'";
-$checked{'GREEN'}{'off'} =3D '';
-$checked{'GREEN'}{'on'} =3D '';
-$checked{'GREEN'}{$sambasettings{'GREEN'}} =3D "checked=3D'checked'";
-$checked{'BLUE'}{'off'} =3D '';
-$checked{'BLUE'}{'on'} =3D '';
-$checked{'BLUE'}{$sambasettings{'BLUE'}} =3D "checked=3D'checked'";
-$checked{'ORANGE'}{'off'} =3D '';
-$checked{'ORANGE'}{'on'} =3D '';
-$checked{'ORANGE'}{$sambasettings{'ORANGE'}} =3D "checked=3D'checked'";
-$checked{'VPN'}{'off'} =3D '';
-$checked{'VPN'}{'on'} =3D '';
-$checked{'VPN'}{$sambasettings{'VPN'}} =3D "checked=3D'checked'";
 $selected{'ENCRYPTION'}{'optional'} =3D '';
 $selected{'ENCRYPTION'}{'desired'} =3D '';
 $selected{'ENCRYPTION'}{'required'} =3D '';
--=20
2.20.1


--===============6435769984706514935==--