--- loncom/publisher/lonpubdir.pm	2006/11/22 20:16:16	1.96
+++ loncom/publisher/lonpubdir.pm	2010/02/11 21:49:19	1.114.2.1
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.96 2006/11/22 20:16:16 banghart Exp $
+# $Id: lonpubdir.pm,v 1.114.2.1 2010/02/11 21:49:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -41,6 +41,7 @@ use Apache::lonlocal;
 use Apache::lonmsg;
 use Apache::lonmenu;
 use Apache::lonnet;
+use LONCAPA;
 
 sub handler {
 
@@ -61,7 +62,7 @@ sub handler {
     &Apache::loncacc::constructaccess(
              $fn,$r->dir_config('lonDefDomain')); 
   unless (($uname) && ($udom)) {
-     $r->log_reason($uname.' at '.$udom.
+     $r->log_reason($uname.':'.$udom.
          ' trying to list directory '.$env{'form.filename'}.
          ' ('.$fn.') - not authorized', 
          $r->filename); 
@@ -73,7 +74,7 @@ sub handler {
   $fn=~s/\/$//;
 
   unless ($fn) { 
-     $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
+     $r->log_reason($env{'user.name'}.':'.$env{'user.domain'}.
          ' trying to list empty directory', $r->filename); 
      return HTTP_NOT_FOUND;
   } 
@@ -104,7 +105,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>'.
@@ -155,9 +156,10 @@ sub getEffectiveUrl {
 	#   Replace the ~username of the URL with /home/username/public_html
 	#   so that we don't have to worry about ~ expansion internally.
 	#
-	$fn=~s/^http\:\/\/[^\/]+\///;
+        $fn=~s/^https?\:\/\/[^\/]+\///;
+
         $fn=~s/^\///;
-        $fn=~s/\~(\w+)/\/home\/$1\/public_html/;
+        $fn=~s{~($LONCAPA::username_re)}{/home/$1/public_html};
 	
 	#  Remove trailing / strings (?) 
 	
@@ -170,7 +172,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;
@@ -196,7 +198,7 @@ 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;'.
+        '<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 +212,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
 
@@ -228,7 +234,7 @@ parent.lastknownpriv='/~$uname$thisdisfn
             document.publishdir.filename.value = theform.filename.value;
 	    document.publishdir.submit();
         }
-        if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'editcat') {
+        if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'editmeta') {
             top.location=theform.filename.value+'default.meta'
         }
         if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'printdir' ) {
@@ -258,7 +264,7 @@ parent.lastknownpriv='/~$uname$thisdisfn
         if (theform.diraction.options[theform.diraction.selectedIndex].value == "publish") {
             theform.submit();
         }
-        if (theform.diraction.options[theform.diraction.selectedIndex].value == "editcat") {
+        if (theform.diraction.options[theform.diraction.selectedIndex].value == "editmeta") {
             top.location=theform.filename.value+'default.meta'
         }
         if (theform.diraction.options[theform.diraction.selectedIndex].value == "printdir") {
@@ -310,8 +316,8 @@ parent.lastknownpriv='/~$uname$thisdisfn
     }
     function changename(theform,activity) {
         var oldname=theform.dispfilename.value;
-        var newname=prompt('New Name',oldname);
-        if (newname == "" || !newname)  {
+        var newname=prompt('$newname',oldname);
+        if (newname == "" || !newname || newname == oldname)  {
             return
         }
         document.moveresource.newfilename.value = newname
@@ -325,7 +331,7 @@ ENDPUBDIRSCRIPT
 
     if ((($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) &&
 	$env{'environment.remote'} ne 'off') {
-	$r->print('<h3>'.&mt('Co-Author').': '.$uname.' at '.$udom.
+        $r->print('<h3>'.&mt('Co-Author [_1]',$uname.':'.$udom).'</h3>');
 		  '</h3>');
     }
 }
@@ -343,7 +349,7 @@ sub dircontrols {
                                        list => 'List Directory',
                                        uplo => 'Upload file',  
                                        dele => 'Delete',
-                                       edit => 'Edit Catalog Information', 
+                                       edit => 'Edit Metadata', 
                                        sela => 'Select Action',
                                        nfil => 'New file',
                                        nhtm => 'New HTML file',
@@ -353,17 +359,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>
@@ -377,7 +386,7 @@ sub dircontrols {
            <select name="dirtask" onchange="currdiract(this.form)">
             <option>$lt{'sela'}</option>
             <option value="publish">$lt{'pubd'}</option>
-            <option value="editcat">$lt{'edit'}</option>
+            <option value="editmeta">$lt{'edit'}</option>
             <option value="printdir">$lt{'prnt'}</option>
             <option value="delete">$lt{'dedr'}</option>
            </select>
@@ -402,18 +411,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>
@@ -430,7 +450,7 @@ sub pubbuttons {
               '<input type="submit" value="'.&mt('Publish Directory').'" /></td><td>'.
 '<input type="button" onclick="window.location='."'/~".
                $uname.$thisdisfn."/default.meta'".'" value="'.
-&mt('Edit Directory Catalog Information').'" /></td></tr></table></form>');
+&mt('Edit Directory Metadata').'" /></td></tr></table></form>');
 }
 
 sub resourceactions {
@@ -514,15 +534,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.
@@ -531,7 +551,7 @@ sub putdirectory {
                       '<option selected="selected">'.&mt('Select action').'</option>'.
                       '<option value="open">'.&mt('Open').'</option>'.
                       '<option value="publish">'.&mt('Publish').'</option>'.
-                      '<option value="editcat">'.&mt('Edit catalog information').'</option>'.
+                      '<option value="editmeta">'.&mt('Edit Metadata').'</option>'.
                       '<option value="printdir">'.&mt('Print directory').'</option>'.
                       '<option value="delete">'.&mt('Delete directory').'</option>'.
                     '</select>'.
@@ -602,13 +622,20 @@ sub putresource {
 	    $meta_same = 0;
 	}
 	$publish_button=&mt('Re-publish');
-	my $rights_status =
-	    &mt(&getCopyRightString($targetdir.'/'.$filename)).' '.
-	    &mt(&getSourceRightString($targetdir.'/'.$filename));
+
+        my $rights_status =
+            &mt(&getCopyRightString($targetdir.'/'.$filename)).', ';
+
+        my %lt_SourceRight = &Apache::lonlocal::texthash(
+               'open'   => 'Source: open',
+               'closed' => 'Source: closed',
+        );
+        $rights_status .=
+            $lt_SourceRight{&getSourceRightString($targetdir.'/'.$filename)};
+
 	$title = '<a href="/res/'.$targetdir.'/'.$filename.
 	    '.meta" target="cat">'.
 	    &getTitleString($targetdir.'/'.$filename).'</a>';
-	&Apache::lonnet::logthis("same $same meta $meta_same");
 	if ($same) {
 	    if (&Apache::lonnet::metadata($targetdir.'/'.$filename,'obsolete')) {
                 $pubstatus = 'obsolete';
@@ -638,7 +665,7 @@ sub putresource {
 	} 
 
 	$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.
@@ -674,7 +701,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>'.
@@ -715,7 +742,7 @@ sub create_pubselect {
 <input type="hidden" name="filename" value="/~'.
  &HTML::Entities::encode($uname.$thisdisfn.'/'.$filename,'<>&"').'" />
  <input type="hidden" name="dispfilename" value="'.
- &HTML::Entities::encode($filename).'"</form>';
+ &HTML::Entities::encode($filename).'" /></form>';
     $$numres ++;
 }
 
@@ -767,6 +794,7 @@ sub CategorizeFiles {
 1;
 __END__
 
+
 =head1 NAME
 
 Apache::lonpubdir - Construction space directory lister
@@ -822,4 +850,64 @@ run through list of files and attempt to
 
 =back
 
+=head1 SUBROUTINES:
+
+=over
+
+=item 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.
+
+=item 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.
+
+=item 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.
+
+=item 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.
+
+=back
+
 =cut
+