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);
$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'} = '';
&General::readhash("${General::swroot}/samba/settings", \%sambasettings);
&Header::getcgihash(\%sambasettings);
-if (($sambasettings{'WIDELINKS'} eq 'on') & ($sambasettings{'UNIXEXTENSION'} eq 'on'))
- {$errormessage = "$errormessage<br />Don't enable 'Wide links' and 'Unix extension' at the same time"; }
-
&Header::openpage('Samba', 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
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 ##################################################
realm = $mainsettings{'DOMAINNAME'}
passdb backend = smbpasswd
-wide links = $sambasettings{'WIDELINKS'}
-unix extensions = $sambasettings{'UNIXEXTENSION'}
-
map to guest = $sambasettings{'MAPTOGUEST'}
security = $sambasettings{'SECURITY'}
# Log to syslog
logging = syslog
+# Enable support for Apple
+vfs objects = catia fruit streams_xattr recycle
+
+# Enable following symlinks
+wide links = yes
+
END
;
############################################################################################################################
########################################## 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'} = '';
);
print <<END;
- <table class="tbl" width='95%' cellspacing='0'>
+ <table class="tbl" width='100%' cellspacing='0'>
<tr bgcolor='$color{'color20'}'>
<td colspan='2' align='left'><b>$Lang::tr{'all services'}</b></td>
</tr>
<br>
- <table width="95%">
+ <table width="100%">
<td width="33%" align="center">
<form method="POST" action="$ENV{'SCRIPT_NAME'}">
<input type="hidden" name="ACTION" value="smbstart">
<br>
<form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <table class="tbl" width='95%' cellspacing='0'>
+ <table class="tbl" width='100%' cellspacing='0'>
<tr bgcolor='$color{'color20'}'>
<td colspan='2' align='left'><b>$Lang::tr{'basic options'}</b></td>
</tr>
<td align='left'><br /></td>
<td></td>
</tr>
- <tr>
- <td align='left' width='40%'>Wide links</td>
- <td align='left'>
- on <input type='radio' name='WIDELINKS' value='on' $checked{'WIDELINKS'}{'on'} /> /
- <input type='radio' name='WIDELINKS' value='off' $checked{'WIDELINKS'}{'off'} /> off
- </td>
- </tr>
- <tr>
- <td align='left' width='40%'>Unix extension</td>
- <td align='left'>
- on <input type='radio' name='UNIXEXTENSION' value='on' $checked{'UNIXEXTENSION'}{'on'} /> /
- <input type='radio' name='UNIXEXTENSION' value='off' $checked{'UNIXEXTENSION'}{'off'} /> off
- </td>
- </tr>
- <tr>
- <td align='left'><br /></td>
- <td></td>
- </tr>
<tr bgcolor='$color{'color20'}'>
<td colspan='2' align='left'><b>$Lang::tr{'security options'}</b></td>
</tr>
{
&Header::openbox('100%', 'center', $Lang::tr{'user management'});
print <<END
- <a name="$Lang::tr{'accounting'}"></a>
<br />
- <table class="tbl" width='95%' cellspacing='0'>
+ <table class="tbl" width='100%' cellspacing='0'>
<tr><td colspan='6' align='left'></td></tr>
<tr><td bgcolor='$color{'color20'}' colspan='7' align='left'><b>$Lang::tr{'accounting'}</b></td></tr>
<tr><td align='left'><u>$Lang::tr{'username'}</u></td><td align='left'><u>$Lang::tr{'password'}</u></td>
print <<END
<br />
<form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
- <table width='95%' cellspacing='0'>
+ <table width='100%' cellspacing='0'>
<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'change passwords'}</b></td></tr>
<tr><td align='left'>$Lang::tr{'username'}</td><td><input type='text' name='USERNAME' value='$username' size='30' readonly='readonly' /></td></tr>
<tr><td align='left'>$Lang::tr{'password'}</td><td><input type='password' name='PASSWORD' value='$password' size='30' /></td></tr>
print <<END
<br />
<form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
- <table width='95%' cellspacing='0'>
+ <table width='100%' cellspacing='0'>
<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'add user'}</b></td></tr>
<tr><td align='left'>$Lang::tr{'username'}</td><td><input type='text' name='USERNAME' value='$username' size='30' /></td></tr>
<tr><td align='left'>$Lang::tr{'password'}</td><td><input type='password' name='PASSWORD' value='$password' size='30' /></td></tr>
print <<END
<br />
<form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
- <table width='95%' cellspacing='0'>
+ <table width='100%' cellspacing='0'>
<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'pc add'}</b></td></tr>
<tr><td align='left'>$Lang::tr{'client'}</td><td><input type='text' name='PCNAME' value='$pcname' size='30' /></td></tr>
<tr><td align='left'>$Lang::tr{'unix group'}</td><td><input type='text' name='GROUP' value='sambawks' size='30' /></td></tr>
<form method="POST" action="$ENV{'SCRIPT_NAME'}">
<input type="hidden" name="ACTION" value="join">
- <table class="tbl" width="95%">
+ <table class="tbl" width="100%">
<tbody>
<tr>
<td width="40%">
my %shares = config("${General::swroot}/samba/shares");
-
-print <<END
-<a name="$Lang::tr{'manage shares'}"></a>
-<br />
-<table class="tbl" width='95%' cellspacing='0' class='tbl'>
-<tr><th bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'manage shares'}</b></th></tr>
-<tr><th align='left'><u>$Lang::tr{'sharename'}</u></th><th colspan='2' width="5%" align='center'><u>$Lang::tr{'options'}</u></th></tr>
+print <<END;
+ <table class="tbl" width='100%' cellspacing='0'>
+ <tr>
+ <th align='left'>$Lang::tr{'sharename'}</th>
+ <th colspan='2' width="5%" align='center'></th>
+ </tr>
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 "<tr>";
- $col="bgcolor='$color{'color20'}'";
+ $col = "bgcolor='$color{'color20'}'";
} else {
- print "<tr>";
- $col="bgcolor='$color{'color22'}'";
- }
- print <<END
- <td align='left' $col>$shareentry</td>
- <td $col><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'>
- <input type='hidden' name='NAME' value='$shareentry' />
- <input type='hidden' name='ACTION' value='sharechange' />
- <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
- </form></td>
- <td $col><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'>
- <input type='hidden' name='NAME' value='$shareentry' />
- <input type='hidden' name='ACTION' value='smbsharedel' />
- <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' />
- </form></td></tr>
-END
-;
- $lines++;
+ $col = "bgcolor='$color{'color22'}'";
}
-print <<END
-</table>
-<br />
-<table width='10%' cellspacing='0'>
-<tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'>
- <input type='hidden' name='ACTION' value='shareadd' />
- <input type='image' alt='$Lang::tr{'add share'}' title='$Lang::tr{'add share'}' src='/images/list-add.png' />
- </form></td>
-</tr>
-</table>
+ print <<END;
+ <tr>
+ <td align='left' $col>$shareentry</td>
+ <td $col>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'>
+ <input type='hidden' name='NAME' value='$shareentry' />
+ <input type='hidden' name='ACTION' value='sharechange' />
+ <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
+ </form>
+ </td>
+ <td $col>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'>
+ <input type='hidden' name='NAME' value='$shareentry' />
+ <input type='hidden' name='ACTION' value='smbsharedel' />
+ <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' />
+ </form>
+ </td>
+ </tr>
END
;
+ $lines++;
+}
-if ($sambasettings{'ACTION'} eq 'shareadd')
- {
- print <<END
- <br />
- <table width='95%' cellspacing='0'>
- <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'add share'}</b></td></tr>
- <tr><td colspan='2' align='center'></td></tr>
- <form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'><tr><td colspan='2' align='center'><textarea name="SHAREOPTION" cols="50" rows="15" Wrap="off">$defaultoption</textarea></td></tr>
+print <<END;
</table>
- <br />
- <table width='10%' cellspacing='0'>
- <tr><td align='center'><input type='hidden' name='ACTION' value='smbshareadd' />
- <input type='image' alt='$Lang::tr{'add share'}' title='$Lang::tr{'add share'}' src='/images/media-floppy.png' /></td></tr></form>
+
+ <br>
+
+ <table width='100%' cellspacing='0'>
+ <tr>
+ <td align='center'>
+ <form method='POST' action='$ENV{'SCRIPT_NAME'}'>
+ <input type='hidden' name='ACTION' value='shareadd'>
+ <input type='submit' value='$Lang::tr{'add share'}'>
+ </form>
+ </td>
+ </tr>
</table>
END
-;
- }
-if ($sambasettings{'ACTION'} eq 'sharechange')
- {
+if ($sambasettings{'ACTION'} eq 'shareadd') {
+ print <<END;
+ <br />
+
+ <form method='POST' action='$ENV{'SCRIPT_NAME'}'>
+ <table width='100%' cellspacing='0'>
+ <tr bgcolor='$color{'color20'}'>
+ <td align='left'><b>$Lang::tr{'add share'}</b></td>
+ </tr>
+ <tr>
+ <td align='center'>
+ <textarea name="SHAREOPTION" cols="121" rows="15">$defaultoption</textarea>
+ </td>
+ </tr>
+ <tr>
+ <td align='center'>
+ <input type='hidden' name='ACTION' value='smbshareadd'>
+ <input type='submit' value='$Lang::tr{'save'}'>
+ </td>
+ </tr>
+ </table>
+ </form>
+END
+}
+
+if ($sambasettings{'ACTION'} eq 'sharechange') {
my $shareoption = $shares{$sambasettings{'NAME'}};
- print <<END
- <br />
- <table width='95%' cellspacing='0'>
- <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'edit share'}</b></td></tr>
- <tr><td colspan='2' align='center'></td></tr>
- <tr><td colspan='2' align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'><textarea name="SHAREOPTION" cols="50" rows="15" Wrap="off">$shareoption</textarea></td></tr>
- </table>
- <br />
- <table width='10%' cellspacing='0'>
- <tr><td align='center'><input type='hidden' name='NAME' value='$sambasettings{'NAME'}' />
- <input type='image' alt='$Lang::tr{'change share'}' title='$Lang::tr{'change share'}' src='/images/media-floppy.png' />
- <input type='hidden' name='ACTION' value='smbsharechange' /></form></td></tr>
- </table>
+
+ print <<END;
+ <br />
+
+ <form method='POST' action='$ENV{'SCRIPT_NAME'}'>
+ <input type='hidden' name='NAME' value='$sambasettings{'NAME'}'>
+
+ <table width='100%' cellspacing='0'>
+ <tr bgcolor='$color{'color20'}'>
+ <td align='left'><b>$Lang::tr{'edit share'}</b></td>
+ </tr>
+ <tr>
+ <td align='center'>
+ <textarea name="SHAREOPTION" cols="121" rows="15">$shareoption</textarea>
+ </td>
+ </tr>
+ <tr>
+ <td align='center'>
+ <input type='hidden' name='ACTION' value='smbsharechange'>
+ <input type='submit' value='$Lang::tr{'save'}'>
+ </td>
+ </tr>
+ </table>
+ </form>
END
-;
- }
+}
if ($sambasettings{'ACTION'} eq 'smbshareadd')
{
############################################################################################################################
############################################### Anzeige des Sambastatus ####################################################
-&Header::openbox('100%', 'center', 'Status');
+&Header::openbox('100%', 'left', $Lang::tr{'status'});
-print <<END
-<br />
-<table class="tbl" width='95%' cellspacing='0'>
-<tr><td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'samba status'}</b></td></tr>
-<tr><td align='left'><small><pre>$Status</pre></small></td></tr>
-</table>
+my $status = qx(/usr/local/bin/sambactrl smbstatus);
+$status = &Header::cleanhtml($status);
+
+print <<END;
+ <small>
+ <pre>$status</pre>
+ </small>
END
-;
+
&Header::closebox();
&Header::closebigbox();