X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Fsamba.cgi;h=696cb1b70d40f2782a850dc1e77949bd4daf9f33;hb=79bcc6f769eff10558db6a2c5d7247e5ced508bb;hp=0b29bbca640aaf56e16870713f908506eaac12e9;hpb=60124059ba409f7a6b94709940d59b583f9ad1cf;p=people%2Fpmueller%2Fipfire-2.x.git diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 0b29bbca64..696cb1b70d 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) 2005-2013 IPFire Team # +# # +# 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,53 @@ 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 =$Lang::tr{'no log selected'}; -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 $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', '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.x'; $sambasettings{'INTERFACES'} = ''; $sambasettings{'SECURITY'} = 'share'; -$sambasettings{'OSLEVEL'} = '65'; +$sambasettings{'OSLEVEL'} = '33'; $sambasettings{'GREEN'} = 'on'; $sambasettings{'BLUE'} = 'off'; $sambasettings{'ORANGE'} = 'off'; @@ -80,13 +87,27 @@ $sambasettings{'VPN'} = 'off'; $sambasettings{'WINSSRV'} = ''; $sambasettings{'WINSSUPPORT'} = 'on'; $sambasettings{'REMOTEANNOUNCE'} = ''; +$sambasettings{'REMOTESYNC'} = ''; $sambasettings{'PASSWORDSYNC'} = 'off'; $sambasettings{'OTHERINTERFACES'} = '127.0.0.1'; $sambasettings{'GUESTACCOUNT'} = 'samba'; -$sambasettings{'MAPTOGUEST'} = 'Never'; +$sambasettings{'MAPTOGUEST'} = 'Bad User'; $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=819200 SO_SNDBUF=819200 SO_KEEPALIVE'; +$sambasettings{'WIDELINKS'} = 'on'; +$sambasettings{'UNIXEXTENSION'} = 'off'; +$sambasettings{'SMB2'} = 'on'; ### Values that have to be initialized $sambasettings{'ACTION'} = ''; +### Samba CUPS Variablen +$sambasettings{'LOADPRINTERS'} = 'Yes'; +$sambasettings{'PRINTING'} = 'cups'; +$sambasettings{'PRINTCAPNAME'} = 'cups'; my $LOGLINES = '50'; ################################################## Samba PDC Variablen ##################################################### @@ -102,27 +123,32 @@ 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 'smbreload'){system("/usr/local/bin/sambactrl smbreload");} +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"); $sambasettings{'WORKGRP'} = 'homeip.net'; $sambasettings{'NETBIOSNAME'} = 'IPFire'; - $sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.0'; + $sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.x'; $sambasettings{'INTERFACES'} = ''; $sambasettings{'SECURITY'} = 'share'; $sambasettings{'OSLEVEL'} = '65'; @@ -133,39 +159,40 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes') $sambasettings{'WINSSRV'} = ''; $sambasettings{'WINSSUPPORT'} = 'on'; $sambasettings{'REMOTEANNOUNCE'} = ''; + $sambasettings{'REMOTESYNC'} = ''; $sambasettings{'PASSWORDSYNC'} = 'off'; $sambasettings{'OTHERINTERFACES'} = '127.0.0.1'; $sambasettings{'GUESTACCOUNT'} = 'samba'; - $sambasettings{'MAPTOGUEST'} = 'Never'; + $sambasettings{'MAPTOGUEST'} = 'Bad User'; $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=819200 SO_SNDBUF=819200 SO_KEEPALIVE'; + $sambasettings{'WIDELINKS'} = 'on'; + $sambasettings{'UNIXEXTENSION'} = 'off'; + $sambasettings{'SMB2'} = 'on'; $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]); - } - system("/usr/local/bin/sambactrl smbreload"); +if ($sambasettings{'ACTION'} eq 'join') { + $message .= &joindomain($sambasettings{'USERNAME'}, $sambasettings{'PASSWORD'}); } ############################################################################################################################ @@ -174,14 +201,14 @@ system('/usr/local/bin/sambactrl smbsharesreset'); if ($sambasettings{'ACTION'} eq 'globalreset') { print < - -

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

