]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - html/cgi-bin/samba.cgi
Set version to "2.7".
[ipfire-2.x.git] / html / cgi-bin / samba.cgi
index e71466a9140c7a3846fddc3b076698225bf63be7..13a7a8254895562e1eba35813e7ed1694d807bc2 100644 (file)
 #!/usr/bin/perl
-#
-# IPFire CGIs
-#
-# This code is distributed under the terms of the GPL
-#
-# (c) The IPFire Team
-#
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
 
 use strict;
 # enable only the following on debugging purpose
-use warnings;
-use CGI::Carp 'fatalsToBrowser';
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
 
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
 my %sambasettings = ();
+my %cgisettings = ();
 my %checked = ();
 my %netsettings = ();
 my %ovpnsettings = ();
+my %color = ();
+my %mainsettings = ();
 my $message = "";
 my $errormessage = "";
-my $shareconfigentry = "";
-my @sharesconfig = ();
-my @shareconfigline = ();
-my $shareoption = '';
-my $defaultoption= "[Share]\npath = /shares/share1\ncomment = Share - Public Access\nbrowseable = yes\nwriteable = yes\ncreate mask = 0777\ndirectory mask = 0777\nguest ok = yes\npublic = yes\nforce user = samba";
+
+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;
+
 my $userentry = "";
 my @user = ();
 my @userline = ();
-my @proto = ();
+my $userfile = "${General::swroot}/samba/private/smbpasswd";
 my %selected= () ;
-my $userfile = "/var/ipfire/samba/private/smbpasswd";
+
+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 $defaultprinter= "[Printer]\ncomment = Printer public\npath = /var/spool/cups\nprinting = sysvn\nprintcap = lpstat\npublic = yes\nwritable = no\nprintable = yes";
+my %printer = ();
+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 für Statusüberprüfung ##########################################
+############################################# Samba Dienste fr Statusberprfung ##########################################
 
-my %servicenames =
-(
-        'SMB Daemon' => 'smbd',
-        'NetBIOS Nameserver' => 'nmbd',
-        'Winbind Daemon' => 'winbindd'
-);
+my %servicenames = ('SMB Daemon' => 'smbd','NetBIOS Nameserver' => 'nmbd');
+#my %servicenames = ('SMB Daemon' => 'smbd','NetBIOS Nameserver' => 'nmbd','Winbind Daemon' => 'winbindd');
 
 &Header::showhttpheaders();
 
 ############################################################################################################################
-#################################### Initialisierung von Samba Sharess für die Verarbeitung ################################
-
-my @Zeilen= ();
-my @Shares= ();
-my $shareentry = "";
-my @shares = ();
-my @shareline = ();
-my $sharefile = "/var/ipfire/samba/shares";
-my $EOF = qx(cat $sharefile | wc -l);
-
-@shares = `grep -n '^\\[' $sharefile`;
-foreach $shareentry (@shares)
- {
- @shareline = split( /\:/, $shareentry );
- push(@Zeilen,$shareline[0]);push(@Shares,$shareline[1]);
- }
-
-############################################################################################################################
-#################################### Initialisierung von Samba Variablen für global Settings ###############################
+#################################### Initialisierung von Samba Variablen fr global Settings ###############################
 
 $sambasettings{'WORKGRP'} = 'homeip.net';
-$sambasettings{'NETBIOSNAME'} = 'IPFIRE';
-$sambasettings{'SRVSTRING'} = 'Samba Server running on IPFire 2.0';
+$sambasettings{'NETBIOSNAME'} = 'IPFire';
+$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.7';
 $sambasettings{'INTERFACES'} = '';
 $sambasettings{'SECURITY'} = 'share';
-$sambasettings{'OSLEVEL'} = '65';
+$sambasettings{'OSLEVEL'} = '33';
 $sambasettings{'GREEN'} = 'on';
 $sambasettings{'BLUE'} = 'off';
 $sambasettings{'ORANGE'} = 'off';
 $sambasettings{'VPN'} = 'off';
-$sambasettings{'WINSSRV'} = "$netsettings{'GREEN_NETADDRESS'}";
-$sambasettings{'WINSSUPPORT'} = 'off';
-$sambasettings{'OTHERINTERFACES'} = '';
+$sambasettings{'WINSSRV'} = '';
+$sambasettings{'WINSSUPPORT'} = 'on';
+$sambasettings{'REMOTEANNOUNCE'} = '';
+$sambasettings{'REMOTESYNC'} = '';
+$sambasettings{'PASSWORDSYNC'} = 'off';
+$sambasettings{'OTHERINTERFACES'} = '127.0.0.1';
 $sambasettings{'GUESTACCOUNT'} = 'samba';
 $sambasettings{'MAPTOGUEST'} = 'Never';
-$sambasettings{'BINDINTERFACESONLY'} = 'True';
+$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=8192 SO_SNDBUF=8192 SO_KEEPALIVE';
+$sambasettings{'WIDELINKS'} = 'on';
+$sambasettings{'UNIXEXTENSION'} = 'off';
 ### Values that have to be initialized
 $sambasettings{'ACTION'} = '';
+### Samba CUPS Variablen
+$sambasettings{'LOADPRINTERS'} = 'Yes';
+$sambasettings{'PRINTING'} = 'cups';
+$sambasettings{'PRINTCAPNAME'} = 'cups';
+my $LOGLINES = '50';
+
+################################################## Samba PDC Variablen #####################################################
+
+$sambasettings{'LOCALMASTER'} = 'off';
+$sambasettings{'DOMAINMASTER'} = 'off';
+$sambasettings{'PREFERREDMASTER'} = 'off';
+my $PDCOPTIONS = `cat ${General::swroot}/samba/pdc`;
+
+
+############################################################################################################################
 
 &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 für SU-Actions ######################################
-
-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 'smbuserdelete'){system('/usr/local/bin/sambactrl smbuserdelete $sambasettings{"NAME"}');}
-if ($sambasettings{'ACTION'} eq 'smbuseradd'){system('/usr/local/bin/sambactrl smbuseradd $username $password');}
-if ($sambasettings{'ACTION'} eq 'smbchangepw'){system('/usr/local/bin/sambactrl smbchangepw $username $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');}
-# smbsharechange is directly called by the if clause
+############################################# 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 'globalresetyes')
+       {
+       system("/usr/local/bin/sambactrl smbglobalreset");
+       $sambasettings{'WORKGRP'} = 'homeip.net';
+       $sambasettings{'NETBIOSNAME'} = 'IPFire';
+       $sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.0';
+       $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'} = 'Never';
+       $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=8192 SO_SNDBUF=8192 SO_KEEPALIVE';
+       $PDCOPTIONS = `cat ${General::swroot}/samba/pdc`;
+       system("/usr/local/bin/sambactrl smbreload");
+       refreshpage();
+       }
 
 ############################################################################################################################
-############################################## Samba Share neu anlegen #####################################################
-
-if ($sambasettings{'ACTION'} eq 'smbshareadd')
-{
-  my $emptyline= ""; 
-       open (FILE, ">>${General::swroot}/samba/shares") or die "Can't save the shares settings: $!";
-       flock (FILE, 2);
-       
-print FILE <<END
-$sambasettings{'SHAREOPTION'}
-$emptyline
+################################################ 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
 ;
-close FILE;
-system('/usr/local/bin/sambactrl smbsharechange');
-
- @Zeilen = ();
- @Shares = ();
- @shares = `grep -n '^\\[' $sharefile`;
- foreach $shareentry (@shares)
- {
- @shareline = split( /\:/, $shareentry );
- push(@Zeilen,$shareline[0]);push(@Shares,$shareline[1]);
- }
 }
 
