--- loncom/publisher/lonpubdir.pm	2006/06/22 20:49:19	1.93
+++ loncom/publisher/lonpubdir.pm	2008/11/10 14:11:08	1.112
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.93 2006/06/22 20:49:19 albertel Exp $
+# $Id: lonpubdir.pm,v 1.112 2008/11/10 14:11:08 jms Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -27,6 +27,118 @@
 #
 ###
 
+=head1 NAME
+
+Apache::lonpubdir - Construction space directory lister
+
+=head1 SYNOPSIS
+
+Invoked (for various locations) by /etc/httpd/conf/srm.conf:
+
+ <LocationMatch "^/\~.*/$">
+ PerlAccessHandler       Apache::loncacc
+ SetHandler perl-script
+ PerlHandler Apache::lonpubdir
+ ErrorDocument     403 /adm/login
+ ErrorDocument     404 /adm/notfound.html
+ ErrorDocument     406 /adm/unauthorized.html
+ ErrorDocument	  500 /adm/errorhandler
+ </LocationMatch>
+
+ <Location /adm/pubdir>
+ PerlAccessHandler       Apache::lonacc
+ SetHandler perl-script
+ PerlHandler Apache::lonpubdir
+ ErrorDocument     403 /adm/login
+ ErrorDocument     404 /adm/notfound.html
+ ErrorDocument     406 /adm/unauthorized.html
+ ErrorDocument	  500 /adm/errorhandler
+ </Location>
+
+=head1 INTRODUCTION
+
+This module publishes a directory of files.
+
+This is part of the LearningOnline Network with CAPA project
+described at http://www.lon-capa.org.
+
+=head1 HANDLER SUBROUTINE
+
+This routine is called by Apache and mod_perl.
+
+=over 4
+
+=item *
+
+read in information
+
+=item *
+
+start page output
+
+=item *
+
+run through list of files and attempt to publish unhidden files
+
+=back
+
+=head2 OTHER SUBROUTINES:
+
+=head3 startpage($r, $uame, $udom, $thisdisfn)
+
+Output the header of the page.  This includes:
+ - The HTML header 
+ - The H1/H3  stuff which includes the directory.
+ 
+    startpage($r, $uame, $udom, $thisdisfn);
+        $r     - The apache request object.
+        $uname - User name.
+        $udom  - Domain name the user is logged in under.
+        $thisdisfn - Displayable version of the filename.
+
+=head3 getTitleString($fullname)
+
+    Get the title string or "[untitled]" if the file has no title metadata:
+    Without the latter substitution, it's impossible to examine metadata for
+    untitled resources.  Resources may be legitimately untitled, to prevent
+    searches from locating them.
+    
+    $str = getTitleString($fullname);
+        $fullname - Fully qualified filename to check.
+
+=head3 putdirectory(r, base, here, dirname, modtime)
+
+    Put out a directory table row:
+    
+    putdirectory($r, $base, $here, $dirname, $modtime)
+        $r       - Apache request object.
+        $reqfile - File in request.
+        $here    - Where we are in directory tree.
+        $dirname - Name of directory special file.
+        $modtime - Encoded modification time.
+
+=head3 CategorizeFiles($location, $files)
+    
+    Categorize files in the directory.
+    For each file in a list of files in a file directory, 
+    the  file categorized as one of:
+        - directory  
+        - sequence
+        - problem 
+        - Other resource.
+
+    For each file the modification date is determined as well.
+    Returned is a list of sublists:
+        (directories, sequences, problems, other)
+    each of the sublists contains entries of the following form (sorted by filename):
+    (filename, typecode, lastmodtime)
+    
+        $list = CategorizeFiles($location, $files)
+        $location   - Directory in which the files live (relative to our execution)
+        $files      - list of files.
+
+=cut
+
 package Apache::lonpubdir;
 
 use strict;
@@ -41,6 +153,7 @@ use Apache::lonlocal;
 use Apache::lonmsg;
 use Apache::lonmenu;
 use Apache::lonnet;
