- 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)

2 files changed, 39 insertions, 30 deletions

diff --git a/samba_wizard/Samba.pm b/samba_wizard/Samba.pm
index ad35c822..1a2da921 100755
--- a/samba_wizard/Samba.pm
+++ b/samba_wizard/Samba.pm
@@ -104,7 +104,7 @@ $o->{pages} = {
 			       # detect old Samba type
 			       my ($old_type) = $data =~ /type=(\d)/;
 			       $o->{var}{wiz_type} = chomp_($old_type);
-			     } else { $o->{var}{wiz_type} = 2 }
+			     } else { $o->{var}{wiz_type} = 3 }
 			   },
 			   post => sub {
                              if ($o->{var}{wiz_type} == 2) {
@@ -320,7 +320,7 @@ $o->{pages} = {
 			      next => 'ask_log',
 			     },
 	       ask_log => {
-			   name => N("Samba Log") . "\n\n" . N("Log file: use file.%m to use a separate log file for each machine that connects") . "\n" . N("Log level: set the log (verbosity) level (0 <= log level <= 10)") . "\n" . N("Max Log size: put a capping on the size of the log files (in Kb)."),
+			   name => N("Samba Log") . "\n" . N("Log file: use file.%m to use a separate log file for each machine that connects") . "\n" . N("Log level: set the log (verbosity) level (0 <= log level <= 10)") . "\n" . N("Max Log size: put a capping on the size of the log files (in Kb)."),
 			   pre => sub {
 			     $o->{var}{wiz_log_file} ||= $samba->{global}{'log file'};
 			     $o->{var}{wiz_log_level} ||= $samba->{global}{'log level'};
@@ -334,7 +334,7 @@ $o->{pages} = {
 			   next => 'summary',
 			  },
 	       summary => {
-			   name =>  N("Configuring Samba") . "\n\n" . N("The wizard collected the following parameters to configure Samba.") . "\n\n" . N("To accept these values, and configure your server, click the Next button or use the Back button to correct them.") . "\n" . N("If you have previously create some shares, they will appear in this configuration. Run 'drakwizard sambashare' to manage your shares."),
+			   name =>  N("The wizard collected the following parameters to configure Samba.") . "\n\n" . N("To accept these values, and configure your server, click the Next button or use the Back button to correct them.") . "\n" . N("If you have previously create some shares, they will appear in this configuration. Run 'drakwizard sambashare' to manage your shares."),
 			   pre => sub {
 			     $o->{var}{wiz_sambatype} = $type{$o->{var}{wiz_type}};
 			   },
diff --git a/samba_wizard/Sambashare.pm b/samba_wizard/Sambashare.pm
index 5b262dbb..b90658d5 100755
--- a/samba_wizard/Sambashare.pm
+++ b/samba_wizard/Sambashare.pm
@@ -347,6 +347,7 @@ $o->{pages} = {
 			       } else { return 0 }
 			     },
 			     next => 'add_share_options',
+			     no_back => 1,
 			    },
 	       add_cdrom_share => {
 				   name => N("Share a CDROM"),
@@ -607,18 +608,19 @@ $o->{pages} = {
 				  no_back => 1,
 				 },
 	       summary_modify_homes_share => {
-				     name => N("Summary of modify homes share"),
-				     data => [
-					      { label => N("Comment:"), val_ref => \$o->{var}{wiz_homes_comment} },
-					      { label => N("Writable:"), val_ref => \$o->{var}{wiz_homes_writable} },
-					      { label => N("Browseable:"), val_ref => \$o->{var}{wiz_homes_browseable} },
-					      { label => N("Create mode:"), val_ref => \$o->{var}{wiz_homes_create_mode} },
-					      { label => N("Create mask:"), val_ref => \$o->{var}{wiz_homes_create_mask} },
-					      { label => N("Directory mask:"), val_ref => \$o->{var}{wiz_homes_directory_mask} },
-					     ],
-				     post => \&do_it_modify_homes_share,
-				     next => 'end_add_user_share',
-				    },
+					      name => N("Summary of modify homes share"),
+					      data => [
+						       { label => N("Comment:"), val_ref => \$o->{var}{wiz_homes_comment} },
+						       { label => N("Writable:"), val_ref => \$o->{var}{wiz_homes_writable} },
+						       { label => N("Browseable:"), val_ref => \$o->{var}{wiz_homes_browseable} },
+						       { label => N("Create mode:"), val_ref => \$o->{var}{wiz_homes_create_mode} },
+						       { label => N("Create mask:"), val_ref => \$o->{var}{wiz_homes_create_mask} },
+						       { label => N("Directory mask:"), val_ref => \$o->{var}{wiz_homes_directory_mask} },
+						      ],
+					      post => \&do_it_modify_homes_share,
+					      next => 'end_add_user_share',
+ 					      no_back => 1,
+					     },
  	       summary_add_user_share => {
 					  name => N("Summary of add a user share") . "\n\n" . N("If you really want to add this share, click the Next button or use the Back button."),
 					  data => [
@@ -648,37 +650,44 @@ $o->{pages} = {
 			 store_samba_type($o->{var}{wiz_type});
 		       },
 		       end => 1,
-		       next => 0
+		       next => 0,
+		       no_back => 1,
 		      },
 	       end_modify_share => {
-				 name => N("Congratulations") . "\n\n" . N("The wizard successfully modified your share."),
-				 end => 1,
-				 next => 0
+				    name => N("Congratulations") . "\n\n" . N("The wizard successfully modified your share."),
+				    end => 1,
+				    next => 0,
+				    no_back => 1,
 				},
 	       end_add_share => {
 				 name => N("Congratulations") . "\n\n" . N("The wizard successfully added your share."),
 				 end => 1,
-				 next => 0
+				 next => 0,
+				 no_back => 1,
 				},
 	       end_add_user_share => {
-				 name => N("Congratulations") . "\n\n" . N("The wizard successfully added your user share."),
-				 end => 1,
-				 next => 0
+				      name => N("Congratulations") . "\n\n" . N("The wizard successfully added your user share."),
+				      end => 1,
+				      next => 0,
+				      no_back => 1,
 				},
 	       end_add_public_share => {
-				 name => N("Congratulations") . "\n\n" . N("The wizard successfully added your public share."),
-				 end => 1,
-				 next => 0
+					name => N("Congratulations") . "\n\n" . N("The wizard successfully added your public share."),
+					end => 1,
+					next => 0,
+					no_back => 1,
 				},
 	       end_add_profiles => {
-				 name => N("Congratulations") . "\n\n" . N("The wizard successfully added your Profiles share."),
-				 end => 1,
-				 next => 0
+				    name => N("Congratulations") . "\n\n" . N("The wizard successfully added your Profiles share."),
+				    end => 1,
+				    next => 0,
+				    no_back => 1,
 				},
 	       end_delete_share => {
 				    name => N("Congratulations") . "\n\n" . N("The wizard successfully removed your share."),
 				    end => 1,
-				    next => 0
+				    next => 0,
+				    no_back => 1,
 				   },
 	       error_end => {
 			     name => N("Failed"),