]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - html/cgi-bin/samba.cgi
samba: Remove help popup
[ipfire-2.x.git] / html / cgi-bin / samba.cgi
index 0e1409c73bf3294ae76e37e42042ced9b90318bc..abf5e3295a7952ab3ef45fc51b8c70ebfc9d30ea 100644 (file)
@@ -38,11 +38,8 @@ my %mainsettings = ();
 my $message = "";
 my $errormessage = "";
 
-my @Logs = qx(ls /var/log/samba/);
-my $Log =$Lang::tr{'no log selected'};
-
 my $Status = qx(/usr/local/bin/sambactrl smbstatus);
-$Status=~s/\n/<br \/>/g;
+$Status = &Header::cleanhtml($Status);
 
 my $userentry = "";
 my @user = ();
@@ -75,33 +72,21 @@ my %servicenames = ('SMB Daemon' => 'smbd', 'NetBIOS Nameserver' => 'nmbd', 'Win
 #################################### Initialisierung von Samba Variablen fr global Settings ###############################
 
 $sambasettings{'WORKGRP'} = 'homeip.net';
-$sambasettings{'NETBIOSNAME'} = 'IPFire';
-$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.x';
 $sambasettings{'INTERFACES'} = '';
-$sambasettings{'SECURITY'} = 'share';
+$sambasettings{'SECURITY'} = 'user';
 $sambasettings{'OSLEVEL'} = '33';
 $sambasettings{'GREEN'} = 'on';
 $sambasettings{'BLUE'} = 'off';
 $sambasettings{'ORANGE'} = 'off';
 $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'} = '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'} = 'off';
 ### Values that have to be initialized
 $sambasettings{'ACTION'} = '';
 ### Samba CUPS Variablen
@@ -143,97 +128,10 @@ if ($sambasettings{'ACTION'} eq 'smbrestart'){system("/usr/local/bin/sambactrl s
 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.x';
-       $sambasettings{'INTERFACES'} = '';
-       $sambasettings{'SECURITY'} = 'share';
-       $sambasettings{'OSLEVEL'} = '65';
-       $sambasettings{'GREEN'} = 'on';
-       $sambasettings{'BLUE'} = 'off';
-       $sambasettings{'ORANGE'} = 'off';
-       $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'} = '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'} = 'off';
-       $PDCOPTIONS = `cat ${General::swroot}/samba/pdc`;
-       system("/usr/local/bin/sambactrl smbreload");
-       refreshpage();
-       }
-
 if ($sambasettings{'ACTION'} eq 'join') {
        $message .= &joindomain($sambasettings{'USERNAME'}, $sambasettings{'PASSWORD'});
 }
 
-############################################################################################################################
-################################################ Sicherheitsabfrage für den Reset ##########################################
-
-if ($sambasettings{'ACTION'} eq 'globalreset')
-       {
-       print <<END
-       <br />
-       <table width='95%' cellspacing='0'>
-       <tr><td bgcolor='$color{'color20'}' colspan='3' align='center'><b>$Lang::tr{'resetglobals'}</b>
-       <tr><td align='right' width='50%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                        $Lang::tr{'yes'} <input type='image' alt='$Lang::tr{'yes'}' title='$Lang::tr{'yes'}' src='/images/edit-redo.png' />
-                                       <input type='hidden' name='ACTION' value='globalresetyes' /></form></td>
-                       <td align='left'  width='50%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                       <input type='image' alt='$Lang::tr{'no'}' title='$Lang::tr{'no'}' src='/images/dialog-error.png' /> $Lang::tr{'no'} 
-                                       <input type='hidden' name='ACTION' value='cancel' /></form></td>
-       </tr>
-       </table>
-END
-;
-}
-
-if ($sambasettings{'ACTION'} eq 'sharesreset')
-       {
-       print <<END
-       <br />
-       <table width='95%' cellspacing='0'>
-       <tr><td bgcolor='$color{'color20'}' colspan='3' align='center'><b>$Lang::tr{'resetshares'}</b>
-       <tr><td align='right'  width='50%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                        $Lang::tr{'yes'} <input type='image' alt='$Lang::tr{'yes'}' title='$Lang::tr{'yes'}' src='/images/edit-redo.png' />
-                                       <input type='hidden' name='ACTION' value='sharesresetyes' /></form></td>
-                       <td align='left'  width='50%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                       <input type='image' alt='$Lang::tr{'no'}' title='$Lang::tr{'no'}' src='/images/dialog-error.png' /> $Lang::tr{'no'} 
-                                       <input type='hidden' name='ACTION' value='cancel' /></form></td>
-       </tr>
-       </table>
-END
-;
-       }
-
 ############################################################################################################################
 ########################################### Samba Benutzer oder PC l�chen #################################################
 
@@ -258,11 +156,9 @@ delete $sambasettings{'__CGI__'};delete $sambasettings{'x'};delete $sambasetting
 &General::writehash("${General::swroot}/samba/settings", \%sambasettings);
 
 if ($sambasettings{'PASSWORDSYNC'} eq 'on'){ $sambasettings{'PASSWORDSYNC'} = "true";} else { $sambasettings{'PASSWORDSYNC'} = "false";}
-if ($sambasettings{'WINSSUPPORT'} eq 'on'){ $sambasettings{'WINSSUPPORT'} = "true";$sambasettings{'WINSSRV'} = "";} else { $sambasettings{'WINSSUPPORT'} = "false";}
 if ($sambasettings{'LOCALMASTER'} eq 'on'){ $sambasettings{'LOCALMASTER'} = "true";} else { $sambasettings{'LOCALMASTER'} = "false";}
 if ($sambasettings{'DOMAINMASTER'} eq 'on'){ $sambasettings{'DOMAINMASTER'} = "true";} else { $sambasettings{'DOMAINMASTER'} = "false";}
 if ($sambasettings{'PREFERREDMASTER'} eq 'on'){ $sambasettings{'PREFERREDMASTER'} = "true";} else { $sambasettings{'PREFERREDMASTER'} = "false";}
-if ($sambasettings{'SYSLOGONLY'} eq 'on'){ $sambasettings{'SYSLOGONLY'} = "yes";} else { $sambasettings{'SYSLOGONLY'} = "no";}
 if ($sambasettings{'WIDELINKS'} eq 'on'){ $sambasettings{'WIDELINKS'} = "yes";} else { $sambasettings{'WIDELINKS'} = "no";}
 if ($sambasettings{'UNIXEXTENSION'} eq 'on'){ $sambasettings{'UNIXEXTENSION'} = "yes";} else { $sambasettings{'UNIXEXTENSION'} = "no";}
 
@@ -276,59 +172,34 @@ print FILE <<END
 # global.settings by IPFire Project
 
 [global]
-netbios name = $sambasettings{'NETBIOSNAME'}
-server string = $sambasettings{'SRVSTRING'}
+server string = Samba on IPFire
+
 workgroup = $sambasettings{'WORKGRP'}
 realm = $mainsettings{'DOMAINNAME'}
 passdb backend = smbpasswd
 
 wide links = $sambasettings{'WIDELINKS'}
 unix extensions = $sambasettings{'UNIXEXTENSION'}
-END
-;
-
-if ($sambasettings{'SMB2'} eq 'on'){
-       print FILE "max protocol = smb2\n";
-}
-
-print FILE <<END
-keep alive = 30
 os level = $sambasettings{'OSLEVEL'}
-fstype = NTFS
 
-kernel oplocks = false
 map to guest = $sambasettings{'MAPTOGUEST'}
-smb ports = 445 139
-dos charset = $sambasettings{'DOSCHARSET'}
-unix charset = $sambasettings{'UNIXCHARSET'}
-display charset = $sambasettings{'DISPLAYCHARSET'}
 
 security = $sambasettings{'SECURITY'}
-encrypt passwords = yes
 guest account = $sambasettings{'GUESTACCOUNT'}
 unix password sync = $sambasettings{'PASSWORDSYNC'}
-null passwords = yes
 
 bind interfaces only = true
 interfaces = $sambasettings{'INTERFACES'}
-socket options = $sambasettings{'SOCKETOPTIONS'}
 remote announce = $sambasettings{'REMOTEANNOUNCE'}
 remote browse sync = $sambasettings{'REMOTESYNC'}
 
-username level = 1
-wins support = $sambasettings{'WINSSUPPORT'}
-wins server = $sambasettings{'WINSSRV'}
-
 winbind separator = +
 winbind uid = 10000-20000
 winbind gid = 10000-20000
 winbind use default domain = yes
 
-log file       = /var/log/samba/samba-log.%m
-pid directory  = /var/run/
-log level = $sambasettings{'LOGLEVEL'}
-syslog = $sambasettings{'SYSLOGLEVEL'}
-syslog only = $sambasettings{'SYSLOGONLY'}
+# Log to syslog
+logging = syslog
 
 preferred master = $sambasettings{'PREFERREDMASTER'}
 domain master = $sambasettings{'DOMAINMASTER'}
@@ -404,12 +275,6 @@ if ($message) {
 ############################################################################################################################
 ########################################## 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'";
 $checked{'PASSWORDSYNC'}{'off'} = '';
 $checked{'PASSWORDSYNC'}{'on'} = '';
 $checked{'PASSWORDSYNC'}{$sambasettings{'PASSWORDSYNC'}} = "checked='checked'";
@@ -428,9 +293,6 @@ $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'";
@@ -485,15 +347,6 @@ print <<END
 <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' width='40%'>$Lang::tr{'netbios name'}</td><td align='left'><input type='text' name='NETBIOSNAME' value='$sambasettings{'NETBIOSNAME'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'dos charset'}</td><td align='left'><input type='text' name='DOSCHARSET' value='$sambasettings{'DOSCHARSET'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'unix charset'}</td><td align='left'><input type='text' name='UNIXCHARSET' value='$sambasettings{'UNIXCHARSET'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'display charset'}</td><td align='left'><input type='text' name='DISPLAYCHARSET' value='$sambasettings{'DISPLAYCHARSET'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'server string'}</td><td align='left'><input type='text' name='SRVSTRING' value='$sambasettings{'SRVSTRING'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'log level'}</td><td align='left'><input type='text' name='LOGLEVEL' value='$sambasettings{'LOGLEVEL'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>Sys$Lang::tr{'log level'}</td><td align='left'><input type='text' name='SYSLOGLEVEL' value='$sambasettings{'SYSLOGLEVEL'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>Syslog only</td><td align='left'>on <input type='radio' name='SYSLOGONLY' value='on' $checked{'SYSLOGONLY'}{'on'} />/
-                                                                                                                                                                                       <input type='radio' name='SYSLOGONLY' value='off' $checked{'SYSLOGONLY'}{'off'} /> off</td></tr>
 <tr><td align='left' width='40%'>$Lang::tr{'interfaces'}</td><td align='left'>on <input type='radio' name='VPN' value='on' $checked{'VPN'}{'on'} />/
                                                                                                                                                                                <input type='radio' name='VPN' value='off' $checked{'VPN'}{'off'} /> off |
                                                                                                                                                                                <font size='2' color='$Header::colourovpn'><b>   OpenVpn  -  $ovpnip[0].$ovpnip[1].$ovpnip[2].$ovpnip[3]/$ovpnnetwork[1]</b></font></td></tr>
@@ -530,12 +383,9 @@ print <<END
                                                                                                                                                                                        <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' width='40%'>SMB2 $Lang::tr{'protocol'}</td><td align='left'>on <input type='radio' name='SMB2' value='on' $checked{'SMB2'}{'on'} />/
-                                                                                                                                                                                       <input type='radio' name='SMB2' value='off' $checked{'SMB2'}{'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='share' $selected{'SECURITY'}{'share'}>Share</option>
                                                                                                                                                                <option value='user' $selected{'SECURITY'}{'user'}>User</option>
                                                                                                                                                                <option value='domain' $selected{'SECURITY'}{'domain'}>Domain</option>
                                                                                                                                                                <option value='ADS' $selected{'SECURITY'}{'ADS'}>ADS</option>
@@ -553,17 +403,10 @@ 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{'os level'}</td><td align='left'><input type='text' name='OSLEVEL' value='$sambasettings{'OSLEVEL'}' size="30" /></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'socket options'}</td><td align='left'><input type='text' name='SOCKETOPTIONS' value='$sambasettings{'SOCKETOPTIONS'}' size="30" /></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>
 END
 ;
-if ($sambasettings{'WINSSUPPORT'} eq 'off') {print"<tr><td align='left' width='40%'>$Lang::tr{'wins server'}</td><td align='left'><input type='text' name='WINSSRV' value='$sambasettings{'WINSSRV'}' size='30' /></td></tr>";}
-       print <<END
-<tr><td align='left' width='40%'>$Lang::tr{'wins support'}</td><td align='left'>on <input type='radio' name='WINSSUPPORT' value='on' $checked{'WINSSUPPORT'}{'on'} />/
-                                                                                                                                                                                               <input type='radio' name='WINSSUPPORT' value='off' $checked{'WINSSUPPORT'}{'off'} /> off</td></tr>
-END
-;
 
 if ($sambasettings{'SECURITY'} eq 'user')
        {
@@ -608,9 +451,6 @@ print <<END
 <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='globalreset' />
-                                                                               <input type='image' alt='$Lang::tr{'reset'}' title='$Lang::tr{'reset'}' src='/images/reload.gif' /></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>
@@ -988,10 +828,6 @@ 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='sharesreset' />
-                                                                                               <input type='image' alt='$Lang::tr{'reset'}' title='$Lang::tr{'reset'}' src='/images/reload.gif' />
-                                                                                               </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' />
@@ -1010,7 +846,6 @@ if ($sambasettings{'ACTION'} eq 'sharecaption')
        <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/reload.gif' /></td><td align='left'>$Lang::tr{'reset shares'}</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
@@ -1024,8 +859,6 @@ if ($sambasettings{'ACTION'} eq 'shareadd' || $sambasettings{'ACTION'} eq 'optio
        <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>
-       <tr><td colspan='2' align='center'>$Lang::tr{'show share options'}
- <a href="sambahlp.cgi" target="popup" onClick="window.open ('', 'popup', 'width=580,height=600,scrollbars=yes, toolbar=no,status=no, resizable=yes,menubar=no,location=no,directories=no,top=10,left=10')"><img border="0" src="/images/help-browser.png"></a></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 />
@@ -1045,7 +878,6 @@ if ($sambasettings{'ACTION'} eq 'sharechange' || $sambasettings{'ACTION'} eq 'op
        <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'>$Lang::tr{'show share options'}<a href="sambahlp.cgi" target="popup" onClick="window.open ('', 'popup', 'width=580,height=600,scrollbars=yes, toolbar=no,status=no, resizable=yes,menubar=no,location=no,directories=no,top=10,left=10')"><img border="0" src="/images/help-browser.png"></a></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 />
@@ -1058,12 +890,6 @@ END
 ;
        }
 
-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'}";
@@ -1129,10 +955,6 @@ print <<END
                                                                                                <input type='hidden' name='ACTION' value='printeradd' />
                                                                                                <input type='image' alt='$Lang::tr{'add printer'}' title='$Lang::tr{'add printer'}' src='/images/list-add.png' />
                                                                                                </form></td>
-               <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage printers'}'>
-                                                                                               <input type='hidden' name='ACTION' value='printereset' />
-                                                                                               <input type='image' alt='$Lang::tr{'reset'}' title='$Lang::tr{'reset'}' src='/images/reload.gif' />
-                                                                                               </form></td>
                <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage printers'}'>
                                                                                                <input type='hidden' name='ACTION' value='printercaption' />
                                                                                                <input type='image' alt='$Lang::tr{'caption'}' title='$Lang::tr{'caption'}' src='/images/help-browser.png' />
@@ -1150,7 +972,6 @@ if ($sambasettings{'ACTION'} eq 'printeradd' || $sambasettings{'ACTION'} eq 'pri
        <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'add printer'}</b></td></tr>
        <tr><td colspan='2' align='center'></td></tr>
        <tr><td colspan='2' align='center'>$Lang::tr{'show share options'}
- <a href="sambahlp.cgi" target="popup" onClick="window.open ('', 'popup', 'width=580,height=600,scrollbars=yes, toolbar=no,status=no, resizable=yes,menubar=no,location=no,directories=no,top=10,left=10')"><img border="0" src="/images/help-browser.png"></a></td></tr>
        <form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage printers'}'><tr><td colspan='2' align='center'><textarea name="PRINTEROPTION" cols="50" rows="15" Wrap="off">$defaultprinter</textarea></td></tr>
        </table>
        <br />
@@ -1171,7 +992,6 @@ if ($sambasettings{'ACTION'} eq 'printerchange' || $sambasettings{'ACTION'} eq '
        <table width='95%' cellspacing='0'>
        <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'edit printer'}</b></td></tr>
        <tr><td colspan='2' align='center'></td></tr>
-       <tr><td colspan='2' align='center'>$Lang::tr{'show share options'}<a href="sambahlp.cgi" target="popup" onClick="window.open ('', 'popup', 'width=580,height=600,scrollbars=yes, toolbar=no,status=no, resizable=yes,menubar=no,location=no,directories=no,top=10,left=10')"><img border="0" src="/images/help-browser.png"></a></td></tr>
        <tr><td colspan='2' align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage printers'}'><textarea name="PRINTEROPTION" cols="50" rows="15" Wrap="off">$printeroption</textarea></td></tr>
        </table>
        <br />
@@ -1217,48 +1037,12 @@ 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'>$Status</td></tr>
+<tr><td  align='left'><small><pre>$Status</pre></small></td></tr>
 </table>
 END
 ;
 &Header::closebox();
 
-############################################################################################################################
-############################################### Anzeige der Sambalogs ######################################################
-
-
-if ($sambasettings{'ACTION'} eq 'showlog')
-{
-$Log = qx(tail -n $sambasettings{'LOGLINES'} /var/log/samba/$sambasettings{'LOG'});
-$Log=~s/\n/<br \/>/g;
-}
-
-&Header::openbox('100%', 'center', $Lang::tr{'log'});
-
-print <<END
-<a name="$Lang::tr{'log view'}"></a>
-<br />
-<form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'log view'}'>
-<table width='95%' cellspacing='0'>
-<tr><td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'log view'}</b></td></tr>
-<tr><td colspan='3'  align='left'><br /></td></tr>
-<tr><td  align='left'><select name='LOG' style="width: 200px">
-END
-;
-foreach my $log (@Logs) {chomp $log;print"<option value='$log'>$log</option>";}
-print <<END
-
-</select></td><td  align='left'>$Lang::tr{'show last x lines'}<input type='text' name='LOGLINES' value='$LOGLINES' size="3" /></td>
-                       <td  align='left'><input type='hidden' name='ACTION' value='showlog' /><input type='image' alt='view Log' title='view Log' src='/images/format-justify-fill.png' /></td></tr>
-<tr><td colspan='3'  align='left'><br /></td></tr>
-<tr><td colspan='3'  align='left'><font size=2>$Log</font></td></tr>
-<tr><td colspan='3'  align='left'><br /></td></tr>
-<tr><td colspan='3'  align='center'>$sambasettings{'LOG'}</td></tr>
-</table>
-</form>
-END
-;
-&Header::closebox();
 &Header::closebigbox();
 &Header::closepage();