my %cgisettings = ();
my %checked = ();
my %netsettings = ();
-my %ovpnsettings = ();
my %color = ();
my %mainsettings = ();
my $message = "";
my $errormessage = "";
-my @Logs = qx(ls /var/log/samba/);
-my $Log =$Lang::tr{'no log selected'};
-
-my $Status = qx(/usr/local/bin/sambactrl smbstatus);
-$Status=~s/\n/<br \/>/g;
-
my $userentry = "";
my @user = ();
my @userline = ();
my $userfile = "${General::swroot}/samba/private/smbpasswd";
my %selected= () ;
-my $defaultoption= "[Share]\npath = /var/ipfire/samba/share1\ncomment = Share - Public Access\nbrowseable = yes\nwriteable = yes\ncreate mask = 0777\ndirectory mask = 0777\npublic = yes\nforce user = samba";
-my $defaultprinter= "[Printer]\ncomment = Printer public\npath = /var/spool/cups\nprinting = sysvn\nprintcap = lpstat\npublic = yes\nwritable = no\nprintable = yes";
-my %printer = ();
-my %shares = ();
+my $defaultoption= "[My Share]\npath = \ncomment = Share - Public Access\nbrowseable = yes\nwriteable = yes\ncreate mask = 0644\ndirectory mask = 0755\npublic = yes\nforce user = samba";
+my %shares = &config("${General::swroot}/samba/shares");
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
-&General::readhash("${General::swroot}/ovpn/settings", \%ovpnsettings);
&General::readhash("${General::swroot}/main/settings", \%mainsettings);
&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
-my @ovpnnetwork = split(/\//,$ovpnsettings{'DOVPN_SUBNET'});
-my @ovpnip = split(/\./,$ovpnnetwork[0]);
-$ovpnip[3]=$ovpnip[3]+1;
-
-############################################################################################################################
-############################################# Samba Dienste fr Statusberprfung ##########################################
-
-my %servicenames = ('SMB Daemon' => 'smbd', 'NetBIOS Nameserver' => 'nmbd', 'Winbind Daemon' => 'winbindd');
-
-&Header::showhttpheaders();
-
############################################################################################################################
#################################### Initialisierung von Samba Variablen fr global Settings ###############################
-$sambasettings{'WORKGRP'} = 'homeip.net';
-$sambasettings{'NETBIOSNAME'} = 'IPFire';
-$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.x';
-$sambasettings{'INTERFACES'} = '';
-$sambasettings{'SECURITY'} = 'share';
-$sambasettings{'OSLEVEL'} = '33';
-$sambasettings{'GREEN'} = 'on';
-$sambasettings{'BLUE'} = 'off';
-$sambasettings{'ORANGE'} = 'off';
-$sambasettings{'VPN'} = 'off';
-$sambasettings{'WINSSRV'} = '';
-$sambasettings{'WINSSUPPORT'} = 'on';
+$sambasettings{'WORKGRP'} = uc($mainsettings{'DOMAINNAME'});
+$sambasettings{'ROLE'} = 'standalone';
$sambasettings{'REMOTEANNOUNCE'} = '';
$sambasettings{'REMOTESYNC'} = '';
-$sambasettings{'PASSWORDSYNC'} = 'off';
-$sambasettings{'OTHERINTERFACES'} = '127.0.0.1';
$sambasettings{'GUESTACCOUNT'} = 'samba';
$sambasettings{'MAPTOGUEST'} = 'Bad User';
-$sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2';
-$sambasettings{'SYSLOGLEVEL'} = '1';
-$sambasettings{'SYSLOGONLY'} = 'on';
-$sambasettings{'DOSCHARSET'} = 'CP850';
-$sambasettings{'UNIXCHARSET'} = 'UTF8';
-$sambasettings{'DISPLAYCHARSET'} = 'CP850';
-$sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_RCVBUF=819200 SO_SNDBUF=819200 SO_KEEPALIVE';
-$sambasettings{'WIDELINKS'} = 'on';
-$sambasettings{'UNIXEXTENSION'} = 'off';
-$sambasettings{'SMB2'} = 'on';
+$sambasettings{'ENCRYPTION'} = 'optional';
### 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();}
+# Hook to regenerate the configuration files.
+if ($ENV{"REMOTE_ADDR"} eq "") {
+ &writeconfiguration();
+ exit(0);
+}
-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::showhttpheaders();
+
+&Header::getcgihash(\%sambasettings);
+delete $sambasettings{'__CGI__'};delete $sambasettings{'x'};delete $sambasettings{'y'};
&Header::openpage('Samba', 1, '');
&Header::openbigbox('100%', 'left', '', $errormessage);
############################################################################################################################
############################################# Samba Rootskript aufrufe fr SU-Actions #######################################
-if ($sambasettings{'ACTION'} eq 'smbuserdisable'){system("/usr/local/bin/sambactrl smbuserdisable $sambasettings{'NAME'}");refreshpage();}
-if ($sambasettings{'ACTION'} eq 'smbuserenable'){system("/usr/local/bin/sambactrl smbuserenable $sambasettings{'NAME'}");refreshpage();}
-if ($sambasettings{'ACTION'} eq 'smbuseradd'){system("/usr/local/bin/sambactrl smbuseradd $sambasettings{'USERNAME'} $sambasettings{'PASSWORD'} $sambasettings{'GROUP'} $sambasettings{'SHELL'}");refreshpage();}
-if ($sambasettings{'ACTION'} eq 'smbpcadd'){system("/usr/local/bin/sambactrl smbpcadd $sambasettings{'PCNAME'} $sambasettings{'GROUP'} $sambasettings{'SHELL'}");refreshpage();}
-if ($sambasettings{'ACTION'} eq 'smbchangepw'){system("/usr/local/bin/sambactrl smbchangepw $sambasettings{'USERNAME'} $sambasettings{'PASSWORD'}");refreshpage();}
-if ($sambasettings{'ACTION'} eq 'smbrestart'){system("/usr/local/bin/sambactrl smbrestart");refreshpage();}
-if ($sambasettings{'ACTION'} eq 'smbstart'){system("/usr/local/bin/sambactrl smbstart");refreshpage();}
-if ($sambasettings{'ACTION'} eq 'smbstop'){system("/usr/local/bin/sambactrl smbstop");refreshpage();}
-if ($sambasettings{'ACTION'} eq 'smbreload'){system("/usr/local/bin/sambactrl smbreload");refreshpage();}
-if ($sambasettings{'ACTION'} eq 'globalresetyes')
- {
- system("/usr/local/bin/sambactrl smbglobalreset");
- $sambasettings{'WORKGRP'} = 'homeip.net';
- $sambasettings{'NETBIOSNAME'} = 'IPFire';
- $sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.x';
- $sambasettings{'INTERFACES'} = '';
- $sambasettings{'SECURITY'} = 'share';
- $sambasettings{'OSLEVEL'} = '65';
- $sambasettings{'GREEN'} = 'on';
- $sambasettings{'BLUE'} = 'off';
- $sambasettings{'ORANGE'} = 'off';
- $sambasettings{'VPN'} = 'off';
- $sambasettings{'WINSSRV'} = '';
- $sambasettings{'WINSSUPPORT'} = 'on';
- $sambasettings{'REMOTEANNOUNCE'} = '';
- $sambasettings{'REMOTESYNC'} = '';
- $sambasettings{'PASSWORDSYNC'} = 'off';
- $sambasettings{'OTHERINTERFACES'} = '127.0.0.1';
- $sambasettings{'GUESTACCOUNT'} = 'samba';
- $sambasettings{'MAPTOGUEST'} = 'Bad User';
- $sambasettings{'LOGLEVEL'} = '3 passdb:5 auth:5 winbind:2';
- $sambasettings{'SYSLOGLEVEL'} = '1';
- $sambasettings{'SYSLOGONLY'} = 'on';
- $sambasettings{'DOSCHARSET'} = 'CP850';
- $sambasettings{'UNIXCHARSET'} = 'UTF8';
- $sambasettings{'DISPLAYCHARSET'} = 'CP850';
-### Samba CUPS Variablen
- $sambasettings{'LOADPRINTERS'} = 'Yes';
- $sambasettings{'PRINTING'} = 'cups';
- $sambasettings{'PRINTCAPNAME'} = 'cups';
- $sambasettings{'PRINTERNAME'} = 'Printer';
-### Values that have to be initialized
- $sambasettings{'WIDELINKS'} = 'on';
- $sambasettings{'UNIXEXTENSION'} = 'off';
- $sambasettings{'ACTION'} = '';
- $sambasettings{'LOCALMASTER'} = 'off';
- $sambasettings{'DOMAINMASTER'} = 'off';
- $sambasettings{'PREFERREDMASTER'} = 'off';
- $sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_RCVBUF=819200 SO_SNDBUF=819200 SO_KEEPALIVE';
- $sambasettings{'WIDELINKS'} = 'on';
- $sambasettings{'UNIXEXTENSION'} = 'off';
- $sambasettings{'SMB2'} = 'on';
- $PDCOPTIONS = `cat ${General::swroot}/samba/pdc`;
- system("/usr/local/bin/sambactrl smbreload");
- refreshpage();
- }
-
+if ($sambasettings{'ACTION'} eq 'smbuserdisable'){system("/usr/local/bin/sambactrl smbuserdisable $sambasettings{'NAME'}");}
+if ($sambasettings{'ACTION'} eq 'smbuserenable'){system("/usr/local/bin/sambactrl smbuserenable $sambasettings{'NAME'}");}
+if ($sambasettings{'ACTION'} eq 'smbuseradd'){system("/usr/local/bin/sambactrl smbuseradd $sambasettings{'USERNAME'} $sambasettings{'PASSWORD'} $sambasettings{'GROUP'} $sambasettings{'SHELL'}");}
+if ($sambasettings{'ACTION'} eq 'smbchangepw'){system("/usr/local/bin/sambactrl smbchangepw $sambasettings{'USERNAME'} $sambasettings{'PASSWORD'}");}
+if ($sambasettings{'ACTION'} eq 'smbrestart'){system("/usr/local/bin/sambactrl smbrestart");}
+if ($sambasettings{'ACTION'} eq 'smbstart'){system("/usr/local/bin/sambactrl smbstart");}
+if ($sambasettings{'ACTION'} eq 'smbstop'){system("/usr/local/bin/sambactrl smbstop");}
+if ($sambasettings{'ACTION'} eq 'smbreload'){system("/usr/local/bin/sambactrl smbreload");}
if ($sambasettings{'ACTION'} eq 'join') {
$message .= &joindomain($sambasettings{'USERNAME'}, $sambasettings{'PASSWORD'});
}
-############################################################################################################################
-################################################ Sicherheitsabfrage für den Reset ##########################################
+if ($sambasettings{'ACTION'} eq 'smbshareadd') {
+ $shares{'xvx'} = $sambasettings{'SHAREOPTION'};
+ &save("shares");
-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
-;
+ # Reload configuration
+ %shares = config("${General::swroot}/samba/shares");
}
-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
-;
- }
+if ($sambasettings{'ACTION'} eq 'smbsharedel') {
+ delete $shares{$sambasettings{'NAME'}};
+ &save("shares");
+
+ # Reload configuration
+ %shares = config("${General::swroot}/samba/shares");
+}
+
+if ($sambasettings{'ACTION'} eq 'smbsharechange') {
+ $shares{$sambasettings{'NAME'}} = $sambasettings{'SHAREOPTION'};
+ &save("shares");
+
+ # Reload configuration
+ %shares = config("${General::swroot}/samba/shares");
+}
############################################################################################################################
########################################### Samba Benutzer oder PC l�chen #################################################
-if ($sambasettings{'ACTION'} eq 'userdelete'){system("/usr/local/bin/sambactrl smbuserdelete $sambasettings{'NAME'}");refreshpage();}
+if ($sambasettings{'ACTION'} eq 'userdelete'){system("/usr/local/bin/sambactrl smbuserdelete $sambasettings{'NAME'}");}
############################################################################################################################
##################################### Umsetzen der Werte von Checkboxen und Dropdowns ######################################
-if ($sambasettings{'ACTION'} eq $Lang::tr{'save'})
-{
-$sambasettings{'INTERFACES'} = '';
-if ($sambasettings{'GREEN'} eq 'on'){ $sambasettings{'INTERFACES'} .= " $netsettings{'GREEN_DEV'}";}
-if ($sambasettings{'BLUE'} eq 'on'){ $sambasettings{'INTERFACES'} .= " $netsettings{'BLUE_DEV'}";}
-if ($sambasettings{'ORANGE'} eq 'on'){ $sambasettings{'INTERFACES'} .= " $netsettings{'ORANGE_DEV'}";}
-if ($sambasettings{'VPN'} eq 'on'){$sambasettings{'INTERFACES'} .= " ";}
-if ($sambasettings{'OTHERINTERFACES'} ne ''){ $sambasettings{'INTERFACES'} .= " $sambasettings{'OTHERINTERFACES'}";}
-
############################################################################################################################
##################################### Schreiben settings und bersetzen fr smb.conf #######################################
-delete $sambasettings{'__CGI__'};delete $sambasettings{'x'};delete $sambasettings{'y'};
-&General::writehash("${General::swroot}/samba/settings", \%sambasettings);
-
-if ($sambasettings{'PASSWORDSYNC'} eq 'on'){ $sambasettings{'PASSWORDSYNC'} = "true";} else { $sambasettings{'PASSWORDSYNC'} = "false";}
-if ($sambasettings{'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'}
-realm = $mainsettings{'DOMAINNAME'}
-passdb backend = smbpasswd
+if ($sambasettings{'ACTION'} eq $Lang::tr{'save'}) {
+ &General::writehash("${General::swroot}/samba/settings", \%sambasettings);
-wide links = $sambasettings{'WIDELINKS'}
-unix extensions = $sambasettings{'UNIXEXTENSION'}
-END
-;
+ # Write configuration to file
+ &writeconfiguration();
-if ($sambasettings{'SMB2'} eq 'on'){
- print FILE "max protocol = smb2\n";
+ system("/usr/local/bin/sambactrl smbreload");
}
-print FILE <<END
-keep alive = 30
-os level = $sambasettings{'OSLEVEL'}
-fstype = NTFS
-
-kernel oplocks = false
-map to guest = $sambasettings{'MAPTOGUEST'}
-smb ports = 445 139
-dos charset = $sambasettings{'DOSCHARSET'}
-unix charset = $sambasettings{'UNIXCHARSET'}
-display charset = $sambasettings{'DISPLAYCHARSET'}
-
-security = $sambasettings{'SECURITY'}
-encrypt passwords = yes
-guest account = $sambasettings{'GUESTACCOUNT'}
-unix password sync = $sambasettings{'PASSWORDSYNC'}
-null passwords = yes
-
-bind interfaces only = true
-interfaces = $sambasettings{'INTERFACES'}
-socket options = $sambasettings{'SOCKETOPTIONS'}
-remote announce = $sambasettings{'REMOTEANNOUNCE'}
-remote browse sync = $sambasettings{'REMOTESYNC'}
-
-username level = 1
-wins support = $sambasettings{'WINSSUPPORT'}
-wins server = $sambasettings{'WINSSRV'}
-
-winbind separator = +
-winbind uid = 10000-20000
-winbind gid = 10000-20000
-winbind use default domain = yes
-
-log file = /var/log/samba/samba-log.%m
-pid directory = /var/run/
-log level = $sambasettings{'LOGLEVEL'}
-syslog = $sambasettings{'SYSLOGLEVEL'}
-syslog only = $sambasettings{'SYSLOGONLY'}
-
-preferred master = $sambasettings{'PREFERREDMASTER'}
-domain master = $sambasettings{'DOMAINMASTER'}
-local master = $sambasettings{'LOCALMASTER'}
-
-END
-;
-close FILE;
-
- 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'}
-
-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);
+&General::readhash("${General::swroot}/samba/settings", \%sambasettings);
if ($errormessage)
############################################################################################################################
########################################## Aktivieren von Checkboxen und Dropdowns #########################################
-$checked{'SYSLOGONLY'}{'off'} = '';
-$checked{'SYSLOGONLY'}{'on'} = '';
-$checked{'SYSLOGONLY'}{$sambasettings{'SYSLOGONLY'}} = "checked='checked'";
-$checked{'WINSSUPPORT'}{'off'} = '';
-$checked{'WINSSUPPORT'}{'on'} = '';
-$checked{'WINSSUPPORT'}{$sambasettings{'WINSSUPPORT'}} = "checked='checked'";
-$checked{'PASSWORDSYNC'}{'off'} = '';
-$checked{'PASSWORDSYNC'}{'on'} = '';
-$checked{'PASSWORDSYNC'}{$sambasettings{'PASSWORDSYNC'}} = "checked='checked'";
-$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{'SMB2'}{'off'} = '';
-$checked{'SMB2'}{'on'} = '';
-$checked{'SMB2'}{$sambasettings{'SMB2'}} = "checked='checked'";
-$checked{'GREEN'}{'off'} = '';
-$checked{'GREEN'}{'on'} = '';
-$checked{'GREEN'}{$sambasettings{'GREEN'}} = "checked='checked'";
-$checked{'BLUE'}{'off'} = '';
-$checked{'BLUE'}{'on'} = '';
-$checked{'BLUE'}{$sambasettings{'BLUE'}} = "checked='checked'";
-$checked{'ORANGE'}{'off'} = '';
-$checked{'ORANGE'}{'on'} = '';
-$checked{'ORANGE'}{$sambasettings{'ORANGE'}} = "checked='checked'";
-$checked{'VPN'}{'off'} = '';
-$checked{'VPN'}{'on'} = '';
-$checked{'VPN'}{$sambasettings{'VPN'}} = "checked='checked'";
+$selected{'ENCRYPTION'}{'optional'} = '';
+$selected{'ENCRYPTION'}{'desired'} = '';
+$selected{'ENCRYPTION'}{'required'} = '';
+$selected{'ENCRYPTION'}{$sambasettings{'ENCRYPTION'}} = "selected='selected'";
+$selected{'ROLE'}{'standalone'} = '';
+$selected{'ROLE'}{'member'} = '';
+$selected{'ROLE'}{$sambasettings{'ROLE'}} = "selected='selected'";
if ( $sambasettings{'MAPTOGUEST'} eq "Never" ) {
$sambasettings{'MAPTOGUEST'}="Bad User";
}
$selected{'MAPTOGUEST'}{$sambasettings{'MAPTOGUEST'}} = "selected='selected'";
-$selected{'SECURITY'}{$sambasettings{'SECURITY'}} = "selected='selected'";
############################################################################################################################
################################### Aufbau der HTML Seite fr globale Sambaeinstellungen ###################################
&Header::openbox('100%', 'center', $Lang::tr{'samba'});
-print <<END
-<br />
-<table width='95%' cellspacing='0'>
-<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'all services'}</b></td></tr>
-</table><table width='95%' cellspacing='0'>
-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>";
- }
+my %servicenames = (
+ "nmbd" => $Lang::tr{'netbios nameserver daemon'},
+ "smbd" => $Lang::tr{'smb daemon'},
+ "winbindd" => $Lang::tr{'winbind daemon'},
+);
-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>
+print <<END;
+ <table class="tbl" width='100%' cellspacing='0'>
+ <tr bgcolor='$color{'color20'}'>
+ <td colspan='2' align='left'><b>$Lang::tr{'all services'}</b></td>
+ </tr>
END
-;
-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
-;
- }
+foreach my $service (sort keys %servicenames) {
+ my $status = &isrunning($service);
-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>
+ print <<END;
+ <tr>
+ <td align='left' width='40%'>$servicenames{$service}</td>
+ $status
+ </tr>
END
-;
- }
+}
print <<END
-<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' width='40%'>SMB2 $Lang::tr{'protocol'}</td><td align='left'>on <input type='radio' name='SMB2' value='on' $checked{'SMB2'}{'on'} />/
- <input type='radio' name='SMB2' value='off' $checked{'SMB2'}{'off'} /> off</td></tr>
-<tr><td align='left'><br /></td><td></td></tr>
-<tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'security options'}</b></td></tr>
-<tr><td align='left' width='40%'>$Lang::tr{'security'}</td><td align='left'><select name='SECURITY' style="width: 165px">
- <option value='share' $selected{'SECURITY'}{'share'}>Share</option>
- <option value='user' $selected{'SECURITY'}{'user'}>User</option>
- <option value='domain' $selected{'SECURITY'}{'domain'}>Domain</option>
- <option value='ADS' $selected{'SECURITY'}{'ADS'}>ADS</option>
- <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='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
-;
- }
+ </table>
-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
-;
- }
+ <br>
+
+ <table width="100%">
+ <td width="33%" align="center">
+ <form method="POST" action="$ENV{'SCRIPT_NAME'}">
+ <input type="hidden" name="ACTION" value="smbstart">
+ <input type="submit" value="$Lang::tr{'enable'}">
+ </form>
+ </td>
+
+ <td width="33%" align="center">
+ <form method="POST" action="$ENV{'SCRIPT_NAME'}">
+ <input type="hidden" name="ACTION" value="smbstop">
+ <input type="submit" value="$Lang::tr{'disable'}">
+ </form>
+ </td>
+
+ <td width="33%" align="center">
+ <form method="POST" action="$ENV{'SCRIPT_NAME'}">
+ <input type="hidden" name="ACTION" value="smbrestart">
+ <input type="submit" value="$Lang::tr{'restart'}">
+ </form>
+ </td>
+ </table>
-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
-;
+ <br>
+
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <table class="tbl" width='100%' cellspacing='0'>
+ <tr bgcolor='$color{'color20'}'>
+ <td colspan='2' align='left'><b>$Lang::tr{'basic options'}</b></td>
+ </tr>
+ <tr>
+ <td align='left' width='40%'>$Lang::tr{'workgroup'}</td>
+ <td align='left'>
+ <input type='text' name='WORKGRP' value='$sambasettings{'WORKGRP'}' size="30" />
+ </td>
+ </tr>
+ <tr>
+ <td align='left'><br /></td>
+ <td></td>
+ </tr>
+ <tr bgcolor='$color{'color20'}'>
+ <td colspan='2' align='left'><b>$Lang::tr{'security options'}</b></td>
+ </tr>
+ <tr>
+ <td align='left' width='40%'>$Lang::tr{'security'}</td>
+ <td align='left'>
+ <select name='ROLE' style="width: 165px">
+ <option value='standalone' $selected{'ROLE'}{'standalone'}>$Lang::tr{'samba server role standalone'}</option>
+ <option value='member' $selected{'ROLE'}{'member'}>$Lang::tr{'samba server role member'}</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td align='left' width='40%'>$Lang::tr{'encryption'}</td>
+ <td align='left'>
+ <select name='ENCRYPTION' style="width: 165px">
+ <option value='optional' $selected{'ENCRYPTION'}{'optional'}>$Lang::tr{'optional'}</option>
+ <option value='desired' $selected{'ENCRYPTION'}{'desired'}>$Lang::tr{'desired'}</option>
+ <option value='required' $selected{'ENCRYPTION'}{'required'}>$Lang::tr{'required'}</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td align='left' width='40%'>$Lang::tr{'map to guest'}</td>
+ <td align='left'>
+ <select name='MAPTOGUEST' style="width: 165px">
+ <option value='Bad User' $selected{'MAPTOGUEST'}{'Bad User'}>Bad User</option>
+ <option value='Bad Password' $selected{'MAPTOGUEST'}{'Bad Password'}>Bad Password</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td align='left'><br /></td>
+ <td></td>
+ </tr>
+ <tr bgcolor='$color{'color20'}'>
+ <td colspan='2' align='left'><b>$Lang::tr{'network options'}</b></td>
+ </tr>
+ <tr>
+ <td align='left' width='40%'>$Lang::tr{'remote announce'}</td>
+ <td align='left'>
+ <input type='text' name='REMOTEANNOUNCE' value='$sambasettings{'REMOTEANNOUNCE'}' size="30" />
+ </td>
+ </tr>
+ <tr>
+ <td align='left' width='40%'>$Lang::tr{'remote browse sync'}</td>
+ <td align='left'>
+ <input type='text' name='REMOTESYNC' value='$sambasettings{'REMOTESYNC'}' size="30" />
+ </td>
+ </tr>
+ </table>
-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>
+ <br>
+
+ <table width='100%' cellspacing='0'>
+ <tr>
+ <td align='center'>
+ <form method='POST' action='$ENV{'SCRIPT_NAME'}'>
+ <input type='hidden' name='ACTION' value="$Lang::tr{'save'}">
+ <input type='submit' value="$Lang::tr{'save'}">
+ </form>
+ </td>
+ </tr>
+ </table>
END
;
- }
&Header::closebox();
############################################################################################################################
########################################## Benutzerverwaltung fr Usersecurity #############################################
-if ($sambasettings{'SECURITY'} eq 'user')
- {
- 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
-;
+if ($sambasettings{'ROLE'} eq 'standalone') {
+ &Header::openbox('100%', 'center', $Lang::tr{'user management'});
- if ($sambasettings{'DOMAINMASTER'} eq 'off')
- {
- print "<td></td>";
- }
- else
- {
- print "<td align='left'><u>$Lang::tr{'type'}</u></td>";
- }
+ print <<END;
+ <table class="tbl" width='100%' cellspacing='0'>
+ <tr>
+ <th align='left'>$Lang::tr{'user'}</th>
+ <th colspan='3' width='5%'></th>
+ </tr>
+END
- 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>;
+ my @users = <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'>";
- }
- }
+ my $lines = 0;
+ foreach $userentry (sort @users) {
+ @userline = split( /\:/, $userentry);
- 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 ($lines % 2) {
+ print "<tr bgcolor='$color{'color20'}'>";
+ } else {
+ print "<tr bgcolor='$color{'color22'}'>";
+ }
- 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
-;
- }
+ # Print username
+ print "<td align='left'>$userline[0]</td>";
- if ($sambasettings{'DOMAINMASTER'} eq 'on' && $userline[0] =~ /\$/)
- {
- print <<END
- <td><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
+ if ($userline[4] =~ /D/) {
+ print <<END;
+ <td align='center'>
+ <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='$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='ACTION' value='smbuserenable' />
+ <input type='image' alt='$Lang::tr{'activate'}' title='$Lang::tr{'activate'}' src='/images/off.gif' />
+ </form>
+ </td>
+END
+ } else {
+ print <<END;
+ <td align='center'>
+ <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='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-option-remove.png' />
- </form></td></tr>
+ <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
-;
- }
- $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{'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>
+ # Machine accounts can't be edited
+ if ($userline[0] =~ /\$/) {
+ print "<td></td>";
+ } else {
+ print <<END;
+ <td align='center'>
+ <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='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
+ </form>
+ </td>
END
-;
}
- print <<END
- <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'>
- <input type='hidden' name='ACTION' value='usercaption' />
- <input type='image' alt='$Lang::tr{'caption'}' title='$Lang::tr{'caption'}' src='/images/help-browser.png' /></form>
- </td></tr>
- </table>
+
+ print <<END;
+ <td align='center'>
+ <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='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' />
+ </form>
+ </td>
+ </tr>
END
-;
+ $lines++;
+ }
- 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>
+ print <<END;
</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='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>
+ <br>
+
+ <table width='10%' cellspacing='0'>
+ <tr>
+ <td align='center'>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <input type='hidden' name='ACTION' value='useradd'>
+ <input type='submit' value='$Lang::tr{'add user'}'>
+ </form>
+ </td>
+ </tr>
</table>
- </form>
END
-;
- }
- if ($sambasettings{'ACTION'} eq 'useradd')
- {
+ if ($sambasettings{'ACTION'} eq 'userchangepw') {
+ my $username = $sambasettings{'NAME'};
+ my $password = 'samba';
+
+ print <<END
+ <br>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <table width='100%' cellspacing='0'>
+ <tr bgcolor='$color{'color20'}'>
+ <td colspan='2' align='left'><b>$Lang::tr{'change passwords'}</b></td>
+ </tr>
+ <tr>
+ <td align='left'>$Lang::tr{'username'}</td>
+ <td>
+ <input type='text' name='USERNAME' value='$username' size='30' readonly='readonly' />
+ </td>
+ </tr>
+ <tr>
+ <td align='left'>$Lang::tr{'password'}</td>
+ <td>
+ <input type='password' name='PASSWORD' value='$password' size='30' />
+ </td>
+ </tr>
+ <tr>
+ <td colspan='2' align='center'>
+ <input type='hidden' name='ACTION' value='smbchangepw'>
+ <input type='submit' value='$Lang::tr{'save'}'>
+ </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' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' /></td></tr>
- </table>
- </form>
+ print <<END;
+ <br>
+
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <table width='100%' cellspacing='0'>
+ <tr bgcolor='$color{'color20'}'>
+ <td colspan='2' align='left'><b>$Lang::tr{'add user'}</b></td>
+ </tr>
+ <tr>
+ <td align='left'>$Lang::tr{'username'}</td>
+ <td>
+ <input type='text' name='USERNAME' value='$username' size='30' />
+ </td>
+ </tr>
+ <tr>
+ <td align='left'>$Lang::tr{'password'}</td>
+ <td>
+ <input type='password' name='PASSWORD' value='$password' size='30' />
+ </td>
+ </tr>
+ <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='submit' value='$Lang::tr{'save'}'>
+ </td>
+ </tr>
+ </table>
+ </form>
END
-;
- }
+ }
-&Header::closebox();
+ &Header::closebox();
}
-if ($sambasettings{'SECURITY'} eq "ADS") {
+if ($sambasettings{'ROLE'} eq "member") {
&Header::openbox('100%', 'center', $Lang::tr{'samba join a domain'});
my $AD_DOMAINNAME = uc($mainsettings{'DOMAINNAME'});
<form method="POST" action="$ENV{'SCRIPT_NAME'}">
<input type="hidden" name="ACTION" value="join">
- <table width="95%">
+ <table width="100%">
<tbody>
<tr>
<td width="40%">
&Header::openbox('100%', 'center', $Lang::tr{'shares'});
-my %shares = config("${General::swroot}/samba/shares");
-
-
-print <<END
-<a name="$Lang::tr{'manage shares'}"></a>
-<br />
-<table width='95%' cellspacing='0' class='tbl'>
-<tr><th bgcolor='$color{'color20'}' colspan='3' align='left'><b>$Lang::tr{'manage shares'}</b></th></tr>
-<tr><th align='left'><u>$Lang::tr{'sharename'}</u></th><th colspan='2' width="5%" align='center'><u>$Lang::tr{'options'}</u></th></tr>
+print <<END;
+ <table class="tbl" width='100%' cellspacing='0'>
+ <tr>
+ <th align='left'>$Lang::tr{'sharename'}</th>
+ <th colspan='2' width="5%" align='center'></th>
+ </tr>
END
-;
-my @Shares = keys(%shares);
+my @shares = keys(%shares);
my $lines = 0;
my $col="";
-foreach my $shareentry (sort @Shares)
- {
+foreach my $shareentry (sort @shares) {
chomp $shareentry;
+
if ($lines % 2) {
- print "<tr>";
- $col="bgcolor='$color{'color20'}'";
+ $col = "bgcolor='$color{'color20'}'";
} else {
- print "<tr>";
- $col="bgcolor='$color{'color22'}'";
- }
- print <<END
- <td align='left' $col>$shareentry</td>
- <td $col><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'>
- <input type='hidden' name='NAME' value='$shareentry' />
- <input type='hidden' name='ACTION' value='sharechange' />
- <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
- </form></td>
- <td $col><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'>
- <input type='hidden' name='NAME' value='$shareentry' />
- <input type='hidden' name='ACTION' value='smbsharedel' />
- <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' />
- </form></td></tr>
-END
-;
- $lines++;
+ $col = "bgcolor='$color{'color22'}'";
}
-print <<END
-</table>
-<br />
-<table width='10%' cellspacing='0'>
-<tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'>
- <input type='hidden' name='ACTION' value='shareadd' />
- <input type='image' alt='$Lang::tr{'add share'}' title='$Lang::tr{'add share'}' src='/images/list-add.png' />
- </form></td>
- <td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'>
- <input type='hidden' name='ACTION' value='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
-;
+ print <<END;
+ <tr>
+ <td align='left' $col>$shareentry</td>
+ <td $col>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'>
+ <input type='hidden' name='NAME' value='$shareentry' />
+ <input type='hidden' name='ACTION' value='sharechange' />
+ <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' />
+ </form>
+ </td>
+ <td $col>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'manage shares'}'>
+ <input type='hidden' name='NAME' value='$shareentry' />
+ <input type='hidden' name='ACTION' value='smbsharedel' />
+ <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' />
+ </form>
+ </td>
+ </tr>
+END
+;
+ $lines++;
+}
-if ($sambasettings{'ACTION'} eq 'sharecaption')
- {
- print <<END
- <br />
- <table width='95%' cellspacing='0'>
- <tr><td align='center' colspan='2'><b>$Lang::tr{'caption'}</b></td></tr>
- <tr><td align='right' width='33%'><img src='/images/list-add.png' /></td><td align='left'>$Lang::tr{'add share'}</td></tr>
- <tr><td align='right' width='33%'><img src='/images/edit.gif' /></td><td align='left'>$Lang::tr{'edit share'}</td></tr>
- <tr><td align='right' width='33%'><img src='/images/media-floppy.png' /></td><td align='left'>$Lang::tr{'save config'}</td></tr>
- <tr><td align='right' width='33%'><img src='/images/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>
+print <<END;
</table>
-END
-;
- }
-if ($sambasettings{'ACTION'} eq 'shareadd' || $sambasettings{'ACTION'} eq 'optioncaption' )
- {
- print <<END
- <br />
- <table width='95%' cellspacing='0'>
- <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'add share'}</b></td></tr>
- <tr><td colspan='2' align='center'></td></tr>
- <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>
+ <br>
+
+ <table width='100%' cellspacing='0'>
+ <tr>
+ <td align='center'>
+ <form method='POST' action='$ENV{'SCRIPT_NAME'}'>
+ <input type='hidden' name='ACTION' value='shareadd'>
+ <input type='submit' value='$Lang::tr{'add share'}'>
+ </form>
+ </td>
+ </tr>
</table>
END
-;
- }
-if ($sambasettings{'ACTION'} eq 'sharechange' || $sambasettings{'ACTION'} eq 'optioncaption2' )
- {
- 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")
-{
-&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 'shareadd') {
+ print <<END;
+ <br />
-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>
+ <form method='POST' action='$ENV{'SCRIPT_NAME'}'>
+ <table width='100%' cellspacing='0'>
+ <tr bgcolor='$color{'color20'}'>
+ <td align='left'><b>$Lang::tr{'add share'}</b></td>
+ </tr>
+ <tr>
+ <td align='center'>
+ <textarea name="SHAREOPTION" cols="121" rows="15">$defaultoption</textarea>
+ </td>
+ </tr>
+ <tr>
+ <td align='center'>
+ <input type='hidden' name='ACTION' value='smbshareadd'>
+ <input type='submit' value='$Lang::tr{'save'}'>
+ </td>
+ </tr>
+ </table>
+ </form>
END
-;
- }
+}
-if ($sambasettings{'ACTION'} eq 'smbprinteradd')
- {
- $printer{'xvx'}= "$sambasettings{'PRINTEROPTION'}";
- save("printer");
- my %printer = config("${General::swroot}/samba/printer");
- }
+if ($sambasettings{'ACTION'} eq 'sharechange') {
+ my $shareoption = $shares{$sambasettings{'NAME'}};
-if ($sambasettings{'ACTION'} eq 'smbprinterdel')
- {
- delete $printer{$sambasettings{'NAME'}};
- save("printer");
- my %printer = config("${General::swroot}/samba/printer");
- }
+ print <<END;
+ <br />
-if ($sambasettings{'ACTION'} eq 'smbprinterchange')
- {
- $printer{$sambasettings{'NAME'}} = $sambasettings{'PRINTEROPTION'};
- save("printer");
- my %printer = config("${General::swroot}/samba/printer");
- }
+ <form method='POST' action='$ENV{'SCRIPT_NAME'}'>
+ <input type='hidden' name='NAME' value='$sambasettings{'NAME'}'>
-&Header::closebox();
+ <table width='100%' cellspacing='0'>
+ <tr bgcolor='$color{'color20'}'>
+ <td align='left'><b>$Lang::tr{'edit share'}</b></td>
+ </tr>
+ <tr>
+ <td align='center'>
+ <textarea name="SHAREOPTION" cols="121" rows="15">$shareoption</textarea>
+ </td>
+ </tr>
+ <tr>
+ <td align='center'>
+ <input type='hidden' name='ACTION' value='smbsharechange'>
+ <input type='submit' value='$Lang::tr{'save'}'>
+ </td>
+ </tr>
+ </table>
+ </form>
+END
}
-############################################################################################################################
-############################################### 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 ######################################################
+############################################### Anzeige des Sambastatus ####################################################
+&Header::openbox('100%', 'left', $Lang::tr{'status'});
-if ($sambasettings{'ACTION'} eq 'showlog')
-{
-$Log = qx(tail -n $sambasettings{'LOGLINES'} /var/log/samba/$sambasettings{'LOG'});
-$Log=~s/\n/<br \/>/g;
-}
+my $status = qx(/usr/local/bin/sambactrl smbstatus);
+$status = &Header::cleanhtml($status);
-&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">
+print <<END;
+ <small>
+ <pre>$status</pre>
+ </small>
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();
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 smbsafeconf");
system("/usr/local/bin/sambactrl smbreload");
-refreshpage();
}
sub isrunning
return $status;
}
+sub writeconfiguration() {
+ 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]
+server string = Samba on IPFire
+
+workgroup = $sambasettings{'WORKGRP'}
+realm = $mainsettings{'DOMAINNAME'}
+passdb backend = smbpasswd
+
+map to guest = $sambasettings{'MAPTOGUEST'}
+
+guest account = $sambasettings{'GUESTACCOUNT'}
+unix password sync = no
+
+bind interfaces only = true
+interfaces = green0 blue0 127.0.0.0/8
+remote announce = $sambasettings{'REMOTEANNOUNCE'}
+remote browse sync = $sambasettings{'REMOTESYNC'}
+
+winbind separator = +
+winbind uid = 10000-20000
+winbind gid = 10000-20000
+winbind use default domain = yes
+
+# Log to syslog
+logging = syslog
+
+# Enable support for Apple
+vfs objects = catia fruit streams_xattr recycle
+
+# Enable following symlinks
+wide links = yes
+
+END
+
+# Server Role
+if ($sambasettings{'ROLE'} eq "standalone") {
+ print FILE "server role = standalone\n";
+} elsif ($sambasettings{'ROLE'} eq "member") {
+ print FILE "server role = member server\n";
+}
+
+if ($sambasettings{'ENCRYPTION'} =~ m/(desired|required)/) {
+ print FILE "smb encrypt = $1\n";
+}
+
+print FILE <<END;
+# Export all printers
+[printers]
+path = /var/spool/samba/
+printable = yes
+
+END
+close FILE;
+
+ system("/usr/local/bin/sambactrl smbsafeconf");
+}
+
sub joindomain {
my $username = shift;
my $password = shift;
projects / ipfire-2.x.git / blobdiff