Shares zurück setzen? +
$Lang::tr{'resetshares'}
- Yes + $Lang::tr{'yes'}
- No + $Lang::tr{'no'}
@@ -210,164 +237,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(); + } + +if ($message) { + $message = &Header::cleanhtml($message); + $message =~ s/\n/
/g; + + &Header::openbox('100%', 'left', $Lang::tr{'messages'}); + print "$message\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'"; @@ -488,6 +422,15 @@ $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{'SMB2'}{'off'} = ''; +$checked{'SMB2'}{'on'} = ''; +$checked{'SMB2'}{$sambasettings{'SMB2'}} = "checked='checked'"; $checked{'GREEN'}{'off'} = ''; $checked{'GREEN'}{'on'} = ''; $checked{'GREEN'}{$sambasettings{'GREEN'}} = "checked='checked'"; @@ -501,6 +444,9 @@ $checked{'VPN'}{'off'} = ''; $checked{'VPN'}{'on'} = ''; $checked{'VPN'}{$sambasettings{'VPN'}} = "checked='checked'"; +if ( $sambasettings{'MAPTOGUEST'} eq "Never" ) { + $sambasettings{'MAPTOGUEST'}="Bad User"; +} $selected{'MAPTOGUEST'}{$sambasettings{'MAPTOGUEST'}} = "selected='selected'"; $selected{'SECURITY'}{$sambasettings{'SECURITY'}} = "selected='selected'"; @@ -509,18 +455,9 @@ $selected{'SECURITY'}{$sambasettings{'SECURITY'}} = "selected='selected'"; &Header::openbox('100%', 'center', $Lang::tr{'samba'}); print < - -END -; -if ( $message ne "" ) - { - print " - +
+
$message"; - } - -print <
$Lang::tr{'all services'}
+
$Lang::tr{'all services'}
END ; @@ -536,25 +473,30 @@ foreach $key (sort keys %servicenames) print < +
- - - + + +

-
- +
- - + + + + + + + OpenVpn - $ovpnip[0].$ovpnip[1].$ovpnip[2].$ovpnip[3]/$ovpnnetwork[1] @@ -584,7 +526,14 @@ END print < - + + + + + - +END +; +# +print < - + + + END ; if ($sambasettings{'WINSSUPPORT'} eq 'off') {print"";} @@ -629,26 +582,38 @@ if ($sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'o { print < - + END +; + } + + if ( -e "/var/ipfire/cups/enable") + { + print < + + + + +END ; } print < +

$Lang::tr{'basic options'}
$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'}
$Lang::tr{'more'}

$Lang::tr{'security options'}
Wide linkson / + off
Unix extensionon / + off
SMB2 $Lang::tr{'protocol'}on / + off

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

$Lang::tr{'network options'}
$Lang::tr{'network options'}
$Lang::tr{'os level'}
$Lang::tr{'socket options'}
$Lang::tr{'remote announce'}
$Lang::tr{'remote browse sync'}
$Lang::tr{'wins server'}

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


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

-
-
-
END ; @@ -656,8 +621,8 @@ END if ($sambasettings{'ACTION'} eq 'globalcaption') { print < - @@ -682,11 +647,11 @@ if ($sambasettings{'SECURITY'} eq 'user') &Header::openbox('100%', 'center', $Lang::tr{'accounting user pdc'}); } print < + +

$Lang::tr{'caption'}
$Lang::tr{'save settings'}
$Lang::tr{'restore settings'}
- - + END ; @@ -697,19 +662,23 @@ 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 ; @@ -750,11 +719,11 @@ END else { print < - + END ; @@ -767,10 +736,10 @@ END else { print <
+ END ; @@ -779,10 +748,10 @@ END if ($sambasettings{'DOMAINMASTER'} eq 'on' && $userline[0] =~ /\$/) { print <
+ END ; @@ -790,38 +759,39 @@ END else { print <
+ END ; } + $lines++; } print < +

$Lang::tr{'accounting'}
$Lang::tr{'accounting'}
$Lang::tr{'username'}$Lang::tr{'password'}Typ$Lang::tr{'type'}$Lang::tr{'interfaces'}$Lang::tr{'options'}
$Lang::tr{'status'}$Lang::tr{'options'}
$userline[0]"; + if ($lines % 2) {print "
$userline[0]"; if ($userline[4] =~ /N/) { print "$Lang::tr{'not set'}"; @@ -727,7 +696,7 @@ END { if ($userline[0] =~ /\$/) { - print "$Lang::tr{'interfaces'}"; + print "$Lang::tr{'pc'}"; } else { @@ -738,11 +707,11 @@ END if ($userline[4] =~ /D/) { print < -
+ $Lang::tr{'inactive'}
 - +
+ $Lang::tr{'active'}
 - + - + - +
- +
- - + END ; if ($sambasettings{'DOMAINMASTER'} eq 'on') { print <
+

+
- - + END ; } print <
+
- +
END @@ -830,15 +800,15 @@ END if ($sambasettings{'ACTION'} eq 'usercaption') { print < - - + - - + +

$Lang::tr{'caption'}
$Lang::tr{'add user'}
$Lang::tr{'add pc'}
$Lang::tr{'pc add'}
$Lang::tr{'delete user'}
$Lang::tr{'delete pc'}
$Lang::tr{'activate user'}
$Lang::tr{'deactivate user'}
$Lang::tr{'activate user'}
$Lang::tr{'deactivate user'}
$Lang::tr{'change passwords'}
$Lang::tr{'save config'}
@@ -851,15 +821,14 @@ END my $username = "$sambasettings{'NAME'}"; my $password = 'samba'; print < -
+
+ - - - + + +

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

$Lang::tr{'add user'}
$Lang::tr{'add user'}
$Lang::tr{'username'}
$Lang::tr{'password'}
$Lang::tr{'unix group'}
$Lang::tr{'unix shell'}
-
END @@ -898,16 +866,15 @@ END chomp $pcname; $pcname=~s/\s//g; print < -
+
+ - - + +

$Lang::tr{'pc add'}
$Lang::tr{'pc add'}
$Lang::tr{'client'}
$Lang::tr{'unix group'}
$Lang::tr{'unix shell'}
-
END @@ -917,54 +884,119 @@ END &Header::closebox(); } +if ($sambasettings{'SECURITY'} eq "ADS") { + &Header::openbox('100%', 'center', $Lang::tr{'samba join a domain'}); + + my $AD_DOMAINNAME = uc($mainsettings{'DOMAINNAME'}); + + print < + + + + + + + + + + + + + + + + + + + + + +
+ $Lang::tr{'domain'} + + $AD_DOMAINNAME +
+ $Lang::tr{'administrator username'} + + +
+ $Lang::tr{'administrator password'} + + +
+ +
+ +END + + &Header::closebox(); +} + ############################################################################################################################ ############################################### Verwalten von Freigaben #################################################### &Header::openbox('100%', 'center', $Lang::tr{'shares'}); +my %shares = config("${General::swroot}/samba/shares"); + + print < - - - + +
+

$Lang::tr{'manage shares'} -
$Lang::tr{'sharename'}$Lang::tr{'options'}
+ + END ; -foreach $shareentry (sort @Shares) +my @Shares = keys(%shares); +my $lines = 0; +my $col=""; +foreach my $shareentry (sort @Shares) { + chomp $shareentry; + if ($lines % 2) { + print ""; + $col="bgcolor='$color{'color20'}'"; + } else { + print ""; + $col="bgcolor='$color{'color22'}'"; + } print < - + - END ; + $lines++; } print < +
$Lang::tr{'manage shares'}
$Lang::tr{'sharename'}$Lang::tr{'options'}
$shareentry
+
$shareentry - +
+
- +
- - - - + + +

+
- +
+
- +
+
- -
END ; @@ -972,9 +1004,9 @@ END if ($sambasettings{'ACTION'} eq 'sharecaption') { print < - - + @@ -988,21 +1020,18 @@ END if ($sambasettings{'ACTION'} eq 'shareadd' || $sambasettings{'ACTION'} eq 'optioncaption' ) { print < +

Legende:
$Lang::tr{'caption'}
$Lang::tr{'add share'}
$Lang::tr{'edit share'}
$Lang::tr{'save config'}
- - + - - + +

$Lang::tr{'add share'}
$Lang::tr{'add share'}
$Lang::tr{'show share options'}
- - -
$Lang::tr{'show share options'} +
+
- +

-
END ; @@ -1010,105 +1039,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 < +
- - + - - + +

$Lang::tr{'edit share'}
$Lang::tr{'edit share'}
$Lang::tr{'show share options'}
- -
$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 < - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + +

$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
$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 #################################################### @@ -1116,10 +1214,9 @@ END &Header::openbox('100%', 'center', 'Status'); print < +
- - +

$Lang::tr{'samba status'}
$Lang::tr{'samba status'}
$Status
END @@ -1127,23 +1224,23 @@ END &Header::closebox(); ############################################################################################################################ -############################################### Anzeige des Sambastatus #################################################### +############################################### Anzeige der Sambalogs ###################################################### if ($sambasettings{'ACTION'} eq 'showlog') { -$Log = qx(tail -n $LOGLINES /var/log/samba/$sambasettings{'LOG'}); +$Log = qx(tail -n $sambasettings{'LOGLINES'} /var/log/samba/$sambasettings{'LOG'}); $Log=~s/\n/
/g; } &Header::openbox('100%', 'center', $Lang::tr{'log'}); print < -
+ +
+ - - + - + @@ -1161,7 +1258,6 @@ print < END ; - &Header::closebox(); &Header::closebigbox(); &Header::closepage(); @@ -1169,6 +1265,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]; @@ -1201,4 +1361,14 @@ sub isrunning } } return $status; - } \ No newline at end of file + } + +sub joindomain { + my $username = shift; + my $password = shift; + + my @options = ("/usr/local/bin/sambactrl", "join", $username, $password); + my $output = qx(@options); + + return $output; +}

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

$Lang::tr{'show last x lines'}

$Log