+use LONCAPA;
 
 sub handler {
 
@@ -104,7 +217,7 @@ sub handler {
   my $numres = 0;
   
   # Start off the directory table.
-  $r->print('<h3>Directory Contents:</h3>');
+  $r->print('<h3>'.&mt('Directory Contents:').'</h3>');
   $r->print('<table id="LC_browser"><tr>'.
             '<th>'.&mt('Type').'</th>'.
             '<th>'.&mt('Actions').'</th>'.
@@ -157,7 +270,7 @@ sub getEffectiveUrl {
 	#
 	$fn=~s/^http\:\/\/[^\/]+\///;
         $fn=~s/^\///;
-        $fn=~s/\~(\w+)/\/home\/$1\/public_html/;
+        $fn=~s{~($LONCAPA::username_re)}{/home/$1/public_html};
 	
 	#  Remove trailing / strings (?) 
 	
@@ -170,7 +283,7 @@ sub getEffectiveUrl {
 	    #internal authentication, needs fixup.
 	    $fn = $r->uri(); # non users do not get the full path request
                              # through SCRIPT_FILENAME
-	    $fn=~s|^/~(\w+)|/home/$1/public_html|;
+	    $fn=~s{^/~($LONCAPA::username_re)}{/home/$1/public_html};
 	}
     }
     $fn=~s/\/+/\//g;
@@ -195,8 +308,8 @@ sub startpage {
 
     my $formaction='/priv/'.$uname.$thisdisfn.'/';
     $formaction=~s|/+|/|g;
-    my $pagetitle .= &Apache::loncommon::help_open_menu('','','','',3,'Authoring').
-        '<font face="Arial, Helvetica, sans-serif" size="+1"><b>Construction Space</b>:</font>&nbsp;'.
+    my $pagetitle .= &Apache::loncommon::help_open_menu('','',3,'Authoring').
+        '<font face="Arial, Helvetica, sans-serif" size="+1"><b>'.&mt('Construction Space').'</b>:</font>&nbsp;'.
         '<form name="dirs" method="post" action="'.$formaction.
         '" target="_parent"><tt><b>'.
         &Apache::lonhtmlcommon::crumbs($uname.$thisdisfn.'/','_top','/priv','','+1',1)."</b></tt><br />".
@@ -210,16 +323,20 @@ sub startpage {
 						 {'body_title' =>
 						      $pagetitle,}));
     } else {
-	$r->print(&Apache::loncommon::start_page('Construction Space',undef));
+	$r->print(&Apache::loncommon::start_page('Construction Space',undef,
+						 { 'only_body' => 1,}));
 	$r->print($pagetitle);
     }
 
+    my $esc_thisdisfn = &Apache::loncommon::escape_single($thisdisfn);
+    my $doctitle = 'LON-CAPA '.&mt('Construction Space');
+    my $newname = &mt('New Name');
     my $pubdirscript=(<<ENDPUBDIRSCRIPT);
 <script type="text/javascript">
-top.document.title = '$thisdisfn/ - LON-CAPA Construction Space';
+top.document.title = '$esc_thisdisfn/ - $doctitle';
 // Store directory location for menu bar to find
 
-parent.lastknownpriv='/~$uname$thisdisfn/';
+parent.lastknownpriv='/~$uname$esc_thisdisfn/';
 
 // Confirmation dialogues
 
@@ -309,8 +426,9 @@ parent.lastknownpriv='/~$uname$thisdisfn
       return
     }
     function changename(theform,activity) {
-        var newname=prompt('New Name');
-        if (newname == "" || !newname)  {
+        var oldname=theform.dispfilename.value;
+        var newname=prompt('$newname',oldname);
+        if (newname == "" || !newname || newname == oldname)  {
             return
         }
         document.moveresource.newfilename.value = newname
@@ -352,17 +470,20 @@ sub dircontrols {
                                        ncrf => 'New custom rights file',
                                        nsty => 'New style file',
                                        nlib => 'New library file',
+                                       nbt  => 'New bridgetask file',
                                        nsub => 'New subdirectory',
                                        renm => 'Rename current file to',
                                        move => 'Move current file to',
                                        copy => 'Copy current file to',
                                        type => 'Type Name Here',
-                                       go => 'Go',
+                                       go   => 'Go',
                                        prnt => 'Print contents of directory',
                                        crea => 'Create a new directory or LON-CAPA document',
 				       acti => 'Actions for current directory',
-				       updc => 'Upload a new document'
+				       updc => 'Upload a new document',
+				       pick => 'Please select an action to perform using the new filename',
                                       );
+    my $mytype = $lt{'type'}; # avoid conflict with " and ' in javascript
     $r->print(<<END);
         <table id="LC_cstr_controls">
          <tr>
@@ -401,18 +522,29 @@ sub dircontrols {
 	    <form name="fileaction" method="post" action="/adm/cfile" target="_parent">
 	      <span style="white-space: nowrap">
 		<input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
-			  <select name="action">
-			    <option value="Select Action">$lt{'sela'}</option>
-			    <option value="newfile">$lt{'nfil'}:</option>
-			    <option value="newhtmlfile">$lt{'nhtm'}:</option>
-			    <option value="newproblemfile">$lt{'nprb'}:</option>
-                            <option value="newpagefile">$lt{'npag'}:</option>
-                            <option value="newsequencefile">$lt{'nseq'}:</option>
-                            <option value="newrightsfile">$lt{'ncrf'}:</option>
-                            <option value="newstyfile">$lt{'nsty'}:</option>
-                            <option value="newlibraryfile">$lt{'nlib'}:</option>
-			    <option value="newdir">$lt{'nsub'}:</option>
-		  </select>&nbsp;<input type="text" name="newfilename" value="Type Name Here" onfocus="if (this.value == 'Type Name Here') this.value=''" />&nbsp;<input type="button" value="Go" onclick="document.fileaction.submit()" />
+                  <script type="text/javascript">
+                    function validate_go() {
+                        var selected = document.fileaction.action.selectedIndex;
+                        if (selected == 0) {
+                            alert('$lt{'pick'}');
+                        } else {
+                            document.fileaction.submit();
+                        }
+                    }
+                  </script>
+		  <select name="action">
+		    <option value="none">$lt{'sela'}</option>
+		    <option value="newfile">$lt{'nfil'}:</option>
+		    <option value="newhtmlfile">$lt{'nhtm'}:</option>
+		    <option value="newproblemfile">$lt{'nprb'}:</option>
+                    <option value="newpagefile">$lt{'npag'}:</option>
+                    <option value="newsequencefile">$lt{'nseq'}:</option>
+                    <option value="newrightsfile">$lt{'ncrf'}:</option>
+                    <option value="newstyfile">$lt{'nsty'}:</option>
+                    <option value="newtaskfile">$lt{'nbt'}:</option>
+                    <option value="newlibraryfile">$lt{'nlib'}:</option>
+	            <option value="newdir">$lt{'nsub'}:</option>
+		  </select>&nbsp;<input type="text" name="newfilename" value="$lt{'type'}" onfocus="if (this.value == '$mytype') this.value=''" />&nbsp;<input type="button" value="Go" onclick="validate_go();" />
 		 </span>
 		</form>
 	  </td>
@@ -513,15 +645,15 @@ sub putdirectory {
 	%Apache::lonpublisher::metadatafields=();
 	%Apache::lonpublisher::metadatakeys=();
 	my $construct=$here;
-	$construct=~s:^/priv/(\w+)$:/home/$1/public_html:;
+	$construct=~s{^/priv/($LONCAPA::username_re)$}{/home/$1/public_html};
         my $dirpath = $here;
-        $dirpath=~s:^/priv/:/~:;
+        $dirpath=~s{^/priv/}{/~};
 	&Apache::lonpublisher::metaeval(&Apache::lonnet::getfile(
        				 $construct.'/'.$dirname.'/default.meta'
 								 ));
         my $actionitem = '';
         if ($dirname eq '..') {
-            $actionitem = 'Go to ...';
+            $actionitem = &mt('Go to ...');
         } else {
             $actionitem = 
                     '<form name="dirselect_'.$$numdir.
@@ -571,6 +703,7 @@ sub putresource {
     my $css_class='LC_browser_file';
     my $title='&nbsp;';
     my $publish_button=&mt('Publish');
+    my $cstr_dir = '/home/'.$uname.'/public_html/'.$thisdisfn.'/';
 #    my $action_buttons=
 #        '<br /><a target="_parent" href="/adm/cfile?action=delete&filename=/~'.
 #	$uname.'/'.$thisdisfn.'/'.$filename.'">'.
@@ -585,44 +718,66 @@ sub putresource {
            $same=1;
         } else {
            if (&Apache::londiff::are_different_files($resdir.'/'.$filename,
-	                                      '/home/'.$uname.'/public_html/'.$thisdisfn.'/'.$filename)) {
+						     $cstr_dir.'/'.$filename)) {
               $same=0;
            } else {
               $same=1;
            }
         }
+	my $meta_cmtime = (stat($cstr_dir.'/'.$filename.'.meta'))[9];
+	my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9];
+	my $meta_same = 1;
+	if ($meta_rmtime < $meta_cmtime
+	    && &Apache::londiff::are_different_files($resdir.'/'.$filename.'.meta',
+						     $cstr_dir.'/'.$filename.'.meta')) {
+	    $meta_same = 0;
+	}
 	$publish_button=&mt('Re-publish');
+	my $rights_status =
+	    &mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
+	    &mt(&getSourceRightString($targetdir.'/'.$filename));
+	$title = '<a href="/res/'.$targetdir.'/'.$filename.
+	    '.meta" target="cat">'.
+	    &getTitleString($targetdir.'/'.$filename).'</a>';
 	if ($same) {
-            $pubstatus = 'published';
-	    $status=&mt('Published').'<br />'.
-		&mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
-		&mt(&getSourceRightString($targetdir.'/'.$filename));
 	    if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
                 $pubstatus = 'obsolete';
 		$status=&mt('Obsolete');
-            }
+            } else {
+		if (!$meta_same) {
+		    $pubstatus = 'metamodified';
+		} else {
+		    $pubstatus = 'published';
+		}
+		$status=&mt('Published').
+		    '<br />'. $rights_status;
+	    }
 #	    } else {
 #		$action_buttons='';
 #	    }
-	    $title='<a href="/res/'.$targetdir.'/'.$filename.
-		'.meta" target="cat">'.
-		&getTitleString($targetdir.'/'.$filename).'</a>';
 	} else {
             $pubstatus = 'modified';
-	    $status=&mt('Modified').'<br />'.
-		&mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
-		&mt(&getSourceRightString($targetdir.'/'.$filename));
+	    $status=&mt('Modified').
+		'<br />'. $rights_status;
 #	    $action_buttons='';
-	    $title='<a href="/res/'.$targetdir.'/'.$filename.'.meta" target="cat">'.
-		&getTitleString($targetdir.'/'.$filename).'</a>';
 	    if (&Apache::loncommon::fileembstyle(($filename=~/\.(\w+)$/)) eq 'ssi') {
 		$status.='<br /><a href="/adm/diff?filename=/~'.$uname.
 		    $thisdisfn.'/'.$filename.
 		    '&amp;versiontwo=priv" target="cat">'.&mt('Diffs').'</a>';
 	    }
-	}
+	} 
+
 	$title.="\n".'<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'. 
-	    ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" alt="bomb" />':'Edit Metadata').'</a>';
+	    ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" alt="'.&mt('bomb').'" />':&mt('Edit Metadata')).'</a>';
+
+	if (!$meta_same) {
+	    $title = &mt('Metadata Modified').'<br />'.$title.
+		'<br /><a href="/adm/diff?filename=/~'.$uname.
+		$thisdisfn.'/'.$filename.'.meta'.
+		'&amp;versiontwo=priv" target="cat">'.&mt('Metadata Diffs').'</a>';
+	    $title.="\n".'<br /><a href="/adm/retrieve?filename=/~'.$uname.
+		$thisdisfn.'/'.$filename.'.meta" target="_parent">'.&mt('Retrieve Metadata').'</a>';
+	}
 	$status.="\n".'<br /><a href="/adm/retrieve?filename=/~'.$uname.
 	    $thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Retrieve').'</a>';
     }
@@ -649,7 +804,7 @@ sub putresource {
 	      '<td>'.($filename=~/[\#\~]$/?'&nbsp;':
 		      '<img src="'.&Apache::loncommon::icon($filename).'" alt="" />').'</td>'.
               '<td>'.$pub_select.'</td>'.
-	      '<td><span class="LC_filename"> '.
+	      '<td><span class="LC_filename">'.
 	      '<a href="'.$linkdir.'/'.$filename.'" target="_parent">'.
                $filename.'</a></span>'.$editlink2.$editlink.
 	      '</td>'.
@@ -688,7 +843,9 @@ sub create_pubselect {
 '<option value="print">'.&mt('Print').'</option>'.
 '</select>
 <input type="hidden" name="filename" value="/~'.
- &HTML::Entities::encode($uname.$thisdisfn.'/'.$filename,'<>&"').'" /></form>';
+ &HTML::Entities::encode($uname.$thisdisfn.'/'.$filename,'<>&"').'" />
+ <input type="hidden" name="dispfilename" value="'.
+ &HTML::Entities::encode($filename).'" /></form>';
     $$numres ++;
 }
 
@@ -740,59 +897,4 @@ sub CategorizeFiles {
 1;
 __END__
 
-=head1 NAME
-
-Apache::lonpubdir - Construction space directory lister
-
-=head1 SYNOPSIS
-
-Invoked (for various locations) by /etc/httpd/conf/srm.conf:
-
- <LocationMatch "^/\~.*/$">
- PerlAccessHandler       Apache::loncacc
- SetHandler perl-script
- PerlHandler Apache::lonpubdir
- ErrorDocument     403 /adm/login
- ErrorDocument     404 /adm/notfound.html
- ErrorDocument     406 /adm/unauthorized.html
- ErrorDocument	  500 /adm/errorhandler
- </LocationMatch>
-
- <Location /adm/pubdir>
- PerlAccessHandler       Apache::lonacc
- SetHandler perl-script
- PerlHandler Apache::lonpubdir
- ErrorDocument     403 /adm/login
- ErrorDocument     404 /adm/notfound.html
- ErrorDocument     406 /adm/unauthorized.html
- ErrorDocument	  500 /adm/errorhandler
- </Location>
-
-=head1 INTRODUCTION
-
-This module publishes a directory of files.
-
-This is part of the LearningOnline Network with CAPA project
-described at http://www.lon-capa.org.
-
-=head1 HANDLER SUBROUTINE
-
-This routine is called by Apache and mod_perl.
-
-=over 4
-
-=item *
-
-read in information
-
-=item *
-
-start page output
-
-=item *
-
-run through list of files and attempt to publish unhidden files
-
-=back
 
-=cut