--- loncom/publisher/lonpubdir.pm	2005/07/12 14:56:36	1.85
+++ loncom/publisher/lonpubdir.pm	2005/07/14 21:31:34	1.88
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.85 2005/07/12 14:56:36 albertel Exp $
+# $Id: lonpubdir.pm,v 1.88 2005/07/14 21:31:34 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -233,6 +233,11 @@ parent.lastknownpriv='/~$uname$thisdisfn
             document.printdir.postdata.value=theform.filename.value
             document.printdir.submit();
         }
+        if (theform.dirtask.options[theform.dirtask.selectedIndex].value == "delete") {
+              var delform = document.delresource
+              delform.filename.value = theform.filename.value
+              delform.submit()
+        }
     }
   
     function checkUpload(theform) {
@@ -259,6 +264,11 @@ parent.lastknownpriv='/~$uname$thisdisfn
             theform.postdata.value = theform.filename.value
             theform.submit()
         }
+        if (theform.diraction.options[theform.diraction.selectedIndex].value == "delete") {
+              var delform = document.delresource
+              delform.filename.value = theform.filename.value
+              delform.submit()
+        }
         return
     }
     function SetResChoice(theform) {
@@ -325,8 +335,8 @@ sub dircontrols {
                                        mcdi => 'Must create new subdirectory inside a directory',
                                        pubr => 'Publish this Resource',
                                        pubd => 'Publish this Directory',
+                                       dedr => 'Delete Directory',
                                        rtrv => 'Retrieve Old Version',
-                                       pubs => 'Publish with Subdirectories',
                                        list => 'List Directory',
                                        uplo => 'Upload file',  
                                        dele => 'Delete',
@@ -366,6 +376,7 @@ sub dircontrols {
             <option value="publish">$lt{'pubd'}</option>
             <option value="editcat">$lt{'edit'}</option>
             <option value="printdir">$lt{'prnt'}</option>
+            <option value="delete">$lt{'dedr'}</option>
            </select>
            <input type="hidden" name="filename" value="/~$uname$thisdisfn/" />
           </form>
@@ -517,11 +528,11 @@ sub putdirectory {
                       '<option selected="selected">'.&mt('Select action').'</option>'.
                       '<option value="open">'.&mt('Open').'</option>'.
                       '<option value="publish">'.&mt('Publish').'</option>'.
-                      '<option value="publishsub">'.&mt('Publish with subdirectories').'</option>'.
                       '<option value="editcat">'.&mt('Edit catalog information').'</option>'.
                       '<option value="printdir">'.&mt('Print directory').'</option>'.
+                      '<option value="delete">'.&mt('Delete directory').'</option>'.
                     '</select>'.
-                     '<input type="hidden" name="filename" value="'.$dirpath.'/'.$dirname.'/" />'.
+                     '<input type="hidden" name="filename" value="'.&HTML::Entities::encode($dirpath.'/'.$dirname,'<>&"').'/" />'.
                      '<input type="hidden" name="openname" value="'.$here.'/'.$dirname.'/" />'.
                      '<input type="hidden" name="postdata" value="" />'.
                    '</form>';
@@ -529,9 +540,9 @@ sub putdirectory {
         }
 	$r->print('<tr bgcolor="#CCCCFF">'.
 		  '<td><img src="'.
-		  $Apache::lonnet::perlvar{'lonIconsURL'}.'/folder_closed.gif" /></td>'.
+		  $Apache::lonnet::perlvar{'lonIconsURL'}.'/folder_closed.gif" alt="folder" /></td>'.
 		  '<td>'.$actionitem.'</td>'.
-		  '<td><font face="arial"><a href="'.$here.'/'.$dirname.'/" target="_parent">'.
+		  '<td><font face="arial"><a href="'.&HTML::Entities::encode($here.'/'.$dirname,'<>&"').'/" target="_parent">'.
 		  $disfilename.'</a></font></td>'.
 		        '<td colspan="2">'.($kaputt?&Apache::lonhtmlcommon::authorbombs($resdir.'/'.$disfilename.'/'):'').$Apache::lonpublisher::metadatafields{'title'}.' <i>'.
 		  $Apache::lonpublisher::metadatafields{'subject'}.'</i> '.
@@ -597,7 +608,7 @@ sub putresource {
 	    }
 	}
 	$title.="\n".'<br /><a href="/~'.$uname.$thisdisfn.'/'.$filename.'.meta">'. 
-	    ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" />':'Edit Metadata').'</a>';
+	    ($$bombs{$targetdir.'/'.$filename}?'<img src="/adm/lonMisc/bomb.gif" border="0" alt="bomb" />':'Edit Metadata').'</a>';
 	$status.="\n".'<br /><a href="/adm/retrieve?filename=/~'.$uname.
 	    $thisdisfn.'/'.$filename.'" target="_parent">'.&mt('Retrieve').'</a>';
     }
@@ -622,7 +633,7 @@ sub putresource {
     &create_pubselect($r,\$pub_select,$udom,$uname,$thisdisfn,$filename,$resdir,$pubstatus,$publish_button,$numres);
     $r->print('<tr bgcolor="'.$bgcolor.'">'.
 	      '<td>'.($filename=~/[\#\~]$/?'&nbsp;':
-		      '<img src="'.&Apache::loncommon::icon($filename).'" /></td>').
+		      '<img src="'.&Apache::loncommon::icon($filename).'" alt="" />').'</td>'.
               '<td>'.$pub_select.'</td>'.
 	      '<td><font face="arial">'.
 	      '<a href="'.$linkdir.'/'.$filename.'" target="_parent">'.
@@ -663,7 +674,7 @@ sub create_pubselect {
 '<option value="print">'.&mt('Print').'</option>'.
 '</select>
 <input type="hidden" name="filename" value="/~'.
- $uname.$thisdisfn.'/'.$filename.'" /></form>';
+ &HTML::Entities::encode($uname.$thisdisfn.'/'.$filename,'<>&"').'" /></form>';
     $$numres ++;
 }