my %cgisettings = ();
my %checked = ();
my %netsettings = ();
-my %ovpnsettings = ();
my %color = ();
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);
-&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');
-
&Header::showhttpheaders();
############################################################################################################################
$sambasettings{'WORKGRP'} = 'homeip.net';
$sambasettings{'INTERFACES'} = '';
$sambasettings{'SECURITY'} = 'user';
-$sambasettings{'GREEN'} = 'on';
-$sambasettings{'BLUE'} = 'off';
-$sambasettings{'ORANGE'} = 'off';
-$sambasettings{'VPN'} = 'off';
$sambasettings{'REMOTEANNOUNCE'} = '';
$sambasettings{'REMOTESYNC'} = '';
-$sambasettings{'PASSWORDSYNC'} = 'off';
-$sambasettings{'OTHERINTERFACES'} = '127.0.0.1';
$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);
-sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' content='1;'>" );print "<center><img src='/images/clock.gif' alt='' /><br/><font color='red'>$Lang::tr{'pagerefresh'}</font></center>";&Header::closebox();}
-
-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);
############################################################################################################################
############################################# Samba Rootskript aufrufe fr SU-Actions #######################################
-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 '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 'join') {
$message .= &joindomain($sambasettings{'USERNAME'}, $sambasettings{'PASSWORD'});
}
############################################################################################################################
########################################### Samba Benutzer oder PC l�chen #################################################
-if ($sambasettings{'ACTION'} eq 'userdelete'){system("/usr/local/bin/sambactrl smbuserdelete $sambasettings{'NAME'}");refreshpage();}
+if ($sambasettings{'ACTION'} eq 'userdelete'){system("/usr/local/bin/sambactrl smbuserdelete $sambasettings{'NAME'}");}
############################################################################################################################
##################################### Umsetzen der Werte von Checkboxen und Dropdowns ######################################
if ($sambasettings{'ACTION'} eq $Lang::tr{'save'})
{
-$sambasettings{'INTERFACES'} = '';
-if ($sambasettings{'GREEN'} eq 'on'){ $sambasettings{'INTERFACES'} .= " $netsettings{'GREEN_DEV'}";}
-if ($sambasettings{'BLUE'} eq 'on'){ $sambasettings{'INTERFACES'} .= " $netsettings{'BLUE_DEV'}";}
-if ($sambasettings{'ORANGE'} eq 'on'){ $sambasettings{'INTERFACES'} .= " $netsettings{'ORANGE_DEV'}";}
-if ($sambasettings{'VPN'} eq 'on'){$sambasettings{'INTERFACES'} .= " ";}
-if ($sambasettings{'OTHERINTERFACES'} ne ''){ $sambasettings{'INTERFACES'} .= " $sambasettings{'OTHERINTERFACES'}";}
-
############################################################################################################################
##################################### Schreiben settings und bersetzen fr smb.conf #######################################
delete $sambasettings{'__CGI__'};delete $sambasettings{'x'};delete $sambasettings{'y'};
&General::writehash("${General::swroot}/samba/settings", \%sambasettings);
-if ($sambasettings{'PASSWORDSYNC'} eq 'on'){ $sambasettings{'PASSWORDSYNC'} = "true";} else { $sambasettings{'PASSWORDSYNC'} = "false";}
-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'}
guest account = $sambasettings{'GUESTACCOUNT'}
-unix password sync = $sambasettings{'PASSWORDSYNC'}
+unix password sync = no
bind interfaces only = true
interfaces = green0 blue0 127.0.0.0/8
# Log to syslog
logging = syslog
+# Enable support for Apple
+vfs objects = catia fruit streams_xattr recycle
+
+# Enable following symlinks
+wide links = yes
+
END
;
system("/usr/local/bin/sambactrl smbsafeconf");
system("/usr/local/bin/sambactrl smbreload");
-refreshpage();
}
&General::readhash("${General::swroot}/samba/settings", \%sambasettings);
############################################################################################################################
########################################## Aktivieren von Checkboxen und Dropdowns #########################################
-$checked{'PASSWORDSYNC'}{'off'} = '';
-$checked{'PASSWORDSYNC'}{'on'} = '';
-$checked{'PASSWORDSYNC'}{$sambasettings{'PASSWORDSYNC'}} = "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'";
-$checked{'BLUE'}{'off'} = '';
-$checked{'BLUE'}{'on'} = '';
-$checked{'BLUE'}{$sambasettings{'BLUE'}} = "checked='checked'";
-$checked{'ORANGE'}{'off'} = '';
-$checked{'ORANGE'}{'on'} = '';
-$checked{'ORANGE'}{$sambasettings{'ORANGE'}} = "checked='checked'";
-$checked{'VPN'}{'off'} = '';
-$checked{'VPN'}{'on'} = '';
-$checked{'VPN'}{$sambasettings{'VPN'}} = "checked='checked'";
$selected{'ENCRYPTION'}{'optional'} = '';
$selected{'ENCRYPTION'}{'desired'} = '';
$selected{'ENCRYPTION'}{'required'} = '';
################################### Aufbau der HTML Seite fr globale Sambaeinstellungen ###################################
&Header::openbox('100%', 'center', $Lang::tr{'samba'});
-print <<END
-<br />
-<table width='95%' cellspacing='0'>
-<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'all services'}</b></td></tr>
-</table><table width='95%' cellspacing='0'>
+
+my %servicenames = (
+ "nmbd" => $Lang::tr{'netbios nameserver daemon'},
+ "smbd" => $Lang::tr{'smb daemon'},
+ "winbindd" => $Lang::tr{'winbind daemon'},
+);
+
+print <<END;
+ <table class="tbl" width='100%' cellspacing='0'>
+ <tr bgcolor='$color{'color20'}'>
+ <td colspan='2' align='left'><b>$Lang::tr{'all services'}</b></td>
+ </tr>
END
-;
-my $key = '';
-foreach $key (sort keys %servicenames)
- {
- print "<tr><td align='left' width='40%'>$key</td>";
- my $shortname = $servicenames{$key};
- my $status = &isrunning($shortname);
- print "$status</tr>";
- }
+foreach my $service (sort keys %servicenames) {
+ my $status = &isrunning($service);
-print <<END
-</table>
-<br />
-<table width='95%' cellspacing='0'>
-<tr><td align='left' width='40%' />
-<td align='center' ><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='smbstart' /><input type='image' alt='$Lang::tr{'smbstart'}' title='$Lang::tr{'smbstart'}' src='/images/go-up.png' /></form></td>
-<td align='center' ><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='smbstop' /><input type='image' alt='$Lang::tr{'smbstop'}' title='$Lang::tr{'smbstop'}' src='/images/go-down.png' /></form></td>
-<td align='center' ><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='smbrestart' /><input type='image' alt='$Lang::tr{'smbrestart'}' title='$Lang::tr{'smbrestart'}' src='/images/view-refresh.png' /></form></td></tr>
-</table>
-<br />
-<form method='post' action='$ENV{'SCRIPT_NAME'}'>
-<table width='95%' cellspacing='0'>
-<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'basic options'}</b></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'workgroup'}</td><td align='left'><input type='text' name='WORKGRP' value='$sambasettings{'WORKGRP'}' size="30" /></td></tr>
-<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>
-<tr><td align='left' width='40%'>$Lang::tr{'security'}</td><td align='left'><select name='SECURITY' style="width: 165px">
- <option value='user' $selected{'SECURITY'}{'user'}>User</option>
- <option value='ADS' $selected{'SECURITY'}{'ADS'}>ADS</option>
- <option value='server' $selected{'SECURITY'}{'server'}>Server</option>
- </select></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'encryption'}</td><td align='left'><select name='ENCRYPTION' style="width: 165px">
- <option value='optional' $selected{'ENCRYPTION'}{'optional'}>$Lang::tr{'optional'}</option>
- <option value='desired' $selected{'ENCRYPTION'}{'desired'}>$Lang::tr{'desired'}</option>
- <option value='required' $selected{'ENCRYPTION'}{'required'}>$Lang::tr{'required'}</option>
- </select></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'map to guest'}</td><td align='left'><select name='MAPTOGUEST' style="width: 165px">
- <option value='Bad User' $selected{'MAPTOGUEST'}{'Bad User'}>Bad User</option>
- <option value='Bad Password' $selected{'MAPTOGUEST'}{'Bad Password'}>Bad Password</option>
- </select></td></tr>
+ print <<END;
+ <tr>
+ <td align='left' width='40%'>$servicenames{$service}</td>
+ $status
+ </tr>
END
-;
-#<tr><td align='left' width='40%'>$Lang::tr{'unix password sync'}</td><td align='left'>on <input type='radio' name='PASSWORDSYNC' value='on' $checked{'PASSWORDSYNC'}{'on'} />/
-# <input type='radio' name='PASSWORDSYNC' value='off' $checked{'PASSWORDSYNC'}{'off'} /> off</td></tr>
+}
+
print <<END
-<tr><td align='left'><br /></td><td /></tr>
-<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'network options'}</b></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'remote announce'}</td><td align='left'><input type='text' name='REMOTEANNOUNCE' value='$sambasettings{'REMOTEANNOUNCE'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'remote browse sync'}</td><td align='left'><input type='text' name='REMOTESYNC' value='$sambasettings{'REMOTESYNC'}' size="30" /></td></tr>
-</table>
-<br />
-<table width='10%' cellspacing='0'>
-<tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <input type='hidden' name='ACTION' value=$Lang::tr{'save'} />
- <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' /></form></td>
-<td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <input type='hidden' name='ACTION' value='globalcaption' />
- <input type='image' alt='$Lang::tr{'caption'}' title='$Lang::tr{'caption'}' src='/images/help-browser.png' /></form></td></tr>
-</table>
-END
-;
+ </table>
-if ($sambasettings{'ACTION'} eq 'globalcaption')
- {
- print <<END
- <br />
- <table width='95%' cellspacing='0'>
- <tr><td align='center' colspan='2'><b>$Lang::tr{'caption'}</b></td></tr>
- <tr><td align='right' width='33%'><img src='/images/media-floppy.png' /></td><td align='left'>$Lang::tr{'save settings'}</td></tr>
- <tr><td align='right' width='33%'><img src='/images/reload.gif' /></td><td align='left'>$Lang::tr{'restore settings'}</td></tr>
+ <br>
+
+ <table width="100%">
+ <td width="33%" align="center">
+ <form method="POST" action="$ENV{'SCRIPT_NAME'}">
+ <input type="hidden" name="ACTION" value="smbstart">
+ <input type="submit" value="$Lang::tr{'enable'}">
+ </form>
+ </td>
+
+ <td width="33%" align="center">
+ <form method="POST" action="$ENV{'SCRIPT_NAME'}">
+ <input type="hidden" name="ACTION" value="smbstop">
+ <input type="submit" value="$Lang::tr{'disable'}">
+ </form>
+ </td>
+
+ <td width="33%" align="center">
+ <form method="POST" action="$ENV{'SCRIPT_NAME'}">
+ <input type="hidden" name="ACTION" value="smbrestart">
+ <input type="submit" value="$Lang::tr{'restart'}">
+ </form>
+ </td>
</table>
+
+ <br>
+
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <table class="tbl" width='100%' cellspacing='0'>
+ <tr bgcolor='$color{'color20'}'>
+ <td colspan='2' align='left'><b>$Lang::tr{'basic options'}</b></td>
+ </tr>
+ <tr>
+ <td align='left' width='40%'>$Lang::tr{'workgroup'}</td>
+ <td align='left'>
+ <input type='text' name='WORKGRP' value='$sambasettings{'WORKGRP'}' size="30" />
+ </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>
+ <tr>
+ <td align='left' width='40%'>$Lang::tr{'security'}</td>
+ <td align='left'>
+ <select name='SECURITY' style="width: 165px">
+ <option value='user' $selected{'SECURITY'}{'user'}>User</option>
+ <option value='ADS' $selected{'SECURITY'}{'ADS'}>ADS</option>
+ <option value='server' $selected{'SECURITY'}{'server'}>Server</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td align='left' width='40%'>$Lang::tr{'encryption'}</td>
+ <td align='left'>
+ <select name='ENCRYPTION' style="width: 165px">
+ <option value='optional' $selected{'ENCRYPTION'}{'optional'}>$Lang::tr{'optional'}</option>
+ <option value='desired' $selected{'ENCRYPTION'}{'desired'}>$Lang::tr{'desired'}</option>
+ <option value='required' $selected{'ENCRYPTION'}{'required'}>$Lang::tr{'required'}</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td align='left' width='40%'>$Lang::tr{'map to guest'}</td>
+ <td align='left'>
+ <select name='MAPTOGUEST' style="width: 165px">
+ <option value='Bad User' $selected{'MAPTOGUEST'}{'Bad User'}>Bad User</option>
+ <option value='Bad Password' $selected{'MAPTOGUEST'}{'Bad Password'}>Bad Password</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td align='left'><br /></td>
+ <td></td>
+ </tr>
+ <tr bgcolor='$color{'color20'}'>
+ <td colspan='2' align='left'><b>$Lang::tr{'network options'}</b></td>
+ </tr>
+ <tr>
+ <td align='left' width='40%'>$Lang::tr{'remote announce'}</td>
+ <td align='left'>
+ <input type='text' name='REMOTEANNOUNCE' value='$sambasettings{'REMOTEANNOUNCE'}' size="30" />
+ </td>
+ </tr>
+ <tr>
+ <td align='left' width='40%'>$Lang::tr{'remote browse sync'}</td>
+ <td align='left'>
+ <input type='text' name='REMOTESYNC' value='$sambasettings{'REMOTESYNC'}' size="30" />
+ </td>
+ </tr>
+ </table>
+
+ <br>
+
+ <table width='100%' cellspacing='0'>
+ <tr>
+ <td align='center'>
+ <form method='POST' action='$ENV{'SCRIPT_NAME'}'>
+ <input type='hidden' name='ACTION' value="$Lang::tr{'save'}">
+ <input type='submit' value="$Lang::tr{'save'}">
+ </form>
+ </td>
+ </tr>
+ </table>
END
;
- }
&Header::closebox();
{
&Header::openbox('100%', 'center', $Lang::tr{'user management'});
print <<END
- <a name="$Lang::tr{'accounting'}"></a>
<br />
- <table 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>
<tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
<input type='hidden' name='ACTION' value='useradd' />
<input type='image' alt='$Lang::tr{'add user'}' title='$Lang::tr{'add user'}' src='/images/user-option-add.png' /></form></td>
-END
-;
-
- print <<END
- <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
- <input type='hidden' name='ACTION' value='usercaption' />
- <input type='image' alt='$Lang::tr{'caption'}' title='$Lang::tr{'caption'}' src='/images/help-browser.png' /></form>
- </td></tr>
+ </tr>
</table>
END
;
- if ($sambasettings{'ACTION'} eq 'usercaption')
- {
- print <<END
- <br />
- <table width='95%' cellspacing='0'>
- <tr><td align='center' colspan='2'><b>$Lang::tr{'caption'}</b></td></tr>
- <tr><td align='right' width='33%'><img src='/images/user-option-add.png' /></td><td align='left'>$Lang::tr{'add user'}</td></tr>
- <tr><td align='right' width='33%'><img src='/images/network.png' /></td><td align='left'>$Lang::tr{'pc add'}</td></tr>
- <tr><td align='right' width='33%'><img src='/images/user-option-remove.png' /></td><td align='left'>$Lang::tr{'delete user'}</td></tr>
- <tr><td align='right' width='33%'><img src='/images/network-error.png' /></td><td align='left'>$Lang::tr{'delete pc'}</td></tr>
- <tr><td align='right' width='33%'><img src='/images/off.gif' /></td><td align='left'>$Lang::tr{'activate user'}</td></tr>
- <tr><td align='right' width='33%'><img src='/images/on.gif' /></td><td align='left'>$Lang::tr{'deactivate user'}</td></tr>
- <tr><td align='right' width='33%'><img src='/images/edit.gif' /></td><td align='left'>$Lang::tr{'change passwords'}</td></tr>
- <tr><td align='right' width='33%'><img src='/images/media-floppy.png' /></td><td align='left'>$Lang::tr{'save config'}</td></tr>
- </table>
-END
-;
- }
-
if ($sambasettings{'ACTION'} eq 'userchangepw')
{
my $username = "$sambasettings{'NAME'}";
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 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 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>
- <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'>
- <input type='hidden' name='ACTION' value='sharecaption' />
- <input type='image' alt='$Lang::tr{'caption'}' title='$Lang::tr{'caption'}' src='/images/help-browser.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 'sharecaption')
- {
- print <<END
- <br />
- <table width='95%' cellspacing='0'>
- <tr><td align='center' colspan='2'><b>$Lang::tr{'caption'}</b></td></tr>
- <tr><td align='right' width='33%'><img src='/images/list-add.png' /></td><td align='left'>$Lang::tr{'add share'}</td></tr>
- <tr><td align='right' width='33%'><img src='/images/edit.gif' /></td><td align='left'>$Lang::tr{'edit share'}</td></tr>
- <tr><td align='right' width='33%'><img src='/images/media-floppy.png' /></td><td align='left'>$Lang::tr{'save config'}</td></tr>
- <tr><td align='right' width='33%'><img src='/images/user-trash.png' /></td><td align='left'>$Lang::tr{'delete share'}</td></tr>
+print <<END;
</table>
-END
-;
- }
-if ($sambasettings{'ACTION'} eq 'shareadd' || $sambasettings{'ACTION'} eq 'optioncaption' )
- {
- 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>
- </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' || $sambasettings{'ACTION'} eq 'optioncaption2' )
- {
+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 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();
system("/usr/local/bin/sambactrl smbsafeconf");
system("/usr/local/bin/sambactrl smbreload");
-refreshpage();
}
sub isrunning
projects / people / pmueller / ipfire-2.x.git / blobdiff