X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Fsamba.cgi;h=13a7a8254895562e1eba35813e7ed1694d807bc2;hp=e45ca26fd02752b12dd821dd10e0f1e110d24fb7;hb=4594712a1777fdd03b51491cf82bd06d45c16472;hpb=fa7be6597cdea9f028ca09c875eec3ecd193953a diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index e45ca26fd0..13a7a82548 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -1,15 +1,28 @@ #!/usr/bin/perl -# -# IPFire CGIs -# -# This code is distributed under the terms of the GPL -# -# (c) The IPFire Team +############################################################################### +# # +# 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'; +#use warnings; +#use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; @@ -20,59 +33,54 @@ my %cgisettings = (); my %checked = (); my %netsettings = (); my %ovpnsettings = (); +my %color = (); +my %mainsettings = (); my $message = ""; my $errormessage = ""; + my @Logs = qx(ls /var/log/samba/); -my $Log ='kein Log ausgewählt'; -my $defaultoption= "[Share]\npath = /var/samba/share1\ncomment = Share - Public Access\nbrowseable = yes\nwriteable = yes\ncreate mask = 0777\ndirectory mask = 0777\nguest ok = yes\npublic = yes\nforce user = samba"; +my $Log =$Lang::tr{'no log selected'}; + +my $Status = qx(/usr/local/bin/sambactrl smbstatus); +$Status=~s/\n/
/g; + my $userentry = ""; my @user = (); my @userline = (); -my @proto = (); +my $userfile = "${General::swroot}/samba/private/smbpasswd"; my %selected= () ; -my $userfile = "/var/ipfire/samba/private/smbpasswd"; + +my $defaultoption= "[Share]\npath = /var/ipfire/samba/share1\ncomment = Share - Public Access\nbrowseable = yes\nwriteable = yes\ncreate mask = 0777\ndirectory mask = 0777\npublic = yes\nforce user = samba"; +my $defaultprinter= "[Printer]\ncomment = Printer public\npath = /var/spool/cups\nprinting = sysvn\nprintcap = lpstat\npublic = yes\nwritable = no\nprintable = yes"; +my %printer = (); +my %shares = (); + &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'}."/include/colors.txt", \%color); + +my @ovpnnetwork = split(/\//,$ovpnsettings{'DOVPN_SUBNET'}); +my @ovpnip = split(/\./,$ovpnnetwork[0]); +$ovpnip[3]=$ovpnip[3]+1; ############################################################################################################################ ############################################# Samba Dienste fr Statusberprfung ########################################## -my %servicenames = ('SMB Daemon' => 'smbd','NetBIOS Nameserver' => 'nmbd','Winbind Daemon' => 'winbindd'); +my %servicenames = ('SMB Daemon' => 'smbd','NetBIOS Nameserver' => 'nmbd'); +#my %servicenames = ('SMB Daemon' => 'smbd','NetBIOS Nameserver' => 'nmbd','Winbind Daemon' => 'winbindd'); &Header::showhttpheaders(); -############################################################################################################################ -#################################### Initialisierung von Samba Sharess fr die Verarbeitung ################################ - -my @Zeilen= (); -my @Shares= (); -my $shareentry = ""; -my $shareconfigentry = ""; -my @shareconfigline = (); -my $shareoption = ''; -my @shares = (); -my @shareline = (); -my $sharefile = "/var/ipfire/samba/shares"; -my $EOF = qx(cat $sharefile | wc -l); -my $Status = qx(/usr/local/bin/sambactrl smbstatus); -$Status=~s/\n/
/g; - -@shares = `grep -n '^\\[' $sharefile`; -foreach $shareentry (@shares) - { - @shareline = split( /\:/, $shareentry ); - push(@Zeilen,$shareline[0]);push(@Shares,$shareline[1]); - } - ############################################################################################################################ #################################### Initialisierung von Samba Variablen fr global Settings ############################### $sambasettings{'WORKGRP'} = 'homeip.net'; $sambasettings{'NETBIOSNAME'} = 'IPFire'; -$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.0'; +$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.7'; $sambasettings{'INTERFACES'} = ''; $sambasettings{'SECURITY'} = 'share'; -$sambasettings{'OSLEVEL'} = '65'; +$sambasettings{'OSLEVEL'} = '33'; $sambasettings{'GREEN'} = 'on'; $sambasettings{'BLUE'} = 'off'; $sambasettings{'ORANGE'} = 'off'; @@ -80,14 +88,27 @@ $sambasettings{'VPN'} = 'off'; $sambasettings{'WINSSRV'} = ''; $sambasettings{'WINSSUPPORT'} = 'on'; $sambasettings{'REMOTEANNOUNCE'} = ''; +$sambasettings{'REMOTESYNC'} = ''; $sambasettings{'PASSWORDSYNC'} = 'off'; -$sambasettings{'OTHERINTERFACES'} = ''; +$sambasettings{'OTHERINTERFACES'} = '127.0.0.1'; $sambasettings{'GUESTACCOUNT'} = 'samba'; $sambasettings{'MAPTOGUEST'} = 'Never'; -$sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:10 winbind:2'; +$sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2'; +$sambasettings{'SYSLOGLEVEL'} = '1'; +$sambasettings{'SYSLOGONLY'} = 'on'; +$sambasettings{'DOSCHARSET'} = 'CP850'; +$sambasettings{'UNIXCHARSET'} = 'UTF8'; +$sambasettings{'DISPLAYCHARSET'} = 'CP850'; +$sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 SO_KEEPALIVE'; +$sambasettings{'WIDELINKS'} = 'on'; +$sambasettings{'UNIXEXTENSION'} = 'off'; ### Values that have to be initialized $sambasettings{'ACTION'} = ''; -$sambasettings{'LOGLINES'} = '15'; +### Samba CUPS Variablen +$sambasettings{'LOADPRINTERS'} = 'Yes'; +$sambasettings{'PRINTING'} = 'cups'; +$sambasettings{'PRINTCAPNAME'} = 'cups'; +my $LOGLINES = '50'; ################################################## Samba PDC Variablen ##################################################### @@ -102,21 +123,26 @@ my $PDCOPTIONS = `cat ${General::swroot}/samba/pdc`; &General::readhash("${General::swroot}/samba/settings", \%sambasettings); &Header::getcgihash(\%sambasettings); +sub refreshpage{&Header::openbox( 'Waiting', 1, "" );print "

