X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Fsamba.cgi;h=0ea3cc789c5655eccf0633a85355833894380316;hb=8936e2d21b57d96d86638208b427373bb16ac7ab;hp=59e39774703e1374604e90a7b0b00f5ff32bdc32;hpb=211105897dc5f494ceeb32c6a17ae66b661f2bdf;p=people%2Fpmueller%2Fipfire-2.x.git diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 59e3977470..0ea3cc789c 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -37,16 +37,13 @@ my %mainsettings = (); my $message = ""; my $errormessage = ""; -my $Status = qx(/usr/local/bin/sambactrl smbstatus); -$Status = &Header::cleanhtml($Status); - my $userentry = ""; my @user = (); my @userline = (); my $userfile = "${General::swroot}/samba/private/smbpasswd"; my %selected= () ; -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 $defaultoption= "[My Share]\npath = \ncomment = Share - Public Access\nbrowseable = yes\nwriteable = yes\ncreate mask = 0644\ndirectory mask = 0755\npublic = yes\nforce user = samba"; my %shares = (); &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); @@ -68,8 +65,6 @@ $sambasettings{'REMOTEANNOUNCE'} = ''; $sambasettings{'REMOTESYNC'} = ''; $sambasettings{'GUESTACCOUNT'} = 'samba'; $sambasettings{'MAPTOGUEST'} = 'Bad User'; -$sambasettings{'WIDELINKS'} = 'on'; -$sambasettings{'UNIXEXTENSION'} = 'off'; $sambasettings{'ENCRYPTION'} = 'optional'; ### Values that have to be initialized $sambasettings{'ACTION'} = ''; @@ -80,9 +75,6 @@ my $LOGLINES = '50'; &General::readhash("${General::swroot}/samba/settings", \%sambasettings); &Header::getcgihash(\%sambasettings); -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); @@ -118,9 +110,6 @@ if ($sambasettings{'ACTION'} eq $Lang::tr{'save'}) delete $sambasettings{'__CGI__'};delete $sambasettings{'x'};delete $sambasettings{'y'}; &General::writehash("${General::swroot}/samba/settings", \%sambasettings); -if ($sambasettings{'WIDELINKS'} eq 'on'){ $sambasettings{'WIDELINKS'} = "yes";} else { $sambasettings{'WIDELINKS'} = "no";} -if ($sambasettings{'UNIXEXTENSION'} eq 'on'){ $sambasettings{'UNIXEXTENSION'} = "yes";} else { $sambasettings{'UNIXEXTENSION'} = "no";} - ############################################################################################################################ ############################################# Schreiben der Samba globals ################################################## @@ -137,9 +126,6 @@ workgroup = $sambasettings{'WORKGRP'} realm = $mainsettings{'DOMAINNAME'} passdb backend = smbpasswd -wide links = $sambasettings{'WIDELINKS'} -unix extensions = $sambasettings{'UNIXEXTENSION'} - map to guest = $sambasettings{'MAPTOGUEST'} security = $sambasettings{'SECURITY'} @@ -159,6 +145,12 @@ winbind use default domain = yes # Log to syslog logging = syslog +# Enable support for Apple +vfs objects = catia fruit streams_xattr recycle + +# Enable following symlinks +wide links = yes + END ; @@ -201,12 +193,6 @@ if ($message) { ############################################################################################################################ ########################################## Aktivieren von Checkboxen und Dropdowns ######################################### -$checked{'WIDELINKS'}{'off'} = ''; -$checked{'WIDELINKS'}{'on'} = ''; -$checked{'WIDELINKS'}{$sambasettings{'WIDELINKS'}} = "checked='checked'"; -$checked{'UNIXEXTENSION'}{'off'} = ''; -$checked{'UNIXEXTENSION'}{'on'} = ''; -$checked{'UNIXEXTENSION'}{$sambasettings{'UNIXEXTENSION'}} = "checked='checked'"; $selected{'ENCRYPTION'}{'optional'} = ''; $selected{'ENCRYPTION'}{'desired'} = ''; $selected{'ENCRYPTION'}{'required'} = ''; @@ -230,7 +216,7 @@ my %servicenames = ( ); print < + @@ -252,7 +238,7 @@ print < -
$Lang::tr{'all services'}
+
@@ -278,7 +264,7 @@ print < - +
@@ -292,24 +278,6 @@ print <
 - - - - - - - - - - - - @@ -387,9 +355,8 @@ if ($sambasettings{'SECURITY'} eq 'user') { &Header::openbox('100%', 'center', $Lang::tr{'user management'}); print <
-
$Lang::tr{'basic options'}
Wide links - on / - off -
Unix extension - on / - off -

$Lang::tr{'security options'}
+
@@ -492,7 +459,7 @@ END print < -
$Lang::tr{'accounting'}
$Lang::tr{'username'}$Lang::tr{'password'}
+
@@ -515,7 +482,7 @@ END print < -
$Lang::tr{'change passwords'}
$Lang::tr{'username'}
$Lang::tr{'password'}
+
@@ -537,7 +504,7 @@ END print < -
$Lang::tr{'add user'}
$Lang::tr{'username'}
$Lang::tr{'password'}
+
@@ -562,7 +529,7 @@ if ($sambasettings{'SECURITY'} eq "ADS") { -
$Lang::tr{'pc add'}
$Lang::tr{'client'}
$Lang::tr{'unix group'}
+
+ + + END ; + $lines++; +} -if ($sambasettings{'ACTION'} eq 'shareadd') - { - print < -
@@ -609,96 +576,119 @@ END my %shares = config("${General::swroot}/samba/shares"); - -print < -
- - - +print < + + + + END -; -my @Shares = keys(%shares); +my @shares = keys(%shares); my $lines = 0; my $col=""; -foreach my $shareentry (sort @Shares) - { +foreach my $shareentry (sort @shares) { chomp $shareentry; + if ($lines % 2) { - print ""; - $col="bgcolor='$color{'color20'}'"; + $col = "bgcolor='$color{'color20'}'"; } else { - print ""; - $col="bgcolor='$color{'color22'}'"; - } - print <$shareentry - - -END -; - $lines++; + $col = "bgcolor='$color{'color22'}'"; } -print < -
-
$Lang::tr{'manage shares'}
$Lang::tr{'sharename'}$Lang::tr{'options'}
$Lang::tr{'sharename'}
- - - -
- - - -
- - -
- - -
+ print < + 		$shareentry +
+ + + +
+ 		+
+ + + +
+
- - - +print < -
-
$Lang::tr{'add share'}
- + +
+ +
-
+ + +
+
+ + +
+
END -; - } -if ($sambasettings{'ACTION'} eq 'sharechange') - { +if ($sambasettings{'ACTION'} eq 'shareadd') { + print < + +
+ + + + + + + + + + +
$Lang::tr{'add share'}
+ +
+ + +
+
+END +} + +if ($sambasettings{'ACTION'} eq 'sharechange') { my $shareoption = $shares{$sambasettings{'NAME'}}; - print < - - - - -
$Lang::tr{'edit share'}
-
- - -
- -
+ + print < + +
+ + + + + + + + + + + + +
$Lang::tr{'edit share'}
+ +
+ + +
+
END -; - } +} if ($sambasettings{'ACTION'} eq 'smbshareadd') { @@ -724,16 +714,17 @@ if ($sambasettings{'ACTION'} eq 'smbsharechange') ############################################################################################################################ ############################################### Anzeige des Sambastatus #################################################### -&Header::openbox('100%', 'center', 'Status'); +&Header::openbox('100%', 'left', $Lang::tr{'status'}); -print < - - - -
$Lang::tr{'samba status'}
$Status
+my $status = qx(/usr/local/bin/sambactrl smbstatus); +$status = &Header::cleanhtml($status); + +print < + 
$status
+ END -; + &Header::closebox(); &Header::closebigbox();