--- loncom/auth/lonwebdavauth.pm	2012/02/27 03:06:33	1.1
+++ loncom/auth/lonwebdavauth.pm	2012/06/01 11:39:29	1.2
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Authentication Handler for webDAV access to Authoring Space.
 #
-# $Id: lonwebdavauth.pm,v 1.1 2012/02/27 03:06:33 raeburn Exp $
+# $Id: lonwebdavauth.pm,v 1.2 2012/06/01 11:39:29 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -169,7 +169,11 @@ sub handler {
             if ($now-$sesstime < $timetolive) {
                 if (&Apache::lonnet::homeserver($uname,$udom) eq $uhome) {
                     &Apache::lonnet::transfer_profile_to_env($sessiondir,$handle);
-                    return OK;
+                    if (&Apache::lonnet::usertools_access($uname,$udom,'webdav')) {
+                        return OK;
+                    } else {
+                        return FORBIDDEN;
+                    }
                 }
             }
         }
@@ -207,11 +211,15 @@ sub handler {
                 $handle = &init_webdav_env($sessiondir,$uname,$udom,
                                            $uhome,$now,$timetolive);
                 if ($handle ne '') {
-                    my $cookie = "lonDAV=$handle; path=/webdav/; secure; HttpOnly;";
-                    $r->header_out('Set-cookie' => $cookie);
-                    $r->send_http_header;
+                    if (&Apache::lonnet::usertools_access($uname,$udom,'webdav')) {
+                        my $cookie = "lonDAV=$handle; path=/webdav/; secure; HttpOnly;";
+                        $r->header_out('Set-cookie' => $cookie);
+                        $r->send_http_header;
+                        return OK;
+                    } else {
+                        return FORBIDDEN;
+                    }
                 }
-                return OK;
             }
         }
     }
@@ -257,20 +265,36 @@ sub init_webdav_env {
             $disk_env{'user.name'} = $uname;
             $disk_env{'user.domain'} = $udom;
             $disk_env{'user.home'} = $uhome;
+            my %userenv = &Apache::lonnet::get('environment',['inststatus','tools.webdav'],
+                                               $udom,$uname);
+            my ($tmp) = keys(%userenv);
+            if ($tmp =~ /^(con_lost|error|no_such_host)/i) {
+                $disk_env{'environment.inststatus'} = $userenv{'inststatus'};
+                $disk_env{'environment.tools.webdav'} = $userenv{'tools.webdav'};
+            }
             $disk_env{'user.environment'} = $sessionfile;
             my $possroles = ['au','ca','aa'];
             my @possdoms = &Apache::lonnet::current_machine_domains();
             my %cstr_roles =
                 &Apache::lonnet::get_my_roles($uname,$udom,'userroles',
                                               undef,$possroles,\@possdoms);
-            foreach my $item (keys(%cstr_roles)) {
-                my ($aname,$adom,$role) = split(/:/,$item);
-                if ($role eq 'au') {
-                    $disk_env{"user.role.$role./$adom/"} = $cstr_roles{$item};
-                } else {
-                    $disk_env{"user.role.$role./$adom/$aname"} = $cstr_roles{$item};
+            if (keys(%cstr_roles) > 0) {
+                $disk_env{'user.adv'} = 1;
+                $disk_env{'user.author'} = 1;
+                foreach my $item (keys(%cstr_roles)) {
+                    my ($aname,$adom,$role) = split(/:/,$item);
+                    if ($role eq 'au') {
+                        $disk_env{"user.role.$role./$adom/"} = $cstr_roles{$item};
+                    } else {
+                        $disk_env{"user.role.$role./$adom/$aname"} = $cstr_roles{$item};
+                    }
                 }
             }
+            my %is_adv = ( is_adv => $disk_env{'user.adv'} );
+            my %domdef = &Apache::lonnet::get_domain_defaults($udom);
+            $disk_env{'environment.availabletools.webdav'} =
+                &Apache::lonnet::usertools_access($uname,$udom,'webdav','reload',undef,
+                                                  \%userenv,\%domdef,\%is_adv);
             @env{keys(%disk_env)} = @disk_env{keys(%disk_env)};
             untie(%disk_env);
         }