$Lang::tr{'pagerefresh'}
";&Header::closebox();} + +if (($sambasettings{'WIDELINKS'} eq 'on') & ($sambasettings{'UNIXEXTENSION'} eq 'on')) + {$errormessage = "$errormessage
Don't enable 'Wide links' and 'Unix extension' at the same time"; } + &Header::openpage('Samba', 1, ''); &Header::openbigbox('100%', 'left', '', $errormessage); ############################################################################################################################ ############################################# Samba Rootskript aufrufe fr SU-Actions ####################################### -if ($sambasettings{'ACTION'} eq 'smbuserdisable'){system("/usr/local/bin/sambactrl smbuserdisable $sambasettings{'NAME'}");} -if ($sambasettings{'ACTION'} eq 'smbuserenable'){system("/usr/local/bin/sambactrl smbuserenable $sambasettings{'NAME'}");} -if ($sambasettings{'ACTION'} eq 'smbuseradd'){system("/usr/local/bin/sambactrl smbuseradd $sambasettings{'USERNAME'} $sambasettings{'PASSWORD'} $sambasettings{'GROUP'} $sambasettings{'SHELL'}");} -if ($sambasettings{'ACTION'} eq 'smbpcadd'){system("/usr/local/bin/sambactrl smbpcadd $sambasettings{'PCNAME'} $sambasettings{'GROUP'} $sambasettings{'SHELL'}");} -if ($sambasettings{'ACTION'} eq 'smbchangepw'){system("/usr/local/bin/sambactrl smbchangepw $sambasettings{'USERNAME'} $sambasettings{'PASSWORD'}");} -if ($sambasettings{'ACTION'} eq 'smbrestart'){system("/usr/local/bin/sambactrl smbrestart");} -if ($sambasettings{'ACTION'} eq 'smbstart'){system("/usr/local/bin/sambactrl smbstart");} -if ($sambasettings{'ACTION'} eq 'smbstop'){system("/usr/local/bin/sambactrl smbstop");} -if ($sambasettings{'ACTION'} eq 'smbstop'){system("/usr/local/bin/sambactrl smbstop");} +if ($sambasettings{'ACTION'} eq 'smbuserdisable'){system("/usr/local/bin/sambactrl smbuserdisable $sambasettings{'NAME'}");refreshpage();} +if ($sambasettings{'ACTION'} eq 'smbuserenable'){system("/usr/local/bin/sambactrl smbuserenable $sambasettings{'NAME'}");refreshpage();} +if ($sambasettings{'ACTION'} eq 'smbuseradd'){system("/usr/local/bin/sambactrl smbuseradd $sambasettings{'USERNAME'} $sambasettings{'PASSWORD'} $sambasettings{'GROUP'} $sambasettings{'SHELL'}");refreshpage();} +if ($sambasettings{'ACTION'} eq 'smbpcadd'){system("/usr/local/bin/sambactrl smbpcadd $sambasettings{'PCNAME'} $sambasettings{'GROUP'} $sambasettings{'SHELL'}");refreshpage();} +if ($sambasettings{'ACTION'} eq 'smbchangepw'){system("/usr/local/bin/sambactrl smbchangepw $sambasettings{'USERNAME'} $sambasettings{'PASSWORD'}");refreshpage();} +if ($sambasettings{'ACTION'} eq 'smbrestart'){system("/usr/local/bin/sambactrl smbrestart");refreshpage();} +if ($sambasettings{'ACTION'} eq 'smbstart'){system("/usr/local/bin/sambactrl smbstart");refreshpage();} +if ($sambasettings{'ACTION'} eq 'smbstop'){system("/usr/local/bin/sambactrl smbstop");refreshpage();} +if ($sambasettings{'ACTION'} eq 'smbreload'){system("/usr/local/bin/sambactrl smbreload");refreshpage();} if ($sambasettings{'ACTION'} eq 'globalresetyes') { system("/usr/local/bin/sambactrl smbglobalreset"); @@ -133,53 +159,49 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes') $sambasettings{'WINSSRV'} = ''; $sambasettings{'WINSSUPPORT'} = 'on'; $sambasettings{'REMOTEANNOUNCE'} = ''; + $sambasettings{'REMOTESYNC'} = ''; $sambasettings{'PASSWORDSYNC'} = 'off'; - $sambasettings{'OTHERINTERFACES'} = ''; + $sambasettings{'OTHERINTERFACES'} = '127.0.0.1'; $sambasettings{'GUESTACCOUNT'} = 'samba'; $sambasettings{'MAPTOGUEST'} = 'Never'; - $sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:10 winbind:2'; + $sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2'; + $sambasettings{'SYSLOGLEVEL'} = '1'; + $sambasettings{'SYSLOGONLY'} = 'on'; + $sambasettings{'DOSCHARSET'} = 'CP850'; + $sambasettings{'UNIXCHARSET'} = 'UTF8'; + $sambasettings{'DISPLAYCHARSET'} = 'CP850'; +### Samba CUPS Variablen + $sambasettings{'LOADPRINTERS'} = 'Yes'; + $sambasettings{'PRINTING'} = 'cups'; + $sambasettings{'PRINTCAPNAME'} = 'cups'; + $sambasettings{'PRINTERNAME'} = 'Printer'; ### Values that have to be initialized + $sambasettings{'WIDELINKS'} = 'on'; + $sambasettings{'UNIXEXTENSION'} = 'off'; $sambasettings{'ACTION'} = ''; $sambasettings{'LOCALMASTER'} = 'off'; $sambasettings{'DOMAINMASTER'} = 'off'; $sambasettings{'PREFERREDMASTER'} = 'off'; + $sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 SO_KEEPALIVE'; $PDCOPTIONS = `cat ${General::swroot}/samba/pdc`; + system("/usr/local/bin/sambactrl smbreload"); + refreshpage(); } -# smbsafeconf is directly called by the if clause - -if ($sambasettings{'ACTION'} eq 'sharesresetyes') -{ -system('/usr/local/bin/sambactrl smbsharesreset'); - @Zeilen = (); - @Shares = (); - $shareentry = ""; - @shares = (); - @shareline = (); - $EOF = qx(cat $sharefile | wc -l); - - @shares = `grep -n '^\\[' $sharefile`; - foreach $shareentry (@shares) - { - @shareline = split( /\:/, $shareentry ); - push(@Zeilen,$shareline[0]);push(@Shares,$shareline[1]); - } -} - ############################################################################################################################ ################################################ Sicherheitsabfrage für den Reset ########################################## if ($sambasettings{'ACTION'} eq 'globalreset') { print < - -

