--- loncom/publisher/lonpubdir.pm	2014/04/21 21:26:41	1.152
+++ loncom/publisher/lonpubdir.pm	2014/07/31 19:25:39	1.159
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Authoring Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.152 2014/04/21 21:26:41 musolffc Exp $
+# $Id: lonpubdir.pm,v 1.159 2014/07/31 19:25:39 musolffc Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,7 +40,7 @@ use Apache::lonlocal;
 use Apache::lonmsg;
 use Apache::lonmenu;
 use Apache::lonnet;
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
 
 sub handler {
 
@@ -48,10 +48,7 @@ sub handler {
 
     # Validate access to the construction space and get username:domain.
 
-    my $uname;
-    my $udom;
-
-    ($uname,$udom)=&Apache::lonnet::constructaccess($r->uri); 
+    my ($uname,$udom)=&Apache::lonnet::constructaccess($r->uri); 
     unless (($uname) && ($udom)) {
         return HTTP_NOT_ACCEPTABLE;
     }
@@ -63,6 +60,25 @@ sub handler {
     my $thisdisfn=$fn;
 
     my $docroot=$r->dir_config('lonDocRoot');     # Apache  londocument root.
+    if ($thisdisfn eq "$docroot/priv/$udom") {
+        if ((-d "/home/$uname/public_html/") && (!-e "$docroot/priv/$udom/$uname")) {
+            my ($version) = ($r->dir_config('lonVersion') =~ /^\'?(\d+\.\d+)\./);
+            &Apache::loncommon::content_type($r,'text/html');
+            $r->send_http_header;
+
+            &Apache::lonhtmlcommon::clear_breadcrumbs();
+            $r->print(&Apache::loncommon::start_page('Authoring Space').
+                      '<div class="LC_error">'.
+                      '<br /><p>'.
+                      &mt('Your Authoring Space is currently in the location used by LON-CAPA version 2.10 and older, but your domain is using a newer LON-CAPA version ([_1]).',$version).'</p>'.
+                      '<p>'.
+                      &mt('Please ask your Domain Coordinator to move your Authoring Space to the new location.').
+                      '</p>'.
+                      '</div>'.
+                      &Apache::loncommon::end_page());
+            return OK;
+        }
+    }
     $thisdisfn=~s/^\Q$docroot\E\/priv//;
     
     my $resdir=$docroot.'/res'.$thisdisfn; # Resource directory
@@ -72,6 +88,26 @@ sub handler {
     my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);
 
     &startpage($r, $uname, $udom, $thisdisfn);  # Put out the start of page.
+
+    if (!-d $fn) {
+        if (-e $fn) {
+            $r->print('<p class="LC_info">'.&mt('Requested item is a file not a directory.').'</p>');
+        } else {
+            $r->print('<p class="LC_info">'.&mt('The requested subdirectory does not exist.').'</p>');
+        }
+        $r->print(&Apache::loncommon::end_page());
+        return OK;
+    }
+    my @files;
+    if (opendir(DIR,$fn)) {
+        @files = grep(!/^\.+$/,readdir(DIR));
+        closedir(DIR);
+    } else {
+        $r->print('<p class="LC_error">'.&mt('Could not open directory.').'</p>');
+        $r->print(&Apache::loncommon::end_page());
+        return OK;
+    }
+
     &dircontrols($r,$uname,$udom,$thisdisfn);   # Put out actions for directory, 
                                                 # browse/upload + new file page.
     &resourceactions($r,$uname,$udom,$thisdisfn); # Put out form used for printing/deletion etc.
@@ -90,6 +126,16 @@ sub handler {
     my $sortby = $env{'form.sortby'};
     my $sortorder = $env{'form.sortorder'};
 
+    if ((@files == 0) && ($thisdisfn =~ m{^/$match_domain/$match_username})) {
+        if ($thisdisfn =~ m{^/$match_domain/$match_username$}) {
+            $r->print('<p class="LC_info">'.&mt('This Authoring Space is currently empty.').'</p>');
+        } else {
+            $r->print('<p class="LC_info">'.&mt('This subdirectory is currently empty.').'</p>');
+        }
+        $r->print(&Apache::loncommon::end_page());
+        return OK;
+    }
+
     # Start off the directory table.
     $r->print(&Apache::loncommon::start_data_table()
         .&Apache::loncommon::start_data_table_header_row()
@@ -122,15 +168,14 @@ sub handler {
     );
 
     my $dirptr=16384;		# Mask indicating a directory in stat.cmode.
-
-    opendir(DIR,$fn);
     my $filehash = {};
-    my @files= readdir(DIR);
     foreach my $filename (@files) {
-        # Skip .DS_Store and hidden files
+        # Skip .DS_Store, .DAV and hidden files
         my ($extension) = ($filename=~/\.(\w+)$/);
-        next if (($filename eq '.DS_Store') 
-                || &Apache::loncommon::fileembstyle($extension) eq 'hdn');
+        next if (($filename eq '.DS_Store')
+                || ($filename eq '.DAV')
+                || (&Apache::loncommon::fileembstyle($extension) eq 'hdn')
+                || ($filename =~ /^\._/));
 
         my ($cmode,$csize,$cmtime)=(stat($fn.'/'.$filename))[2,7,9];
         my $linkfilename = &HTML::Entities::encode('/priv'.$thisdisfn.'/'.$filename,'<>&"');
@@ -224,12 +269,10 @@ sub handler {
         }
     }
 
-    closedir(DIR);
-
     $r->print( &Apache::loncommon::end_data_table()
         .&Apache::loncommon::end_page() );
 
-    return OK;  
+    return OK;
 }
 
 
@@ -262,12 +305,12 @@ sub startpage {
     # in start_page->bodytag->innerregister
 
     $env{'request.noversionuri'}=$formaction;
-    $r->print(&Apache::loncommon::start_page('Authoring Space',undef));
+    $r->print(&Apache::loncommon::start_page('Authoring Space'));
 
     my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
     my $current_disk_usage = &Apache::lonnet::diskusage($udom,$uname,"$londocroot/priv/$udom/$uname");
-    my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom,'author'); #expressed in Mb
-    $disk_quota = 1000 * $disk_quota; # convert from Mb to kb
+    my $disk_quota = &Apache::loncommon::get_user_quota($uname,$udom,'author'); #expressed in MB
+    $disk_quota = 1000 * $disk_quota; # convert from MB to kB
 
     $r->print(&Apache::loncommon::head_subbox(
                      '<div style="float:right;padding-top:0;margin-top;0">'
@@ -630,7 +673,7 @@ sub putdirectory {
 	          '<td></td>'.
 		  "</tr>\n");
     }
-    return OK;
+    return;
 }
 
 sub getTitle {
@@ -776,10 +819,10 @@ sub putresource {
               '<td class="LC_browser_file_'.$pubstatus.'">&nbsp;&nbsp;</td>'. # Display publication status
               '<td>'.$status.'</td>'.
 	      '<td>'.&Apache::lonlocal::locallocaltime($cmtime).'</td>'.
-	      '<td>'.sprintf "%.1f", $size.'</td>'.
+	      '<td>'.sprintf("%.1f",$size).'</td>'.
 	      &Apache::loncommon::end_data_table_row()
     );
-    return OK;
+    return;
 }
 
 sub create_pubselect {
@@ -832,6 +875,7 @@ sub check_for_versions {
             $versions ++;        
         }
     }
+    closedir(DIR);
     return $versions;
 }