]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - html/cgi-bin/samba.cgi
samba: Remove more legends
[people/pmueller/ipfire-2.x.git] / html / cgi-bin / samba.cgi
index 536d7f1d667fe6d0affeb5e6e074e34d5be973c3..59e39774703e1374604e90a7b0b00f5ff32bdc32 100644 (file)
@@ -32,7 +32,6 @@ my %sambasettings = ();
 my %cgisettings = ();
 my %checked = ();
 my %netsettings = ();
-my %ovpnsettings = ();
 my %color = ();
 my %mainsettings = ();
 my $message = "";
@@ -51,19 +50,12 @@ my $defaultoption= "[Share]\npath = /var/ipfire/samba/share1\ncomment = Share -
 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();
 
 ############################################################################################################################
@@ -72,14 +64,8 @@ my %servicenames = ('SMB Daemon' => 'smbd', 'NetBIOS Nameserver' => 'nmbd', 'Win
 $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';
@@ -94,8 +80,6 @@ my $LOGLINES = '50';
 &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"; }
 
@@ -105,15 +89,15 @@ if (($sambasettings{'WIDELINKS'} eq 'on') & ($sambasettings{'UNIXEXTENSION'} eq
 ############################################################################################################################
 ############################################# 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'});
 }
@@ -121,27 +105,19 @@ if ($sambasettings{'ACTION'} eq 'join') {
 ############################################################################################################################
 ########################################### 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";}
 
@@ -168,7 +144,7 @@ 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
@@ -201,7 +177,6 @@ close FILE;
 
 system("/usr/local/bin/sambactrl smbsafeconf");
 system("/usr/local/bin/sambactrl smbreload");
-refreshpage();
 }
   &General::readhash("${General::swroot}/samba/settings", \%sambasettings);
   
@@ -226,27 +201,12 @@ if ($message) {
 ############################################################################################################################
 ########################################## 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'} = '';
@@ -262,92 +222,161 @@ $selected{'SECURITY'}{$sambasettings{'SECURITY'}} = "selected='selected'";
 ################################### 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='95%' 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="95%">
+               <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='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>
+                       <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();
 
@@ -360,7 +389,7 @@ if ($sambasettings{'SECURITY'} eq 'user')
        print <<END
        <a name="$Lang::tr{'accounting'}"></a>
        <br />
-       <table width='95%' cellspacing='0'>
+       <table class="tbl" width='95%' 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>
@@ -451,37 +480,11 @@ END
        <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'}";
@@ -559,7 +562,7 @@ if ($sambasettings{'SECURITY'} eq "ADS") {
        <form method="POST" action="$ENV{'SCRIPT_NAME'}">
                <input type="hidden" name="ACTION" value="join">
 
-               <table width="95%">
+               <table class="tbl" width="95%">
                        <tbody>
                                <tr>
                                        <td width="40%">
@@ -610,7 +613,7 @@ my %shares =  config("${General::swroot}/samba/shares");
 print <<END
 <a name="$Lang::tr{'manage shares'}"></a>
 <br />
-<table width='95%' cellspacing='0' class='tbl'>
+<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>
 END
@@ -654,31 +657,12 @@ print <<END
                                                                                                <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>
 END
 ;
 
-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>
-       </table>
-END
-;
-       }
-
-if ($sambasettings{'ACTION'} eq 'shareadd' || $sambasettings{'ACTION'} eq 'optioncaption' )
+if ($sambasettings{'ACTION'} eq 'shareadd')
        {
        print <<END
        <br />
@@ -696,7 +680,7 @@ END
 ;
        }
 
-if ($sambasettings{'ACTION'} eq 'sharechange' || $sambasettings{'ACTION'} eq 'optioncaption2' )
+if ($sambasettings{'ACTION'} eq 'sharechange')
        {
        my $shareoption = $shares{$sambasettings{'NAME'}};
        print <<END
@@ -744,7 +728,7 @@ if ($sambasettings{'ACTION'} eq 'smbsharechange')
 
 print <<END
 <br />
-<table width='95%' cellspacing='0'>
+<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>
@@ -806,7 +790,6 @@ close FILE;
 
 system("/usr/local/bin/sambactrl smbsafeconf");
 system("/usr/local/bin/sambactrl smbreload");
-refreshpage();
 }
 
 sub isrunning