Globals zurück setzen? +
$Lang::tr{'resetglobals'}
- Yes + $Lang::tr{'yes'}
- No + $Lang::tr{'no'}
@@ -190,14 +212,14 @@ END if ($sambasettings{'ACTION'} eq 'sharesreset') { print < - -

Shares zurück setzen? +
$Lang::tr{'resetshares'}
- Yes + $Lang::tr{'yes'}
- No + $Lang::tr{'no'}
@@ -208,161 +230,7 @@ END ############################################################################################################################ ########################################### Samba Benutzer oder PC l�chen ################################################# -if ($sambasettings{'ACTION'} eq 'userdelete'){system("/usr/local/bin/sambactrl smbuserdelete $sambasettings{'NAME'}");} - -############################################################################################################################ -############################################## Samba Share neu anlegen ##################################################### - -if ($sambasettings{'ACTION'} eq 'smbshareadd') -{ - my $emptyline= ""; - open (FILE, ">>${General::swroot}/samba/shares") or die "Can't save the shares settings: $!"; - flock (FILE, 2); - -print FILE <${General::swroot}/samba/shares") or die "Can't delete the share settings: $!"; -flock (FILE, 2); -print FILE <${General::swroot}/samba/shares") or die "Can't delete the share settings: $!"; -flock (FILE, 2); -print FILE <${General::swroot}/samba/pdc") or die "Can't save the pdc settings: $!"; - flock (FILE, 2); - print FILE <>${General::swroot}/samba/global") or die "Can't save the global cups settings: $!"; + flock (FILE, 2); + print FILE <${General::swroot}/samba/pdc") or die "Can't save the pdc settings: $!"; + flock (FILE, 2); + chomp $sambasettings{'PDCOPTIONS'}; + $sambasettings{'PDCOPTIONS'} =~ s/\r\n/\n/gi; + $sambasettings{'PDCOPTIONS'} =~ s/^\n//gi; + $sambasettings{'PDCOPTIONS'} =~ s/^\r//gi; + $sambasettings{'PDCOPTIONS'} =~ s/^.\n//gi; + $sambasettings{'PDCOPTIONS'} =~ s/^.\r//gi; + print FILE <$errormessage\n"; - print " \n"; - &Header::closebox(); - } +if ($errormessage) + { + &Header::openbox('100%', 'left', $Lang::tr{'error messages'}); + print "$errormessage\n"; + print " \n"; + &Header::closebox(); + } ############################################################################################################################ ########################################## Aktivieren von Checkboxen und Dropdowns ######################################### +$checked{'SYSLOGONLY'}{'off'} = ''; +$checked{'SYSLOGONLY'}{'on'} = ''; +$checked{'SYSLOGONLY'}{$sambasettings{'SYSLOGONLY'}} = "checked='checked'"; $checked{'WINSSUPPORT'}{'off'} = ''; $checked{'WINSSUPPORT'}{'on'} = ''; $checked{'WINSSUPPORT'}{$sambasettings{'WINSSUPPORT'}} = "checked='checked'"; @@ -482,6 +394,12 @@ $checked{'DOMAINMASTER'}{$sambasettings{'DOMAINMASTER'}} = "checked='checked'"; $checked{'PREFERREDMASTER'}{'off'} = ''; $checked{'PREFERREDMASTER'}{'on'} = ''; $checked{'PREFERREDMASTER'}{$sambasettings{'PREFERREDMASTER'}} = "checked='checked'"; +$checked{'WIDELINKS'}{'off'} = ''; +$checked{'WIDELINKS'}{'on'} = ''; +$checked{'WIDELINKS'}{$sambasettings{'WIDELINKS'}} = "checked='checked'"; +$checked{'UNIXEXTENSION'}{'off'} = ''; +$checked{'UNIXEXTENSION'}{'on'} = ''; +$checked{'UNIXEXTENSION'}{$sambasettings{'UNIXEXTENSION'}} = "checked='checked'"; $checked{'GREEN'}{'off'} = ''; $checked{'GREEN'}{'on'} = ''; $checked{'GREEN'}{$sambasettings{'GREEN'}} = "checked='checked'"; @@ -501,20 +419,19 @@ $selected{'SECURITY'}{$sambasettings{'SECURITY'}} = "selected='selected'"; ############################################################################################################################ ################################### Aufbau der HTML Seite fr globale Sambaeinstellungen ################################### -&Header::openbox('100%', 'center', 'Samba'); +&Header::openbox('100%', 'center', $Lang::tr{'samba'}); print < - +
+
END ; if ( $message ne "" ) { - print " - +
$message"; + print "
$message"; } print <
Alle Dienste
$Lang::tr{'all services'}
END ; @@ -522,40 +439,38 @@ END my $key = ''; foreach $key (sort keys %servicenames) { - print ""; my $shortname = $servicenames{$key}; my $status = &isrunning($shortname); - print "$status"; - print <
- - - -END -; + print "$status"; } print < -
$key"; + print "
$key

- - - -
- - +
+ + + + +
+
+
- - - - - - - + + + + + + + + + + + OpenVpn - $ovpnip[0].$ovpnip[1].$ovpnip[2].$ovpnip[3]/$ovpnnetwork[1] @@ -583,32 +498,42 @@ END } print < + - - + + + + - - +END +; +# +print < - - - + + + + + END ; -if ($sambasettings{'WINSSUPPORT'} eq 'off') {print"";} +if ($sambasettings{'WINSSUPPORT'} eq 'off') {print"";} print < END ; @@ -616,11 +541,11 @@ END if ($sambasettings{'SECURITY'} eq 'user') { print < - - END ; @@ -630,26 +555,38 @@ if ($sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'o { print < - + END +; + } + + if ( -e "/var/ipfire/cups/enable") + { + print < + + + + +END ; } print < +

Basisoptionen
Workgroup:
NetBIOS-Name:
Server-String:
Log Level:
Interfaces:on / +
$Lang::tr{'basic options'}
$Lang::tr{'workgroup'}
$Lang::tr{'netbios name'}
$Lang::tr{'dos charset'}
$Lang::tr{'unix charset'}
$Lang::tr{'display charset'}
$Lang::tr{'server string'}
$Lang::tr{'log level'}
Sys$Lang::tr{'log level'}
Syslog onlyon / + off
$Lang::tr{'interfaces'}on / off | - OpenVpn - $ovpnsettings{'DDEVICE'}
on / off | $Lang::tr{'green'} - $netsettings{'GREEN_DEV'}
weitere
$Lang::tr{'more'}

Sicherheitsoptionen
Security:
Wide linkson / + off
Unix extensionon / + off

$Lang::tr{'security options'}
$Lang::tr{'security'}
Map to guest:
$Lang::tr{'map to guest'}
Unix Passwort Sync:on / - off
$Lang::tr{'unix password sync'}on / +# off

Netzwerkoptionen
OS Level:
Remote Announce:
$Lang::tr{'network options'}
$Lang::tr{'os level'}
$Lang::tr{'socket options'}
$Lang::tr{'remote announce'}
$Lang::tr{'remote browse sync'}
WINS-Server:
$Lang::tr{'wins server'}
WINS-Support:on / +
$Lang::tr{'wins support'}on / off
Local Master:on / +
$Lang::tr{'local master'}on / off
Domain Master:on / +
$Lang::tr{'domain master'}on / off
Preferred Master:on / +
$Lang::tr{'prefered master'}on / off

PDC Optionen
$Lang::tr{'pdc options'}


$Lang::tr{'printing options'}
$Lang::tr{'load printer'}
$Lang::tr{'printing'}
$Lang::tr{'printcap name'}
- + + +

-
-
-
END ; @@ -657,11 +594,11 @@ END if ($sambasettings{'ACTION'} eq 'globalcaption') { print < - - - - + + +

Legende:
Einstellungen speichern
Auf default zurueck setzen
$Lang::tr{'caption'}
$Lang::tr{'save settings'}
$Lang::tr{'restore settings'}
END ; @@ -676,19 +613,19 @@ if ($sambasettings{'SECURITY'} eq 'user') { if ($sambasettings{'DOMAINMASTER'} eq 'off') { - &Header::openbox('100%', 'center', 'accounting - user Security none PDC mode'); + &Header::openbox('100%', 'center', $Lang::tr{'accounting user nonpdc'}); } else { - &Header::openbox('100%', 'center', 'accounting - user Security PDC mode'); + &Header::openbox('100%', 'center', $Lang::tr{'accounting user pdc'}); } print < + +
- - - + + END ; @@ -698,26 +635,30 @@ END } else { - print ""; + print ""; } - print ""; + print ""; system('/usr/local/bin/sambactrl readsmbpasswd'); - open(FILE, "; close(FILE); system('/usr/local/bin/sambactrl locksmbpasswd'); + + my $lines = 0; + foreach $userentry (sort @user) { @userline = split( /\:/, $userentry ); - print "";} else {print "";} + print " + END ; @@ -751,11 +692,11 @@ END else { print < - + END ; @@ -768,10 +709,10 @@ END else { print <
+ END ; @@ -780,10 +721,10 @@ END if ($sambasettings{'DOMAINMASTER'} eq 'on' && $userline[0] =~ /\$/) { print <
+ END ; @@ -791,38 +732,39 @@ END else { print <
+ END ; } + $lines++; } print < +

Benutzerverwaltung
NamePasswort
$Lang::tr{'accounting'}
$Lang::tr{'username'}$Lang::tr{'password'}Typ$Lang::tr{'type'}StatusOptionen
$Lang::tr{'status'}$Lang::tr{'options'}
$userline[0]"; + if ($lines % 2) {print "
$userline[0]"; if ($userline[4] =~ /N/) { - print "nicht gesetzt"; + print "$Lang::tr{'not set'}"; } else { - print "gesetzt"; + print "$Lang::tr{'set'}"; } if ($sambasettings{'DOMAINMASTER'} eq 'off') @@ -728,22 +669,22 @@ END { if ($userline[0] =~ /\$/) { - print "PC"; + print "$Lang::tr{'pc'}"; } else { - print "User"; + print "$Lang::tr{'user'}"; } } if ($userline[4] =~ /D/) { print < -
+ $Lang::tr{'inactive'}
 - +
+ $Lang::tr{'active'}
 - + - + - +
- +
- - + END ; if ($sambasettings{'DOMAINMASTER'} eq 'on') { print <
+

+
- - + END ; } print <
+
- +
END @@ -831,17 +773,17 @@ END if ($sambasettings{'ACTION'} eq 'usercaption') { print < - - - - - - - - - - + + + + + + + + +

Legende:
Benutzer neu anlegen
Client Account neu anlegen
Benutzer loeschen
Client Account loeschen
Benutzer aktivieren
Benutzer deaktivieren
Passwort wechseln
Einstellungen speichern
$Lang::tr{'caption'}
$Lang::tr{'add user'}
$Lang::tr{'pc add'}
$Lang::tr{'delete user'}
$Lang::tr{'delete pc'}
$Lang::tr{'activate user'}
$Lang::tr{'deactivate user'}
$Lang::tr{'change passwords'}
$Lang::tr{'save config'}
END ; @@ -852,15 +794,14 @@ END my $username = "$sambasettings{'NAME'}"; my $password = 'samba'; print < -
+
+ - - - - + + + +

Passwort wechseln
Benutzername
Passwort
$Lang::tr{'change passwords'}
$Lang::tr{'username'}
$Lang::tr{'password'}
-
END @@ -876,17 +817,16 @@ END chomp $password; $password=~s/\s//g; print < -
+
+ - - - - - - + + + + + +

Benutzer neu anlegen
Benutzername
Passwort
Unix Gruppe
Unix Shell
$Lang::tr{'add user'}
$Lang::tr{'username'}
$Lang::tr{'password'}
$Lang::tr{'unix group'}
$Lang::tr{'unix shell'}
-
END @@ -899,16 +839,15 @@ END chomp $pcname; $pcname=~s/\s//g; print < -
+
+ - - - - - + + + + +

Client Account neu anlegen
Clientname
Unix Gruppe
Unix Shell
$Lang::tr{'pc add'}
$Lang::tr{'client'}
$Lang::tr{'unix group'}
$Lang::tr{'unix shell'}
-
END @@ -921,51 +860,61 @@ END ############################################################################################################################ ############################################### Verwalten von Freigaben #################################################### -&Header::openbox('100%', 'center', 'Shares'); +&Header::openbox('100%', 'center', $Lang::tr{'shares'}); + +my %shares = config("${General::swroot}/samba/shares"); + print < + +
- - + END ; -foreach $shareentry (sort @Shares) +my @Shares = keys(%shares); +my $lines = 0; + +foreach my $shareentry (sort @Shares) { + chomp $shareentry; + if ($lines % 2) {print "";} else {print "";} print < - + - END ; + $lines++; } print < +

Shareverwaltung -
Names des SharesOptionen
$Lang::tr{'manage shares'} +
$Lang::tr{'sharename'}$Lang::tr{'options'}
$shareentry
+
$shareentry - +
+
- +
- - - - + + +

+
- +
+
- +
+
- -
END ; @@ -973,14 +922,14 @@ END if ($sambasettings{'ACTION'} eq 'sharecaption') { print < - - - - - - - + + + + + +

Legende:
Share neu anlegen
Share bearbeiten
Einstellungen speichern
Shares zurueck setzen
Share loeschen
$Lang::tr{'caption'}
$Lang::tr{'add share'}
$Lang::tr{'edit share'}
$Lang::tr{'save config'}
$Lang::tr{'reset shares'}
$Lang::tr{'delete share'}
END ; @@ -989,21 +938,18 @@ END if ($sambasettings{'ACTION'} eq 'shareadd' || $sambasettings{'ACTION'} eq 'optioncaption' ) { print < +
- - + - - + +

neuen Share anlegen
$Lang::tr{'add share'}
Anzeige der Optionen fuer Shares
- - -
$Lang::tr{'show share options'} +
+
- +

-
END ; @@ -1011,105 +957,174 @@ END if ($sambasettings{'ACTION'} eq 'sharechange' || $sambasettings{'ACTION'} eq 'optioncaption2' ) { - my $sharename = "$sambasettings{'NAME'}"; - chomp $sharename; - $sharename=~s/\s//g; - - for(my $i = 0; $i <= $#Shares; $i++) - { - chomp $Shares[$i]; - $Shares[$i]=~s/\s//g; - if ( "$Shares[$i]" eq "$sharename" ) - { - my $Zeilenbegin = $Zeilen[$i+1]-2; - my $Zeilenende = $Zeilen[$i+1]-$Zeilen[$i]; - if ( $Zeilen[$i] eq $Zeilen[$#Shares] ) - {$Zeilenende = $EOF-$Zeilen[$#Shares]+1;$Zeilenbegin = $EOF-$Zeilen[$#Shares]; $shareoption = qx(tail -$Zeilenende $sharefile | head -$Zeilenbegin);} - else - {$shareoption = qx(head -$Zeilenbegin $sharefile | tail -$Zeilenende);} - } - } + my $shareoption = $shares{$sambasettings{'NAME'}}; print < +
- - + - - + +

Share bearbeiten
$Lang::tr{'edit share'}
Anzeige der Optionen fuer Shares
- -
$Lang::tr{'show share options'}
+
-

- +
END ; } -if ($sambasettings{'ACTION'} eq 'optioncaption' || $sambasettings{'ACTION'} eq 'optioncaption2') +if ($sambasettings{'ACTION'} eq 'sharesresetyes') + { + system('/usr/local/bin/sambactrl smbsharesreset'); + my $shares = config("${General::swroot}/samba/shares"); + system("/usr/local/bin/sambactrl smbreload"); + } +if ($sambasettings{'ACTION'} eq 'smbshareadd') + { + $shares{'xvx'}= "$sambasettings{'SHAREOPTION'}"; + save("shares"); + my $shares = config("${General::swroot}/samba/shares"); + } +if ($sambasettings{'ACTION'} eq 'smbsharedel') + { + delete $shares{$sambasettings{'NAME'}}; + save("shares"); + my %shares = config("${General::swroot}/samba/shares"); + } +if ($sambasettings{'ACTION'} eq 'smbsharechange') + { + $shares{$sambasettings{'NAME'}} = $sambasettings{'SHAREOPTION'}; + save("shares"); + my %shares = config("${General::swroot}/samba/shares"); + } + +&Header::closebox(); + +############################################################################################################################ +################################################ Verwalten von Druckern #################################################### + +my %printer = config("${General::swroot}/samba/printer"); + +if ( -e "/var/ipfire/cups/enable") +{ +&Header::openbox('100%', 'center', $Lang::tr{'printer'}); + +my @Printers = keys(%printer); +print < +
+ + +END +; +foreach my $printerentry (sort @Printers) + { + chomp $printerentry; + print < + + +END +; + } +print < +
+
$Lang::tr{'manage printers'} +
$Lang::tr{'printername'}$Lang::tr{'options'}
$printerentry
+ + + +
+ + + +
+ + + + +
+ + +
+ + +
+ + +
+END +; + +if ($sambasettings{'ACTION'} eq 'printeradd' || $sambasettings{'ACTION'} eq 'printercaption' ) { print < - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +

Legende:
OptionBedeutung / Beispiel
commentKommentar
comment = Mein neues Share

pathPfad zum Verzeichnis
path = /share/neu

writeableVerzeichnis schreibbar
writeable = yes

browseablesichtbar in Verzeichnisliste
browsable = yes

userBesitzer der Freigabe
user = samba

valid usersListe der Zugriffsberechtigten
valid users = samba, user1

write listListe der Schreibberechtigten
write list = samba

hosts allownur die angegebenen Hosts drfen das Share benutzen
hosts allow = localhost 192.168.1.1 192.168.2.0/24

hosts denyjede Maschine ausser diesen darf das Share benutzen
hosts deny = 192.168.1.2 192.168.3.0/24

read listListe der nur Leseberechtigten
read list = user1

admin usersListe der Benutzer mit SuperUser Rechten
admin users = user1

invalid usersListe der Benutzer denen der Zugriff verweigert wird
invalid users = user2

force userStandartbenutzer fuer alle Dateien
force user = samba

directory maskUNIX Verzeichnisberchtigung beim Erzeugen
directory mask = 0777

create maskUNIX Dateiberchtigung beim Erzeugen
create mask = 0777

guest okAnnonymer Zugriff
guest ok = yes
$Lang::tr{'add printer'}
$Lang::tr{'show share options'} +
+
+ + +
+
+ END ; -} + } + +if ($sambasettings{'ACTION'} eq 'printerchange' || $sambasettings{'ACTION'} eq 'printercaption2' ) + { + my $printeroption = $printer{$sambasettings{'NAME'}}; + print < + + + + + +
$Lang::tr{'edit printer'}
$Lang::tr{'show share options'}
+
+ + +
+ +
+END +; + } + +if ($sambasettings{'ACTION'} eq 'smbprinteradd') + { + $printer{'xvx'}= "$sambasettings{'PRINTEROPTION'}"; + save("printer"); + my %printer = config("${General::swroot}/samba/printer"); + } + +if ($sambasettings{'ACTION'} eq 'smbprinterdel') + { + delete $printer{$sambasettings{'NAME'}}; + save("printer"); + my %printer = config("${General::swroot}/samba/printer"); + } + +if ($sambasettings{'ACTION'} eq 'smbprinterchange') + { + $printer{$sambasettings{'NAME'}} = $sambasettings{'PRINTEROPTION'}; + save("printer"); + my %printer = config("${General::swroot}/samba/printer"); + } &Header::closebox(); +} ############################################################################################################################ ############################################### Anzeige des Sambastatus #################################################### @@ -1117,10 +1132,9 @@ END &Header::openbox('100%', 'center', 'Status'); print < +
- - +

Samba Status
$Lang::tr{'samba status'}
$Status
END @@ -1128,7 +1142,7 @@ END &Header::closebox(); ############################################################################################################################ -############################################### Anzeige des Sambastatus #################################################### +############################################### Anzeige der Sambalogs ###################################################### if ($sambasettings{'ACTION'} eq 'showlog') @@ -1137,14 +1151,14 @@ $Log = qx(tail -n $sambasettings{'LOGLINES'} /var/log/samba/$sambasettings{'LOG' $Log=~s/\n/
/g; } -&Header::openbox('100%', 'center', 'Logs'); +&Header::openbox('100%', 'center', $Lang::tr{'log'}); print < -
+ +
+ - - + - + + @@ -1162,7 +1176,6 @@ print < END ; - &Header::closebox(); &Header::closebigbox(); &Header::closepage(); @@ -1170,6 +1183,70 @@ END ############################################################################################################################ ############################################ Subfunktion fr Sambadienste ################################################### +sub config +{ +my $file = shift; +my @allarray = `grep -n '^\\[' $file`; +my @linesarray = (); +my @namearray = (); +my %hash = (); +my $options = (); +my $EOF = qx(cat $file | wc -l); +foreach my $allarrayentry (@allarray) + { + my @allarrayline = split( /\:/, $allarrayentry ); + push(@linesarray,$allarrayline[0]);$allarrayline[1]=~s/\[//g;$allarrayline[1]=~s/\]//g;push(@namearray,$allarrayline[1]); + } + for(my $i = 0; $i <= $#namearray; $i++) + { + chomp $namearray[$i]; + $namearray[$i]=~s/\[//g;$namearray[$i]=~s/\]//g; + if ( $i eq $#namearray ) + { + my $lineend = $EOF-$linesarray[$i]+1; + $options=qx(tail -$lineend $file); + } + else + { + my $linestart = $EOF-$linesarray[$i]+1; + my $lineend = $linesarray[$i+1]-$linesarray[$i]; + $options=qx(tail -$linestart $file | head -$lineend); + } + $hash{$namearray[$i]} = "$options"; + #print"
$namearray[$i]\n$options\n
"; # enable only for debuging + } +return(%hash); +} + +sub save +{ +my $smb = shift; +open (FILE, ">${General::swroot}/samba/$smb") or die "Can't $smb settings $!"; +flock (FILE, 2); + +if ( $smb eq 'printer') + {while (my ($name, $option) = each %printer){chomp $option;$option =~ s/\r\n/\n/gi;$option =~ s/^\n//gi;$option =~ s/^\r//gi;$option =~ s/^.\n//gi;$option =~ s/^.\r//gi;print FILE "$option\n";}} + +if ( $smb eq 'shares') + {while (my ($name, $option) = each %shares){chomp $option;$option =~ s/\r\n/\n/gi;$option =~ s/^\n//gi;$option =~ s/^\r//gi;$option =~ s/^.\n//gi;$option =~ s/^.\r//gi;print FILE "$option\n";} } + +close FILE; + +if ( -e "/var/ipfire/cups/enable") + { + if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdccups");} + else {system("/usr/local/bin/sambactrl smbsafeconfcups");} + } +else + { + if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdc");} + else{system("/usr/local/bin/sambactrl smbsafeconf");} + } + +system("/usr/local/bin/sambactrl smbreload"); +refreshpage(); +} + sub isrunning { my $cmd = $_[0]; @@ -1202,4 +1279,4 @@ sub isrunning } } return $status; - } \ No newline at end of file + }

Loganzeige
$Lang::tr{'log view'}

anzeige der letzen x Zeilen
$Lang::tr{'show last x lines'}

$Log