-############################################################################################################################
-################################################## Samba Share löschen #####################################################
-
-if ($sambasettings{'ACTION'} eq 'smbsharedel')
-{
-my $sharebody = '';
-my $sharehead = '';
-my $sharetext = '';
-my $sharename = "$sambasettings{'NAME'}";
-chomp $sharename;
-$sharename=~s/\s//g;
-
-for(my $i = 0; $i <= $#Shares; $i++)
- {
- chomp $Shares[$i];
- $Shares[$i]=~s/\s//g;
- if ( "$Shares[$i]" eq "$sharename" )
-  {
-  my $Zeilenbegin = $Zeilen[$i]-2;
-  my $Zeilenende =  $EOF-$Zeilen[$i+1]+1;
-  my $Zeilenende2 =  $Zeilenende-1;
-
-  if ( $Zeilen[$i] eq $Zeilen[$#Shares] )
-   {
-   $sharehead = qx(head -$Zeilenbegin $sharefile);
-   $sharetext = $sharehead;
-   }
-  elsif ($Zeilen[$i] eq 1 )
-   {
-   $sharehead = qx(tail -$Zeilenende $sharefile | head -$Zeilenende2);
-   $sharetext = $sharehead;
-   }
-  else
-   {
-   $sharehead = qx(head -$Zeilenbegin $sharefile);$sharebody = qx(tail -$Zeilenende $sharefile | head -$Zeilenende2);
-   $sharetext = "$sharehead\n$sharebody";
-   }
-  }
- }
-open (FILE, ">${General::swroot}/samba/shares") or die "Can't delete the share settings: $!";
-flock (FILE, 2);
-print FILE <<END
-$sharetext
+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
 ;
-close FILE;
-system('/usr/local/bin/sambactrl smbsharechange');
+       }
 
-@Zeilen = ();
-@Shares = ();
-@shares = `grep -n '^\\[' $sharefile`;
-foreach $shareentry (@shares)
- {
- @shareline = split( /\:/, $shareentry );
- push(@Zeilen,$shareline[0]);push(@Shares,$shareline[1]);
- }
-}
 ############################################################################################################################
-################################################## Sambashare ändern #######################################################
+########################################### Samba Benutzer oder PC l�chen #################################################
 
-if ($sambasettings{'ACTION'} eq 'smbsharechange')
-{
-my $sharebody = '';
-my $sharehead = '';
-my $sharename = "$sambasettings{'NAME'}";
-my $sharetext = '';
-chomp $sharename;
-$sharename=~s/\s//g;
-
-for(my $i = 0; $i <= $#Shares; $i++)
- {
- chomp $Shares[$i];
- $Shares[$i]=~s/\s//g;
- if ( "$Shares[$i]" eq "$sharename" )
-  {
-  my $Zeilenbegin = $Zeilen[$i]-2;
-  my $Zeilenende =  $EOF-$Zeilen[$i+1]+1;
-  my $Zeilenende2 =  $Zeilenende-1;
-
-  if ( $Zeilen[$i] eq $Zeilen[$#Shares] )
-   {
-   $sharehead = qx(head -$Zeilenbegin $sharefile);
-   $sharetext = $sharehead;
-   }
-  elsif ($Zeilen[$i] eq 1 )
-   {
-   $sharehead = qx(tail -$Zeilenende $sharefile | head -$Zeilenende2);
-   $sharetext = $sharehead;
-   }
-  else
-   {
-   $sharehead = qx(head -$Zeilenbegin $sharefile);$sharebody = qx(tail -$Zeilenende $sharefile | head -$Zeilenende2);
-   $sharetext = "$sharehead\n$sharebody";
-   }
-  }
- }
-open (FILE, ">${General::swroot}/samba/shares") or die "Can't delete the share settings: $!";
-flock (FILE, 2);
-print FILE <<END
-$sharetext
-$sambasettings{'SHAREOPTION'}
-END
-;
-close FILE;
-system('/usr/local/bin/sambactrl smbsharechange');
-
- @Zeilen = ();
- @Shares = ();
- @shares = `grep -n '^\\[' $sharefile`;
- foreach $shareentry (@shares)
- {
- @shareline = split( /\:/, $shareentry );
- push(@Zeilen,$shareline[0]);push(@Shares,$shareline[1]);
- }
-}
+if ($sambasettings{'ACTION'} eq 'userdelete'){system("/usr/local/bin/sambactrl smbuserdelete $sambasettings{'NAME'}");refreshpage();}
 
 ############################################################################################################################
 ##################################### Umsetzen der Werte von Checkboxen und Dropdowns ######################################
@@ -258,525 +238,1045 @@ system('/usr/local/bin/sambactrl smbsharechange');
 if ($sambasettings{'ACTION'} eq $Lang::tr{'save'})
 {
 $sambasettings{'INTERFACES'} = '';
-if ($checked{'GREEN'}){ $sambasettings{'INTERFACES'} = "$sambasettings{'INTERFACES'} $netsettings{'GREEN_DEV'}";}
-if ($checked{'BLUE'}){ $sambasettings{'INTERFACES'} = "$sambasettings{'INTERFACES'} $netsettings{'BLUE_DEV'}";}
-if ($checked{'ORANGE'}){ $sambasettings{'INTERFACES'} = "$sambasettings{'INTERFACES'} $netsettings{'ORANGE_DEV'}";}
-if ($checked{'VPN'}){ $sambasettings{'INTERFACES'} = "$sambasettings{'INTERFACES'} $ovpnsettings{'DDEVICE'}";}
-if ($sambasettings{'OTHERINTERFACES'} ne ''){ $sambasettings{'INTERFACES'} = "$sambasettings{'INTERFACES'} $sambasettings{'OTHERINTERFACES'}";}
+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 der Samba globals ##################################################
+##################################### Schreiben settings und bersetzen fr smb.conf #######################################
 
-  &General::writehash("${General::swroot}/samba/settings", \%sambasettings);
+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{'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";}
+
+############################################################################################################################
+############################################# Schreiben der Samba globals ##################################################
 
        open (FILE, ">${General::swroot}/samba/global") or die "Can't save the global settings: $!";
        flock (FILE, 2);
        
 print FILE <<END
-  # global.settings by IPFire Project
-
-  [global]
-       netbios name = $sambasettings{'NETBIOSNAME'}
-       server string = $sambasettings{'SRVSTRING'}
-       workgroup = $sambasettings{'WORKGRP'}
-
-       keep alive = 30
-       os level = $sambasettings{'OSLEVEL'}
-       fstype = NTFS
-       
-       preferred master = yes
-       domain master = yes
-       local master = yes
+# global.settings by IPFire Project
+
+[global]
+netbios name = $sambasettings{'NETBIOSNAME'}
+server string = $sambasettings{'SRVSTRING'}
+workgroup = $sambasettings{'WORKGRP'}
+passdb backend = smbpasswd
+
+wide links = $sambasettings{'WIDELINKS'}
+unix extensions = $sambasettings{'UNIXEXTENSION'}
+
+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'}
+
+log file       = /var/log/samba/samba-log.%m
+lock directory = /var/lock/samba
+pid directory  = /var/run/
+log level = $sambasettings{'LOGLEVEL'}
+syslog = $sambasettings{'SYSLOGLEVEL'}
+syslog only = $sambasettings{'SYSLOGONLY'}
+
+preferred master = $sambasettings{'PREFERREDMASTER'}
+domain master = $sambasettings{'DOMAINMASTER'}
+local master = $sambasettings{'LOCALMASTER'}
 
-       kernel oplocks = false
-       map to guest = $sambasettings{'MAPTOGUEST'}
-       smb ports = 445 139
-       unix charset = CP850
-
-       security = $sambasettings{'SECURITY'}
-       encrypt passwords = yes
-       guest account = $sambasettings{'GUESTACCOUNT'}
-       unix password sync = no
-       null passwords = yes
-
-       bind interfaces only = $sambasettings{'BINDINTERFACESONLY'}
-       interfaces = $sambasettings{'INTERFACES'}
-       socket options = TCP_NODELAY IPTOS_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 SO_KEEPALIVE
+END
+;
+close FILE;
 
-       username level = 1
-       wins support = $sambasettings{'WINSSUPPORT'}
-       local master = yes
+       if (-e "${General::swroot}/cups/enable"){
+       open (FILE, ">>${General::swroot}/samba/global") or die "Can't save the global cups settings: $!";
+       flock (FILE, 2);
+       print FILE <<END
+load printers = $sambasettings{'LOADPRINTERS'}
+printing = $sambasettings{'PRINTING'}
+printcap name = $sambasettings{'PRINTCAPNAME'}
 
-       log file       = /var/log/samba/samba-log.%m
-       lock directory = /var/lock/samba
-       pid directory = /var/run/
+END
+;
+close FILE;
+       }
 
+       if ($sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' )
+       {
+       open (FILE, ">${General::swroot}/samba/pdc") or die "Can't save the pdc settings: $!";
+       flock (FILE, 2);
+       chomp $sambasettings{'PDCOPTIONS'};
+       $sambasettings{'PDCOPTIONS'} =~ s/\r\n/\n/gi;
+       $sambasettings{'PDCOPTIONS'} =~ s/^\n//gi;
+       $sambasettings{'PDCOPTIONS'} =~ s/^\r//gi;
+       $sambasettings{'PDCOPTIONS'} =~ s/^.\n//gi;
+       $sambasettings{'PDCOPTIONS'} =~ s/^.\r//gi;
+       print FILE <<END
+$sambasettings{'PDCOPTIONS'}
 END
 ;
        close FILE;
+       }
+
+if ( -e "/var/ipfire/cups/enable")
+       {
+       if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdccups");refreshpage();}
+       else {system("/usr/local/bin/sambactrl smbsafeconfcups");}
+       }
+else
+       {
+       if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdc");refreshpage();}
+       else{system("/usr/local/bin/sambactrl smbsafeconf");}
+       }
+
+system("/usr/local/bin/sambactrl smbreload");refreshpage();
 }
   &General::readhash("${General::swroot}/samba/settings", \%sambasettings);
+  
 
-if ($errormessage) {
-        &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
-        print "<class name='base'>$errormessage\n";
-        print "&nbsp;</class>\n";
-        &Header::closebox();
-                  }
+if ($errormessage)
+       {
+       &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
+       print "<class name='base'>$errormessage\n";
+       print "&nbsp;</class>\n";
+       &Header::closebox();
+       }
 
 ############################################################################################################################
 ########################################## Aktivieren von Checkboxen und Dropdowns #########################################
 
-$checked{'WINSSUPPORT'}{$sambasettings{'WINSSUPPORT'}} = "checked='checked' ";
-$checked{'GREEN'}{$sambasettings{'GREEN'}} = "checked='checked' ";
-$checked{'BLUE'}{$sambasettings{'BLUE'}} = "checked='checked' ";
-$checked{'ORANGE'}{$sambasettings{'ORANGE'}} = "checked='checked' ";
-$checked{'VPN'}{$sambasettings{'VPN'}} = "checked='checked' ";
+$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'";
+$checked{'LOCALMASTER'}{'off'} = '';
+$checked{'LOCALMASTER'}{'on'} = '';
+$checked{'LOCALMASTER'}{$sambasettings{'LOCALMASTER'}} = "checked='checked'";
+$checked{'DOMAINMASTER'}{'off'} = '';
+$checked{'DOMAINMASTER'}{'on'} = '';
+$checked{'DOMAINMASTER'}{$sambasettings{'DOMAINMASTER'}} = "checked='checked'";
+$checked{'PREFERREDMASTER'}{'off'} = '';
+$checked{'PREFERREDMASTER'}{'on'} = '';
+$checked{'PREFERREDMASTER'}{$sambasettings{'PREFERREDMASTER'}} = "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{'MAPTOGUEST'}{$sambasettings{'MAPTOGUEST'}} = "selected='selected'";
 $selected{'SECURITY'}{$sambasettings{'SECURITY'}} = "selected='selected'";
 
 ############################################################################################################################
-################################### Aufbau der HTML Seite für globale Sambaeinstellungen ###################################
+################################### Aufbau der HTML Seite fr globale Sambaeinstellungen ###################################
+
+&Header::openbox('100%', 'center', $Lang::tr{'samba'});
+print <<END
+<br />
+<table width='95%' cellspacing='0'>
+END
+;
+if ( $message ne "" )
+       {
+       print "<tr><td colspan='3' align='left'><font color='red'>$message</font>";
+       }
+
+print <<END
+<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'all services'}</b></td></tr>
+</table><table width='95%' cellspacing='0'>
+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>";
+       }
+
+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' 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>
+<tr><td align='left' width='40%'></td><td align='left'>on <input type='radio' name='GREEN' value='on' $checked{'GREEN'}{'on'} />/
+                                                                                                                                       <input type='radio' name='GREEN' value='off' $checked{'GREEN'}{'off'} /> off |
+                                                                                                                                       <font size='2' color='$Header::colourgreen'><b>   $Lang::tr{'green'}  -  $netsettings{'GREEN_DEV'}</b></font></td></tr>
+END
+;
+
+if (&Header::blue_used())
+       {
+       print <<END
+       <tr><td align='left' width='40%'></td><td align='left'>on <input type='radio' name='BLUE' value='on' $checked{'BLUE'}{'on'} />/
+                                                                                                                                               <input type='radio' name='BLUE' value='off' $checked{'BLUE'}{'off'} /> off |
+                                                                                                                                               <font size='2' color='$Header::colourblue'><b>   $Lang::tr{'wireless'}  -  $netsettings{'BLUE_DEV'}</b></font></td></tr>
+END
+;
+       }
+
+if (&Header::orange_used())
+       {
+       print <<END
+       <tr><td align='left' width='40%'></td><td align='left'>on <input type='radio' name='ORANGE' value='on' $checked{'ORANGE'}{'on'} />/
+                                                                                                                                               <input type='radio' name='ORANGE' value='off' $checked{'ORANGE'}{'off'} /> off |
+                                                                                                                                               <font size='2' color='$Header::colourorange'><b>   $Lang::tr{'dmz'}  -  $netsettings{'ORANGE_DEV'}</b></font></td></tr>
+END
+;
+       }
 
-&Header::openbox('100%', 'center', 'Samba');
 print <<END
-        <hr>
-        <table width='500px' cellspacing='0'><br>
-END
-;
-        if ( $message ne "" ) {
-                print "<tr><td colspan='2' align='left'><font color='red'>$message</font>";
-        }
-print <<END        
-        <tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>Alle Dienste</b></td></tr>
-        </table><table width='500px' cellspacing='0'>
-END
-;
-        my $key = '';
-        foreach $key (sort keys %servicenames)
-        {
-                print "<tr><td align='left'>$key";
-                my $shortname = $servicenames{$key};
-                my $status = &isrunning($shortname);
-                print "$status</td>";
-                print <<END
-                        <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                <input type='hidden' name='ACTION' value='restart $shortname'>
-                                <input type='image' src='/images/reload.gif'>
-                        </form></td>
-END
-;
-        }
-        print <<END
-                <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                <table width='500px' cellspacing='0'><br>
-                <tr><td colspan='2' align='center'>
-                <input type='submit' name='ACTION' value='Start' /> 
-                <input type='submit' name='ACTION' value='Stop' /> 
-                <input type='submit' name='ACTION' value='$Lang::tr{'restart'}' />
-                </td></tr></form></table>
-        
-        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-        <table width='500px' cellspacing='0'><br>
-        <tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>Basisoptionen</b></td></tr>
-        <tr><td align='left'>Workgroup:</td><td><input type='text' name='WORKGRP' value='$sambasettings{'WORKGRP'}' size="30"></td></tr>
-        <tr><td align='left'>NetBIOS-Name:</td><td><input type='text' name='NETBIOSNAME' value='$sambasettings{'NETBIOSNAME'}' size="30"></td></tr>
-        <tr><td align='left'>Server-String:</td><td><input type='text' name='SRVSTRING' value='$sambasettings{'SRVSTRING'}' size="30"></td></tr>
-        <tr><td align='left'>Interfaces:</td><td><input type='checkbox' name='VPN' $checked{'VPN'}{'on'}><font size='2' color='$Header::colourovpn'><b>   OpenVpn  -  $ovpnsettings{'DDEVICE'}</td></tr>
-        <tr><td align='left'></td><td><input type='checkbox' name='GREEN' $checked{'GREEN'}{'on'}><font size='2' color='$Header::colourgreen'><b>   $Lang::tr{'green'}  -  $netsettings{'GREEN_DEV'}</td></tr>
-END
-;
-         if (&Header::blue_used()){
-         print <<END
-         <tr><td align='left'></td><td><input type='checkbox' name='BLUE' $checked{'BLUE'}{'on'}><font size='2' color='$Header::colourblue'><b>   $Lang::tr{'wireless'}  -  $netsettings{'BLUE_DEV'}</td></tr>
-END
-;
-                                    }
-         if (&Header::orange_used()){
-         print <<END
-         <tr><td align='left'></td><td><input type='checkbox' name='ORANGE' $checked{'ORANGE'}{'on'}><font size='2' color='$Header::colourorange'><b>   $Lang::tr{'dmz'}  -  $netsettings{'ORANGE_DEV'}</td></tr>
-END
-;
-                                    }
-        print <<END
-        <tr><td align='center'>weitere</td><td><input type='text' name='OTHERINTERFACES' value='$sambasettings{'OTHERINTERFACES'}' size="30"></td></tr>
-        <tr><td align='left'><br></td><td></td></tr>
-        <tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>Sicherheitsoptionen</b></td></tr>
-        <tr><td align='left'>Security:</td><td><select name='SECURITY'>
-                    <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>
-                    <option value='server' $selected{'SECURITY'}{'server'}>Server</option>
-                    
-                    </select></td></tr>
-        <tr><td align='left'>Map to guest:</td><td><select name='MAPTOGUEST'>
-                    <option value='Never' $selected{'MAPTOGUEST'}{'Never'}>Never</option>
-                    <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='${Header::table1colour}'><td colspan='2' align='left'><b>Browsingoptionen</b></td></tr>
-        <tr><td align='left'>OS Level:</td><td><input type='text' name='OSLEVEL' value='$sambasettings{'OSLEVEL'}' size="30"></td></tr>
-        <tr><td align='left'><br></td><td></td></tr>        
-        <tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>WINS-Optionen</b></td></tr>
-        <tr><td align='left'>WINS-Server:</td><td><input type='text' name='WINSSRV' value='$sambasettings{'WINSSRV'}' size="30"></td></tr>
-        <tr><td align='left'>WINS-Support:</td><td>on <input type='radio' name='WINSSUPPORT' value='on' $checked{'WINSSUPPORT'}{'on'}>/
-                                                        <input type='radio' name='WINSSUPPORT' value='off' $checked{'WINSSUPPORT'}{'off'}> off</td></tr>
-        <tr><td colspan='2' align='center'><input type='submit' name='ACTION' value=$Lang::tr{'save'}></td></tr>
-        </table>
-        </form>
+<tr><td align='center' width='40%'>$Lang::tr{'more'}</td><td align='left'><input type='text' name='OTHERINTERFACES' value='$sambasettings{'OTHERINTERFACES'}' 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='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>
+                                                                                                                                                               <option value='server' $selected{'SECURITY'}{'server'}>Server</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='Never' $selected{'MAPTOGUEST'}{'Never'}>Never</option>
+                                                                                                                                                                               <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>
+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{'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')
+       {
+       print <<END
+<tr><td align='left' width='40%'>$Lang::tr{'local master'}</td><td align='left'>on <input type='radio' name='LOCALMASTER' value='on' $checked{'LOCALMASTER'}{'on'} />/
+                                                                                                                                                                                       <input type='radio' name='LOCALMASTER' value='off' $checked{'LOCALMASTER'}{'off'} /> off</td></tr>
+<tr><td align='left' width='40%'>$Lang::tr{'domain master'}</td><td align='left'>on <input type='radio' name='DOMAINMASTER' value='on' $checked{'DOMAINMASTER'}{'on'} />/
+                                                                                                                                                                                               <input type='radio' name='DOMAINMASTER' value='off' $checked{'DOMAINMASTER'}{'off'} /> off</td></tr>
+<tr><td align='left' width='40%'>$Lang::tr{'prefered master'}</td><td align='left'>on <input type='radio' name='PREFERREDMASTER' value='on' $checked{'PREFERREDMASTER'}{'on'} />/
+                                                                                                                                                                                                       <input type='radio' name='PREFERREDMASTER' value='off' $checked{'PREFERREDMASTER'}{'off'} /> off</td></tr>
+END
+;
+       }
+
+if ($sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'on')
+       {
+       print <<END
+       <tr><td align='left'><br /></td><td></td></tr>
+       <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'pdc options'}</b></td></tr>
+       <tr><td align='left'><br /></td><td></td></tr>
+       <tr><td colspan='2' align='center'><textarea name="PDCOPTIONS" cols="50" rows="15" Wrap="off">$PDCOPTIONS</textarea></td></tr>
+END
+;
+       }
+       
+       if ( -e "/var/ipfire/cups/enable")
+       {
+       print <<END
+       <tr><td align='left'><br /></td><td></td></tr>
+       <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'printing options'}</b></td></tr>
+       <tr><td align='left' width='40%'>$Lang::tr{'load printer'}</td><td align='left'><input type='text' name='LOADPRINTERS' value='$sambasettings{'LOADPRINTERS'}' size="30" /></td></tr>
+       <tr><td align='left' width='40%'>$Lang::tr{'printing'}</td><td align='left'><input type='text' name='PRINTING' value='$sambasettings{'PRINTING'}' size="30" /></td></tr>
+       <tr><td align='left' width='40%'>$Lang::tr{'printcap name'}</td><td align='left'><input type='text' name='PRINTCAPNAME' value='$sambasettings{'PRINTCAPNAME'}' size="30" /></td></tr>
+END
+;
+       }
+
+print <<END
+</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='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>
+</table>
+END
+;
+
+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>
+       </table>
 END
 ;
+       }
+
 &Header::closebox();
 
 ############################################################################################################################
-########################################## Benutzerverwaltung für Usersecurity #############################################
+########################################## Benutzerverwaltung fr Usersecurity #############################################
 
 if ($sambasettings{'SECURITY'} eq 'user')
-{
-&Header::openbox('100%', 'center', 'accounting - user Security');
+       {
+       if ($sambasettings{'DOMAINMASTER'} eq 'off')
+               {
+               &Header::openbox('100%', 'center', $Lang::tr{'accounting user nonpdc'});
+               }
+       else
+               {
+               &Header::openbox('100%', 'center', $Lang::tr{'accounting user pdc'});
+               }
+       print <<END
+       <a name="$Lang::tr{'accounting'}"</a>
+       <br />
+       <table 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>
+END
+;
 
-print <<END
-        <hr>        
-        <table width='500px' cellspacing='0'><br>
-        <tr><td colspan='6' align='left'>
-        <tr><td bgcolor='${Header::table1colour}' colspan='6' align='left'><b>Benutzerverwaltung</b>
-        <tr><td><u>Benutzername</u></td><td><u>Passwort</u></td><td><u>Status</u></td><td colspan='3' width="5"><u>Optionen</u></td></tr>
-END
-;
-
-        system('/usr/local/bin/sambactrl readsmbpasswd');
-        open(FILE, "</var/ipfire/samba/private/smbpasswd") or die "Can't read user file: $!";
-        flock (FILE, 2);
-        @user = <FILE>;
-        close(FILE);
-        system('/usr/local/bin/sambactrl locksmbpasswd');
-        foreach $userentry (sort @user)
-        {
-        @userline = split( /\:/, $userentry );
-        print <<END
-        <tr><td align='left'>$userline[0]</td><td>
-END
-;
-        if ($userline[2] =~ m/N/){
-        print <<END
-        nicht gesetzt</td><td>
-END
-;
-        }else{
-        print <<END
-        gesetzt</td><td>
-END
-;
-        }
-        if ($userline[2] =~ m/D/){
-        print <<END
-        aktiv</td>
-        <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                        <input type='hidden' name='NAME' value='$userline[0]'>
-                                        <input type='hidden' name='ACTION' value='userdisable'>
-                                        <input type='image' alt='Deaktivieren' src='/images/off.gif'>
-                                </form></td>
-END
-;
-        }else{
-        print <<END
-        inaktiv</td>
-        <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                        <input type='hidden' name='NAME' value='$userline[0]'>
-                                        <input type='hidden' name='ACTION' value='userenable'>
-                                        <input type='image' alt='Aktivieren' src='/images/on.gif'>
-                                </form></td>
-END
-;
-        }
-        print <<END
-        <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                <input type='hidden' name='NAME' value='$userline[0]'>
-                                <input type='hidden' name='ACTION' value='userchangepw'>
-                                <input type='image' alt='Bearbeiten' src='/images/edit.gif'>
-                        </form></td>
-        <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                                <input type='hidden' name='NAME' value='$userline[0]'>
-                                <input type='hidden' name='ACTION' value='userdelete'>
-                                <input type='image' alt='Loeschen' src='/images/delete.gif'>
-                        </form></td>
-        </td></tr>
-END
-;
-        }
-        print <<END
-        </table>
-        <table width='50px' cellspacing='0'><br>
-        <tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                               <input type='hidden' name='ACTION' value='useradd'>
-                               <input type='image' alt='Benutzer anlegen' src='/images/add.gif'></form></td>
-            <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                               <input type='hidden' name='ACTION' value='usercaption'>
-                               <input type='image' alt='Legende' src='/images/info.gif'></form>
-        </td><tr>
-        </table>
-END
-;
-if ($sambasettings{'ACTION'} eq 'usercaption')
-{
-        print <<END
-        <table width='500px' cellspacing='0'><br>
-        <tr><td><b>Legende:</b></td></tr>
-        <tr><td><img src='/images/add.gif'>Benutzer neu anlegen</td></tr>
-        <tr><td><img src='/images/on.gif'>Benutzer aktivieren</td></tr>
-        <tr><td><img src='/images/off.gif'>Benutzer deaktivieren</td></tr>
-        <tr><td><img src='/images/edit.gif'>Passwort wechseln</td></tr>
-        <tr><td><img src='/images/delete.gif'>Benutzer loeschen</td></tr>
-        </table>
+       if ($sambasettings{'DOMAINMASTER'} eq 'off')
+               {
+               print "<td></td>";
+               }
+       else
+               {
+               print "<td align='left'><u>$Lang::tr{'type'}</u></td>";
+               }
+
+       print "<td align='left'><u>$Lang::tr{'status'}</u></td><td colspan='3' width='5%' align='center'><u>$Lang::tr{'options'}</u></td></tr>";
+       system('/usr/local/bin/sambactrl readsmbpasswd');
+       open(FILE, "<${General::swroot}/samba/private/smbpasswd") or die "Can't read user file: $!";
+       @user = <FILE>;
+       close(FILE);
+       system('/usr/local/bin/sambactrl locksmbpasswd');
+       
+       my $lines = 0;
+       
+       foreach $userentry (sort @user)
+               {
+               @userline = split( /\:/, $userentry );
+    if ($lines % 2) {print "<tr bgcolor='$color{'color20'}'>";} else {print "<tr bgcolor='$color{'color22'}'>";}
+               print "<td align='left'>$userline[0]</td><td align='left'>";
+               if ($userline[4] =~ /N/)
+                       {
+                       print "$Lang::tr{'not set'}</td><td align='left'>";
+                       }
+               else
+                       {
+                       print "$Lang::tr{'set'}</td><td align='left'>";
+                       }
+
+               if ($sambasettings{'DOMAINMASTER'} eq 'off')
+                       {
+                       print "</td><td align='left'>";
+                       }
+               else
+                       {
+                       if ($userline[0] =~ /\$/)
+                               {
+                               print "$Lang::tr{'pc'}</td><td align='left'>";
+                               }
+                       else
+                               {
+                               print "$Lang::tr{'user'}</td><td align='left'>";
+                               }
+                       }
+
+               if ($userline[4] =~ /D/)
+                       {
+                       print <<END
+                       $Lang::tr{'inactive'}</td>
+                       <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
+                                       <input type='hidden' name='NAME' value='$userline[0]' />
+                                       <input type='hidden' name='ACTION' value='smbuserenable' />
+                                       <input type='image' alt='$Lang::tr{'activate'}' title='$Lang::tr{'activate'}' src='/images/off.gif' />
+                       </form></td>
+END
+;
+                       }
+               else
+                       {
+                       print <<END
+                       $Lang::tr{'active'}</td>
+                       <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
+                                       <input type='hidden' name='NAME' value='$userline[0]' />
+                                       <input type='hidden' name='ACTION' value='smbuserdisable' />
+                                       <input type='image' alt='$Lang::tr{'deactivate'}' title='$Lang::tr{'deactivate'}' src='/images/on.gif' />
+                       </form></td>
+END
+;
+                       }
+
+               if ($userline[0] =~ /\$/)
+                       {
+                       print "<td></td>";
+                       }
+               else
+                       {
+                       print <<END
+                       <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
+                                       <input type='hidden' name='NAME' value='$userline[0]' />
+                                       <input type='hidden' name='ACTION' value='userchangepw' />
+                                       <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
+                       </form></td>
+END
+;
+                       }
+
+                       if ($sambasettings{'DOMAINMASTER'} eq 'on' && $userline[0] =~ /\$/)
+                               {
+                               print <<END
+                               <td><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
+                                               <input type='hidden' name='NAME' value='$userline[0]' />
+                                               <input type='hidden' name='ACTION' value='userdelete' />
+                                               <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/network-error.png' />
+                                               </form></td></tr>
+END
+;
+                               }
+                       else
+                               {
+                               print <<END
+                               <td><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
+                                               <input type='hidden' name='NAME' value='$userline[0]' />
+                                               <input type='hidden' name='ACTION' value='userdelete' />
+                                               <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-option-remove.png' />
+                               </form></td></tr>
+END
+;
+                               }
+               $lines++;
+               }
+       print <<END
+       </table>
+       <br />
+       <table width='10%' cellspacing='0'>
+       <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
 ;
-}
 
-if ($sambasettings{'ACTION'} eq 'userchangepw')
-{       
-        my $username = "$sambasettings{'NAME'}";
-        my $password = 'samba';
-        print <<END
-        <hr>
-        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-        <table width='500px' cellspacing='0'><br>
-        <tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>Passwort wechseln</b></td></tr>
-        <tr><td align='left'>Benutzername</td><td><input type='text' name='USERNAME' value='$username' size="30"></td></tr>
-        <tr><td align='left'>Passwort</td><td><input type='password' name='PASSWORD' value='$password' size="30"></td></tr>
-        <tr><td colspan='2' align='center'><input type='submit' name='ACTION' value='smbchangepw'></td></tr></form>
-        </table>
+       if ($sambasettings{'DOMAINMASTER'} eq 'on')
+               {
+               print <<END
+               <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
+                                                                                               <input type='hidden' name='ACTION' value='pcadd' />
+                                                                                               <input type='image' alt='$Lang::tr{'pc add'}' title='$Lang::tr{'pc add'}' src='/images/network.png' /></form>
 END
 ;
-}
-if ($sambasettings{'ACTION'} eq 'useradd')
-{
-        my $username = "User";
-        my $password = 'samba';
-        print <<END
-        <hr>
-        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-        <table width='500px' cellspacing='0'><br>
-        <tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>Benutzer neu anlegen</b></td></tr>
-        <tr><td align='left'>Benutzername</td><td><input type='text' name='USERNAME' value='$username' size="30"></td></tr>
-        <tr><td align='left'>Passwort</td><td><input type='password' name='PASSWORD' value='$password' size="30"></td></tr>
-        <tr><td colspan='2' align='center'><input type='submit' name='ACTION' value='smbuseradd'></td></tr></form>
-        </table>
+               }
+       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>
+       </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'}";
+               my $password = 'samba';
+               print <<END
+               <br />
+               <form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
+               <table width='95%' 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 /></td></tr>
+               <tr><td align='left'>$Lang::tr{'password'}</td><td><input type='password' name='PASSWORD' value='$password' size='30' /></td></tr>
+               <tr><td colspan='2' align='center'><input type='hidden' name='ACTION' value='smbchangepw' />
+                                                                                                                                                               <input type='image' alt=$Lang::tr{'save'} title=$Lang::tr{'save'} src='/images/media-floppy.png' /></td></tr>
+               </table>
+               </form>
+END
+;
+               }
+
+       if ($sambasettings{'ACTION'} eq 'useradd')
+               {
+               my $username = "user";
+               my $password = "samba";
+               chomp $username;
+               $username=~s/\s//g;
+               chomp $password;
+               $password=~s/\s//g;
+               print <<END
+               <br />
+               <form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
+               <table width='95%' 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>
+               <tr><td align='left'>$Lang::tr{'unix group'}</td><td><input type='text' name='GROUP' value='sambauser' size='30' /></td></tr>
+               <tr><td align='left'>$Lang::tr{'unix shell'}</td><td><input type='text' name='SHELL' value='/bin/false' size='30' /></td></tr>
+               <tr><td colspan='2' align='center'><input type='hidden' name='ACTION' value='smbuseradd' />
+                                                                                                                                                               <input type='image' alt=$Lang::tr{'save'} title=$Lang::tr{'save'} src='/images/media-floppy.png' /></td></tr>
+               </table>
+               </form>
+END
+;
+               }
+
+       if ($sambasettings{'ACTION'} eq 'pcadd')
+               {
+               my $pcname = "client\$";
+               chomp $pcname;
+               $pcname=~s/\s//g;
+               print <<END
+               <br />
+               <form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
+               <table width='95%' 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>
+               <tr><td align='left'>$Lang::tr{'unix shell'}</td><td><input type='text' name='SHELL' value='/bin/false' size='30' /></td></tr>
+               <tr><td colspan='2' align='center'><input type='hidden' name='ACTION' value='smbpcadd' />
+                                                                                                                                                               <input type='image' title=$Lang::tr{'save'} alt=$Lang::tr{'save'} src='/images/media-floppy.png' /></td></tr>
+               </table>
+               </form>
+END
+;
+               }
 
 &Header::closebox();
 }
 
 ############################################################################################################################
 ############################################### Verwalten von Freigaben ####################################################
-        
-&Header::openbox('100%', 'center', 'Shares');
+
+&Header::openbox('100%', 'center', $Lang::tr{'shares'});
+
+my %shares =  config("${General::swroot}/samba/shares");
+
 
 print <<END
-        <hr>
-        <table width='500px' cellspacing='0'><br>
-        <tr><td bgcolor='${Header::table1colour}' colspan='3' align='left'><b>Shareverwaltung</b>
-        <tr><td><u>Names des Shares</u></td><td colspan='2' width="5"><u>Optionen</u></td></tr>
-END
-;
-
-        
-        foreach $shareentry (sort @Shares)
-        {
-        print <<END
-        <tr><td align='left'>$shareentry</td>
-            <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                 <input type='hidden' name='NAME' value='$shareentry'>
-                 <input type='hidden' name='ACTION' value='sharechange'>
-                 <input type='image' alt='Bearbeiten' src='/images/edit.gif'>
-            </td></form>
-            <td><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                 <input type='hidden' name='NAME' value='$shareentry'>
-                 <input type='hidden' name='ACTION' value='smbsharedel'>
-                 <input type='image' alt='Loeschen' src='/images/delete.gif'>
-            </td></form><tr>
-END
-;
-        }
-        print <<END
-        </table>
-
-        <table width='50px' cellspacing='0'><br>
-        <tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                               <input type='hidden' name='ACTION' value='shareadd'>
-                               <input type='image' alt='neuen Share anlegen' src='/images/add.gif'></form></td>
-            <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                               <input type='hidden' name='ACTION' value='sharecaption'>
-                               <input type='image' alt='Legende' src='/images/info.gif'></form>
-        </td><tr>
-        </table>
+<a name="$Lang::tr{'manage shares'}"</a>
+<br />
+<table width='95%' cellspacing='0'>
+<tr><td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'manage shares'}</b>
+<tr><td align='left'><u>$Lang::tr{'sharename'}</u></td><td colspan='2' width="5%" align='center'><u>$Lang::tr{'options'}</u></td></tr>
 END
 ;
+
+my @Shares = keys(%shares);
+my $lines = 0;
+
+foreach my $shareentry (sort @Shares)
+       {
+       chomp $shareentry;
+       if ($lines % 2) {print "<tr bgcolor='$color{'color20'}'>";} else {print "<tr bgcolor='$color{'color22'}'>";}
+       print <<END
+       <td align='left'>$shareentry</td>
+       <td><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><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++;
+       }
+
+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='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' />
+                                                                                               </form></td>
+</tr>
+</table>
+END
+;
+
 if ($sambasettings{'ACTION'} eq 'sharecaption')
-{
-        print <<END
-        <table width='500px' cellspacing='0'><br>
-        <tr><td><b>Legende:</b></td></tr>
-        <tr><td><img src='/images/add.gif'>Share neu anlegen</td></tr>
-        <tr><td><img src='/images/edit.gif'>Share bearbeiten</td></tr>
-        <tr><td><img src='/images/delete.gif'>Share loeschen</td></tr>
-        </table>
+       {
+       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/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
 ;
-}
+       }
 
 if ($sambasettings{'ACTION'} eq 'shareadd' || $sambasettings{'ACTION'} eq 'optioncaption' )
-{
-        print <<END
-        <hr>
-        <table width='500px' cellspacing='0'><br>
-        <tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>neuen Share anlegen</b></td></tr>
-        <tr><td colspan='2' align='center'></td></tr>
-        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
       <tr><td colspan='2' align='center'>Anzeige der Optionen fuer Shares<input type='hidden' name='ACTION' value='optioncaption'>
-                <input type='image' alt='Legende' src='/images/info.gif'></td></tr></form>
-        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-        <tr><td colspan='2' align='center'><textarea name="SHAREOPTION" cols="50" rows="15" Wrap="off">$defaultoption</textarea></td></tr>
-        </table>
-        <table width='50px' cellspacing='0'><br>
-        <tr><td align='center'><input type='submit' name='ACTION' value='smbshareadd'></td></tr></form>
-        </table>
+       {
+       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>
+       <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 />
+       <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>
+       </table>
 END
 ;
-}
+       }
 
 if ($sambasettings{'ACTION'} eq 'sharechange' || $sambasettings{'ACTION'} eq 'optioncaption2' )
+       {
+       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'>$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 />
+       <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>
+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'}";
+       save("shares");
+       my $shares = config("${General::swroot}/samba/shares");
+       }
+if ($sambasettings{'ACTION'} eq 'smbsharedel')
+       {
+       delete $shares{$sambasettings{'NAME'}};
+       save("shares");
+       my %shares = config("${General::swroot}/samba/shares");
+       }
+if ($sambasettings{'ACTION'} eq 'smbsharechange')
+       {
+       $shares{$sambasettings{'NAME'}} = $sambasettings{'SHAREOPTION'};
+       save("shares");
+       my %shares = config("${General::swroot}/samba/shares");
+       }
+
+&Header::closebox();
+
+############################################################################################################################
+################################################ Verwalten von Druckern ####################################################
+
+my %printer =  config("${General::swroot}/samba/printer");
+
+if ( -e "/var/ipfire/cups/enable")
 {
-        my $sharename = "$sambasettings{'NAME'}";
-        chomp $sharename;
-        $sharename=~s/\s//g;
-
-        for(my $i = 0; $i <= $#Shares; $i++)
-         {
-          chomp $Shares[$i];
-          $Shares[$i]=~s/\s//g;
-          if ( "$Shares[$i]" eq "$sharename" )
-           {
-            my $Zeilenbegin = $Zeilen[$i+1]-2;
-            my $Zeilenende =  $Zeilen[$i+1]-$Zeilen[$i];
-            if ( $Zeilen[$i] eq $Zeilen[$#Shares] )
-             {$Zeilenende =  $EOF-$Zeilen[$#Shares]+1;$Zeilenbegin = $EOF-$Zeilen[$#Shares]; $shareoption = qx(tail -$Zeilenende $sharefile | head -$Zeilenbegin);}
-            else{$shareoption = qx(head -$Zeilenbegin $sharefile | tail -$Zeilenende);}
-           }
-         }
-                 
-        print <<END
-        <hr>
-        <table width='500px' cellspacing='0'><br>
-        <tr bgcolor='${Header::table1colour}'><td colspan='2' align='left'><b>Share bearbeiten</b></td></tr>
-        <tr><td colspan='2' align='center'></td></tr>
-        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-        <tr><td colspan='2' align='center'>Anzeige der Optionen fuer Shares<input type='hidden' name='ACTION' value='optioncaption2'>
-                <input type='image' alt='Legende' src='/images/info.gif'></td></tr></form>
-        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-        <tr><td colspan='2' align='center'><textarea name="SHAREOPTION" cols="50" rows="15" Wrap="off">$shareoption</textarea></td></tr>
-        </table>
-        <table width='50px' cellspacing='0'><br>
-        <tr><td align='center'>
-                                <input type='hidden' name='NAME' value='$sharename'>
-                                <input type='submit' name='ACTION' value='smbsharechange'></td></tr></form>
-        </table>
+&Header::openbox('100%', 'center', $Lang::tr{'printer'});
+
+my @Printers = keys(%printer);
+print <<END
+<a name="$Lang::tr{'manage printers'}"</a>
+<br />
+<table width='95%' cellspacing='0'>
+<tr><td bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'manage printers'}</b>
+<tr><td align='left'><u>$Lang::tr{'printername'}</u></td><td colspan='2' width="5%" align='center'><u>$Lang::tr{'options'}</u></td></tr>
 END
 ;
+foreach my $printerentry (sort @Printers)
+       {
+       chomp $printerentry;
+       print <<END
+       <tr><td align='left'>$printerentry</td>
+       <td><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage printers'}'>
+                       <input type='hidden' name='NAME' value='$printerentry' />
+                       <input type='hidden' name='ACTION' value='printerchange' />
+                       <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
+       </form></td>
+       <td><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage printers'}'>
+                       <input type='hidden' name='NAME' value='$printerentry' />
+                       <input type='hidden' name='ACTION' value='smbprinterdel' />
+                       <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' />
+       </form></td></tr>
+END
+;
+       }
+print <<END
+</table>
+<br />
+<table width='10%' cellspacing='0'>
+<tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage printers'}'>
+                                                                                               <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' />
+                                                                                               </form></td>
+</tr>
+</table>
+END
+;
+
+if ($sambasettings{'ACTION'} eq 'printeradd' || $sambasettings{'ACTION'} eq 'printercaption' )
+       {
+       print <<END
+       <br />
+       <table width='95%' cellspacing='0'>
+       <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 />
+       <table width='10%' cellspacing='0'>
+       <tr><td align='center'><input type='hidden' name='ACTION' value='smbprinteradd' />
+                                                                                                       <input type='image' alt='$Lang::tr{'add share'}' title='$Lang::tr{'add share'}' src='/images/media-floppy.png' /></td></tr>
+       </table>
+       </form>
+END
+;
+       }
+       
+if ($sambasettings{'ACTION'} eq 'printerchange' || $sambasettings{'ACTION'} eq 'printercaption2' )
+       {
+       my $printeroption = $printer{$sambasettings{'NAME'}};
+       print <<END
+       <br />
+       <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 />
+       <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='smbprinterchange' /></form></td></tr>
+       </table>
+END
+;
+       }
+
+if ($sambasettings{'ACTION'} eq 'smbprinteradd')
+       {
+       $printer{'xvx'}= "$sambasettings{'PRINTEROPTION'}";
+       save("printer");
+       my %printer = config("${General::swroot}/samba/printer");
+       }
+
+if ($sambasettings{'ACTION'} eq 'smbprinterdel')
+       {
+       delete $printer{$sambasettings{'NAME'}};
+       save("printer");
+       my %printer = config("${General::swroot}/samba/printer");
+       }
+
+if ($sambasettings{'ACTION'} eq 'smbprinterchange')
+       {
+       $printer{$sambasettings{'NAME'}} = $sambasettings{'PRINTEROPTION'};
+       save("printer");
+       my %printer = config("${General::swroot}/samba/printer");
+       }
+
+&Header::closebox();
 }
 
-if ($sambasettings{'ACTION'} eq 'optioncaption' || $sambasettings{'ACTION'} eq 'optioncaption2')
-{
-        print <<END
-        <table width='500px' cellspacing='0'><br>
-        <tr><td><b>Legende:</b></td></tr>
-        <tr><td><u>Option</u></td><td><u>Bedeutung</u> / <u>Beispiel</u></td></tr>
-        <tr><td>comment</td><td>Kommentar</td></tr>
-        <tr><td></td><td>comment = Mein neues Share</td></tr>
-        <tr><td><br></td><td></td></tr>
-        <tr><td>path</td><td>Pfad zum Verzeichnis</td></tr>
-        <tr><td></td><td>path = /share/neu</td></tr>
-        <tr><td><br></td><td></td></tr>
-        <tr><td>writeable</td><td>Verzeichnis schreibbar</td></tr>
-        <tr><td></td><td>writeable = yes</td></tr>
-        <tr><td><br></td><td></td></tr>
-        <tr><td>browseable</td><td>sichtbar in Verzeichnisliste</td></tr>
-        <tr><td></td><td>browsable = yes</td></tr>
-        <tr><td><br></td><td></td></tr>
-        <tr><td>user</td><td>Besitzer der Freigabe</td></tr>
-        <tr><td></td><td>user = samba</td></tr>
-        <tr><td><br></td><td></td></tr>
-        <tr><td>valid users</td><td>Liste der Zugriffsberechtigten</td></tr>
-        <tr><td></td><td>valid users = samba, user1</td></tr>
-        <tr><td><br></td><td></td></tr>
-        <tr><td>write list</td><td>Liste der Schreibberechtigten</td></tr>
-        <tr><td></td><td>write list = samba</td></tr>
-        <tr><td><br></td><td></td></tr>
-        <tr><td>read list</td><td>Liste der nur Leseberechtigten</td></tr>
-        <tr><td></td><td>read list = user1</td></tr>
-        <tr><td><br></td><td></td></tr>
-        <tr><td>admin users</td><td>Liste der Benutzer mit SuperUser Rechten</td></tr>
-        <tr><td></td><td>admin users = user1</td></tr>
-        <tr><td><br></td><td></td></tr>
-        <tr><td>invalid users</td><td>Liste der Benutzer denen der Zugriff verweigert wird</td></tr>
-        <tr><td></td><td>invalid users = user2</td></tr>
-        <tr><td><br></td><td></td></tr>
-        <tr><td>force user</td><td>Standartbenutzer fuer alle Dateien</td></tr>
-        <tr><td></td><td>force user = samba</td></tr>
-        <tr><td><br></td><td></td></tr>
-        <tr><td>directory mask</td><td>UNIX Verzeichnisberchtigung beim Erzeugen</td></tr>
-        <tr><td></td><td>directory mask = 0777</td></tr>
-        <tr><td><br></td><td></td></tr>
-        <tr><td>create mask</td><td>UNIX Dateiberchtigung beim Erzeugen</td></tr>
-        <tr><td></td><td>create mask = 0777</td></tr>
-        <tr><td><br></td><td></td></tr>
-        <tr><td>guest ok</td><td>Annonymer Zugriff</td></tr>
-        <tr><td></td><td>guest ok = yes</td></tr>
-        </table>
+############################################################################################################################
+############################################### Anzeige des Sambastatus ####################################################
+
+&Header::openbox('100%', 'center', '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'>$Status</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();
 
 ############################################################################################################################
-############################################ Subfunktion für Sambadienste ##################################################
+############################################ Subfunktion fr Sambadienste ###################################################
 
-sub isrunning
+sub config
 {
-        my $cmd = $_[0];
-        my $status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td>";
-        my $pid = '';
-        my $testcmd = '';
-        my $exename;
-
-        $cmd =~ /(^[a-z]+)/;
-        $exename = $1;
-
-        if (open(FILE, "/var/run/${cmd}.pid"))
-        {
-                $pid = <FILE>; chomp $pid;
-                close FILE;
-                if (open(FILE, "/proc/${pid}/status"))
-                {
-                        while (<FILE>)
-                        {
-                                if (/^Name:\W+(.*)/) {
-                                        $testcmd = $1; }
-                        }
-                        close FILE;
-                        if ($testcmd =~ /$exename/)
-                        {
-                                $status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td>";
-                        }
-                }
-        }
-
-        return $status;
-}
\ No newline at end of file
+my $file = shift;
+my @allarray = `grep -n '^\\[' $file`;
+my @linesarray = ();
+my @namearray = ();
+my %hash = ();
+my $options = ();
+my $EOF = qx(cat $file | wc -l);
+foreach my $allarrayentry (@allarray)
+ {
+ my @allarrayline = split( /\:/, $allarrayentry );
+ push(@linesarray,$allarrayline[0]);$allarrayline[1]=~s/\[//g;$allarrayline[1]=~s/\]//g;push(@namearray,$allarrayline[1]);
+ }
+       for(my $i = 0; $i <= $#namearray; $i++)
+               {
+               chomp $namearray[$i];
+               $namearray[$i]=~s/\[//g;$namearray[$i]=~s/\]//g;
+               if ( $i eq $#namearray )
+                       {
+                       my $lineend = $EOF-$linesarray[$i]+1;
+                       $options=qx(tail -$lineend $file);
+                       }
+               else
+                       {
+                       my $linestart = $EOF-$linesarray[$i]+1;
+                       my $lineend =  $linesarray[$i+1]-$linesarray[$i];
+                       $options=qx(tail -$linestart $file | head -$lineend);
+                       }
+               $hash{$namearray[$i]} = "$options";
+               #print"<pre>$namearray[$i]\n$options\n</pre>"; # enable only for debuging
+               }
+return(%hash);
+}
+
+sub save
+{
+my $smb = shift;
+open (FILE, ">${General::swroot}/samba/$smb") or die "Can't $smb settings $!";
+flock (FILE, 2);
+
+if ( $smb eq 'printer')
+       {while (my ($name, $option) = each %printer){chomp $option;$option =~ s/\r\n/\n/gi;$option =~ s/^\n//gi;$option =~ s/^\r//gi;$option =~ s/^.\n//gi;$option =~ s/^.\r//gi;print FILE "$option\n";}}
+
+if ( $smb eq 'shares')
+       {while (my ($name, $option) = each %shares){chomp $option;$option =~ s/\r\n/\n/gi;$option =~ s/^\n//gi;$option =~ s/^\r//gi;$option =~ s/^.\n//gi;$option =~ s/^.\r//gi;print FILE "$option\n";}        }
+
+close FILE;
+
+if ( -e "/var/ipfire/cups/enable")
+       {
+       if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdccups");}
+       else {system("/usr/local/bin/sambactrl smbsafeconfcups");}
+       }
+else
+       {
+       if ( $sambasettings{'SECURITY'} eq 'user' && $sambasettings{'DOMAINMASTER'} eq 'true' ){system("/usr/local/bin/sambactrl smbsafeconfpdc");}
+       else{system("/usr/local/bin/sambactrl smbsafeconf");}
+       }
+
+system("/usr/local/bin/sambactrl smbreload");
+refreshpage();
+}
+
+sub isrunning
+       {
+       my $cmd = $_[0];
+       my $status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td>";
+       my $pid = '';
+       my $testcmd = '';
+       my $exename;
+
+       $cmd =~ /(^[a-z]+)/;
+       $exename = $1;
+
+       if (open(FILE, "/var/run/${cmd}.pid"))
+               {
+               $pid = <FILE>; chomp $pid;
+               close FILE;
+               if (open(FILE, "/proc/${pid}/status"))
+                       {
+                       while (<FILE>)
+                               {
+                               if (/^Name:\W+(.*)/)
+                                       {
+                                       $testcmd = $1; 
+                                       }
+                               }
+                       close FILE;
+                       if ($testcmd =~ /$exename/)
+                               {
+                               $status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td>";
+                               }
+                       }
+               }
+       return $status;
+       }