1 files changed, 44 insertions, 29 deletions

diff --git a/perl-install/diskdrake/dav.pm b/perl-install/diskdrake/dav.pm
index 09510696d..9036596b3 100644
--- a/perl-install/diskdrake/dav.pm
+++ b/perl-install/diskdrake/dav.pm
@@ -1,22 +1,20 @@
-package diskdrake::dav; # $Id$
+package diskdrake::dav;
 
 use diagnostics;
 use strict;
 use diskdrake::interactive;
 use common;
-use fsedit;
-use fs;
 
 sub main {
     my ($in, $all_hds) = @_;
     my $davs = $all_hds->{davs};
 
-    $in->do_pkgs->ensure_is_installed('davfs', '/sbin/mount.davfs') or return;
+    $in->do_pkgs->ensure_binary_is_installed('davfs2', 'mount.davfs2') or return;
     
     my $quit;
     do {
 	$in->ask_from_({ ok => '', messages => formatAlaTeX(
-_("WebDAV is a protocol that allows you to mount a web server's directory
+N("WebDAV is a protocol that allows you to mount a web server's directory
 locally, and treat it like a local filesystem (provided the web server is
 configured as a WebDAV server). If you would like to add WebDAV mount
 points, select \"New\".")) },
@@ -24,10 +22,10 @@ points, select \"New\".")) },
 			(map { 
 			    my $dav = $_;
 			    { label => $dav->{device}, val => $dav->{mntpoint}, clicked_may_quit => sub { config($in, $dav, $all_hds); 1 } } } @$davs),
-			 { val => _("New"), clicked_may_quit => sub { create($in, $all_hds); 1 } },
-			 { val => _("Quit"), icon => "exit", clicked_may_quit => sub { $quit = 1 } },
+			 { val => N("New"), clicked_may_quit => sub { create($in, $all_hds); 1 } },
+			 { val => N("Quit"), clicked_may_quit => sub { $quit = 1 } },
 		       ]);
-    } until ($quit);
+    } until $quit;
 
     diskdrake::interactive::Done($in, $all_hds);
 }
@@ -35,10 +33,11 @@ points, select \"New\".")) },
 sub create {
     my ($in, $all_hds) = @_;
 
-    my $dav = { type => 'davfs' };
+    my $dav = { fs_type => 'davfs2', mntpoint => 'none' };
     ask_server($in, $dav, $all_hds) or return;
     push @{$all_hds->{davs}}, $dav;
     config($in, $dav, $all_hds);
+    return;
 }
 
 sub config {
@@ -47,11 +46,12 @@ sub config {
     my $dav = { %$dav_ }; #- working on a local copy so that "Cancel" works
 
     my $action;
-    while ($action ne 'Done') {
+    my $exit;
+    while (!$exit && $action ne 'Done') {
 	my %actions = my @actions = actions($dav);
 	$action = $in->ask_from_list_('', format_dav_info($dav), 
 					 [ map { $_->[0] } group_by2 @actions ], 'Done') or return;
-	$actions{$action}->($in, $dav, $all_hds);    
+	$exit = $actions{$action}->($in, $dav, $all_hds);    
     }
     %$dav_ = %$dav; #- applying
 }
@@ -60,12 +60,13 @@ sub actions {
     my ($dav) = @_;
 
     (
-     if_($dav && $dav->{isMounted}, __("Unmount") => sub { try('Unmount', @_) }),
-     if_($dav && $dav->{mntpoint} && !$dav->{isMounted}, __("Mount") => sub { try('Mount', @_) }),
-     __("Server") => \&ask_server,
-     __("Mount point") => \&mount_point,
-     __("Options") => \&options,
-     __("Done") => sub {},
+     if_($dav && $dav->{isMounted}, N_("Unmount") => sub { try('Unmount', @_) }),
+     if_($dav && $dav->{mntpoint} && !$dav->{isMounted}, N_("Mount") => sub { try('Mount', @_) }),
+     N_("Server") => \&ask_server,
+     N_("Mount point") => \&mount_point,
+     N_("Options") => \&options,
+     N_("Remove") => \&remove,
+     N_("Done") => sub {},
     );
 }
 
@@ -74,41 +75,55 @@ sub try {
     my $f = $diskdrake::interactive::{$name} or die "unknown function $name";
     eval { $f->($in, {}, $dav) };
     if (my $err = $@) {
-	$in->ask_warn(_("Error"), formatError($err));
+	$in->ask_warn(N("Error"), formatError($err));
     }
 }
 
 sub ask_server {
-    my ($in, $dav, $all_hds) = @_;
+    my ($in, $dav, $_all_hds) = @_;
 
     my $server = $dav->{device};
-    $in->ask_from('', _("Please enter the WebDAV server URL"),
-		  [ { val => \$server } ],
-		  complete => sub {
-		      $server =~ m!https?://! or $in->ask_warn('', _("The URL must begin with http:// or https://")), return 1;
-		      0;
-		  },
-		 ) or return;
+    $in->ask_from_({ messages => N("Please enter the WebDAV server URL"),
+		     focus_first => 1,
+		     callbacks => {
+		         complete => sub {
+			     $server =~ m!https?://! or $in->ask_warn('', N("The URL must begin with http:// or https://")), return 1;
+			     0;
+			 },
+		     } },
+		  [ { val => \$server } ]) or return;
     $dav->{device} = $server;
 }
 
 sub options {
     my ($in, $dav, $all_hds) = @_;
     diskdrake::interactive::Options($in, {}, $dav, $all_hds);
+    return;
+}
+
+sub remove {
+    my ($in, $dav, $all_hds) = @_;
+    if ($in->ask_yesorno(N("Warning"), N("Are you sure you want to delete this mount point?"))) {
+            @{$all_hds->{davs}} = grep { $_->{mntpoint} ne $dav->{mntpoint} } @{$all_hds->{davs}};
+            return 1;
+    }
+    return;
 }
+
 sub mount_point { 
     my ($in, $dav, $all_hds) = @_;
     my $proposition = $dav->{device} =~ /(\w+)/ ? "/mnt/$1" : "/mnt/dav";
     diskdrake::interactive::Mount_point_raw_hd($in, $dav, $all_hds, $proposition);
+    return;
 }
 
 sub format_dav_info {
     my ($dav) = @_;
 
     my $info = '';
-    $info .= _("Server: ") . "$dav->{device}\n" if $dav->{device};
-    $info .= _("Mount point: ") . "$dav->{mntpoint}\n" if $dav->{mntpoint};
-    $info .= _("Options: %s", $dav->{options}) if $dav->{options};
+    $info .= N("Server: ") . "$dav->{device}\n" if $dav->{device};
+    $info .= N("Mount point: ") . "$dav->{mntpoint}\n" if $dav->{mntpoint};
+    $info .= N("Options: %s", $dav->{options}) if $dav->{options};
     $info;
 }