diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface index aa32053a2..44856fcc2 100644 --- a/config/rootfiles/common/web-user-interface +++ b/config/rootfiles/common/web-user-interface @@ -75,7 +75,6 @@ srv/web/ipfire/cgi-bin/qos.cgi srv/web/ipfire/cgi-bin/remote.cgi srv/web/ipfire/cgi-bin/routing.cgi #srv/web/ipfire/cgi-bin/samba.cgi -#srv/web/ipfire/cgi-bin/sambahlp.cgi srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/shutdown.cgi srv/web/ipfire/cgi-bin/speed.cgi diff --git a/config/rootfiles/packages/aarch64/samba b/config/rootfiles/packages/aarch64/samba index 3bef0733e..61e29fe8c 100644 --- a/config/rootfiles/packages/aarch64/samba +++ b/config/rootfiles/packages/aarch64/samba @@ -809,6 +809,5 @@ var/lib/samba/private var/lib/samba/winbindd_privileged var/nmbd srv/web/ipfire/cgi-bin/samba.cgi -srv/web/ipfire/cgi-bin/sambahlp.cgi var/ipfire/menu.d/EX-samba.menu usr/local/bin/sambactrl diff --git a/config/rootfiles/packages/armv5tel/samba b/config/rootfiles/packages/armv5tel/samba index f58d4fc2f..16e9dab11 100644 --- a/config/rootfiles/packages/armv5tel/samba +++ b/config/rootfiles/packages/armv5tel/samba @@ -809,6 +809,5 @@ var/lib/samba/private var/lib/samba/winbindd_privileged var/nmbd srv/web/ipfire/cgi-bin/samba.cgi -srv/web/ipfire/cgi-bin/sambahlp.cgi var/ipfire/menu.d/EX-samba.menu usr/local/bin/sambactrl diff --git a/config/rootfiles/packages/i586/samba b/config/rootfiles/packages/i586/samba index e74caeea0..dea9aa023 100644 --- a/config/rootfiles/packages/i586/samba +++ b/config/rootfiles/packages/i586/samba @@ -809,6 +809,5 @@ var/lib/samba/private var/lib/samba/winbindd_privileged var/nmbd srv/web/ipfire/cgi-bin/samba.cgi -srv/web/ipfire/cgi-bin/sambahlp.cgi var/ipfire/menu.d/EX-samba.menu usr/local/bin/sambactrl diff --git a/config/rootfiles/packages/x86_64/samba b/config/rootfiles/packages/x86_64/samba index c91252a30..31328a3a0 100644 --- a/config/rootfiles/packages/x86_64/samba +++ b/config/rootfiles/packages/x86_64/samba @@ -809,6 +809,5 @@ var/lib/samba/private var/lib/samba/winbindd_privileged var/nmbd srv/web/ipfire/cgi-bin/samba.cgi -srv/web/ipfire/cgi-bin/sambahlp.cgi var/ipfire/menu.d/EX-samba.menu usr/local/bin/sambactrl diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 31751ff4c..abf5e3295 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -859,8 +859,6 @@ if ($sambasettings{'ACTION'} eq 'shareadd' || $sambasettings{'ACTION'} eq 'optio -
$Lang::tr{'add share'}
$Lang::tr{'show share options'} -

@@ -880,7 +878,6 @@ if ($sambasettings{'ACTION'} eq 'sharechange' || $sambasettings{'ACTION'} eq 'op -
$Lang::tr{'edit share'}
$Lang::tr{'show share options'}

@@ -975,7 +972,6 @@ if ($sambasettings{'ACTION'} eq 'printeradd' || $sambasettings{'ACTION'} eq 'pri $Lang::tr{'add printer'} $Lang::tr{'show share options'} -
@@ -996,7 +992,6 @@ if ($sambasettings{'ACTION'} eq 'printerchange' || $sambasettings{'ACTION'} eq ' -
$Lang::tr{'edit printer'}
$Lang::tr{'show share options'}

diff --git a/html/cgi-bin/sambahlp.cgi b/html/cgi-bin/sambahlp.cgi deleted file mode 100644 index 0ed099ab1..000000000 --- a/html/cgi-bin/sambahlp.cgi +++ /dev/null @@ -1,94 +0,0 @@ -#!/usr/bin/perl -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# 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 . # -# # -############################################################################### - -use strict; -# enable only the following on debugging purpose -#use warnings; -#use CGI::Carp 'fatalsToBrowser'; - -require '/var/ipfire/general-functions.pl'; -require "${General::swroot}/lang.pl"; -require "${General::swroot}/header.pl"; - -&Header::showhttpheaders(); -&Header::openpagewithoutmenu('Samba', 1, ''); -&Header::openbigbox('100%', 'left', '', 'BigBox'); -&Header::openbox('100%', 'left', '', 'Sambahelp'); - - print < - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
$Lang::tr{'caption'}
$Lang::tr{'options'}$Lang::tr{'meaning'} / $Lang::tr{'exampel'}
comment$Lang::tr{'comment'}
comment = $Lang::tr{'my new share'}

path$Lang::tr{'path to directory'}
path = /tmp

writeable$Lang::tr{'directory writeable'}
writeable = yes

browseablesichtbar in Verzeichnisliste
browsable = yes

userBesitzer der Freigabe
user = samba

valid usersListe der Zugriffsberechtigten
valid users = samba, user1

write list$Lang::tr{'visible in browselist'}
write list = samba

hosts allow$Lang::tr{'host allow'}
hosts allow = localhost 192.168.1.1 192.168.2.0/24

hosts deny$Lang::tr{'host deny'}
hosts deny = 192.168.1.2 192.168.3.0/24

read list$Lang::tr{'read list'}
read list = user1

admin users$Lang::tr{'admin users'}
admin users = user1

invalid users$Lang::tr{'invalid users'}
invalid users = user2

force user$Lang::tr{'force user'}
force user = samba

directory mask$Lang::tr{'directory mask'}
directory mask = 0777

create maskU$Lang::tr{'create mask'}
create mask = 0777

guest ok$Lang::tr{'guest ok'}
guest ok = yes
-END -; - -&Header::closebox(); -&Header::closebigbox(); -&Header::closepage();