- add a third NTP server server

- fix layout of various wizards
- remove sambaprint wizard (user should now use draksambashare)
- fix ftp default port to 21
- disable kolab and inn wizards (don't know how to use/fix them, help
  welcome)

1 files changed, 2 insertions, 2 deletions

diff --git a/ftp_wizard/Proftpd.pm b/ftp_wizard/Proftpd.pm
index e5855971..99f1dd3e 100755
--- a/ftp_wizard/Proftpd.pm
+++ b/ftp_wizard/Proftpd.pm
@@ -121,7 +121,7 @@ $o->{pages} = {
 				   $o->{var}{wiz_default_root} ||= 1;
 				   $o->{var}{wiz_ftp_resume} ||= 1;
 				   $o->{var}{wiz_ftp_fxp} ||= 0;
-				   $o->{var}{wiz_port} = $ftp_port;
+				   if (-e $ftp_port) { $o->{var}{wiz_port} = $ftp_port } else { $o->{var}{wiz_port} = "21" };
 				 },
 				 data => [
 					  { label => N('FTP Port:'), val => \$o->{var}{wiz_port}, help => 'Default port is 21 for an FTP server' },
@@ -143,7 +143,7 @@ $o->{pages} = {
 	        next => 'config'
 			       },
 	       summary => {
-			   name =>  N("Configuring the FTP server") . "\n\n" . N("The wizard collected the following parameters needed to configure your FTP server") . "\n" . N("To accept those values, and configure your server, click the next button or use the back button to correct them"),
+			   name =>  N("The wizard collected the following parameters needed to configure your FTP server") . "\n" . N("To accept those values, and configure your server, click the next button or use the back button to correct them"),
 			   pre => sub {
 			     $o->{var}{internal} = $o->{var}{wiz_ftp_internal} ? N("enabled") : N("disabled");
 			     $o->{var}{external} = $o->{var}{wiz_ftp_external} ? N("enabled") : N("disabled");