--- loncom/publisher/lonpubdir.pm	2005/02/28 08:22:09	1.77
+++ loncom/publisher/lonpubdir.pm	2005/05/20 18:28:22	1.81
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.77 2005/02/28 08:22:09 albertel Exp $
+# $Id: lonpubdir.pm,v 1.81 2005/05/20 18:28:22 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -61,7 +61,7 @@ sub handler {
              $fn,$r->dir_config('lonDefDomain')); 
   unless (($uname) && ($udom)) {
      $r->log_reason($uname.' at '.$udom.
-         ' trying to list directory '.$ENV{'form.filename'}.
+         ' trying to list directory '.$env{'form.filename'}.
          ' ('.$fn.') - not authorized', 
          $r->filename); 
      return HTTP_NOT_ACCEPTABLE;
@@ -72,7 +72,7 @@ sub handler {
   $fn=~s/\/$//;
 
   unless ($fn) { 
-     $r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
+     $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
          ' trying to list empty directory', $r->filename); 
      return HTTP_NOT_FOUND;
   } 
@@ -91,7 +91,7 @@ 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 ($ENV{'environment.remote'} eq 'off') {
+  if ($env{'environment.remote'} eq 'off') {
       &dircontrols($r,$uname,$udom,$thisdisfn);    # Put out actions for directory, 
                                                # browse/upload + new file page.
   } else {
@@ -148,8 +148,8 @@ sub getEffectiveUrl {
     my $r = shift;
     my $fn;
     
-    if ($ENV{'form.filename'}) {	# If a form filename is defined.
-	$fn=$ENV{'form.filename'};
+    if ($env{'form.filename'}) {	# If a form filename is defined.
+	$fn=$env{'form.filename'};
 	#
 	#   Replace the ~username of the URL with /home/username/public_html
 	#   so that we don't have to worry about ~ expansion internally.
@@ -206,8 +206,8 @@ sub startpage {
                  'this.form.action=this.form.recent.value;this.form.submit()').
               '</form>';
     &Apache::lonhtmlcommon::store_recent('construct',$formaction,$formaction);
-    if ($ENV{'environment.remote'} eq 'off') {
-	$ENV{'request.noversionuri'}=$currdir.'/';
+    if ($env{'environment.remote'} eq 'off') {
+	$env{'request.noversionuri'}=$currdir.'/';
 	$r->print(&Apache::loncommon::bodytag('Construction Space',undef,undef,undef,undef,undef,$pagetitle));
     } else {
 	$r->print($pagetitle);
@@ -223,12 +223,8 @@ parent.lastknownpriv='/~$uname$thisdisfn
 
     function currdiract(theform) {
         if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'publish') {
-            document.publishdir.filename.value = theform.filename.value
-            pubdir(document.publishdir)
-        }
-        if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'publishsub') {
-            document.publishdir.filename.value = theform.filename.value
-            pubrecdir(document.publishdir)
+            document.publishdir.filename.value = theform.filename.value;
+	    document.publishdir.submit();
         }
         if (theform.dirtask.options[theform.dirtask.selectedIndex].value == 'editcat') {
             top.location=theform.filename.value+'default.meta'
@@ -239,26 +235,6 @@ parent.lastknownpriv='/~$uname$thisdisfn
         }
     }
   
-    function pubdir(theform) {
-	if (confirm('Publish complete directory?')) {
-            forcepub(theform)
-	    theform.submit();
-        }
-    }
-    function pubrecdir(theform) {
-	if (confirm('Publish directory and all subdirectories?')) {
-            forcepub(theform);
-            theform.pubrec.value='1';
-	    theform.submit();
-        }
-    }
-
-    function forcepub(theform) {
-        if (confirm('Force publication of unmodified files? -  Cancel=No; OK=yes.')) {
-            theform.forcerepub.value="ON";
-        } 
-    }
-
     function checkUpload(theform) {
         if (theform.file == '') {
             alert("Please use 'Browse..' to choose a file first, before uploading")
@@ -273,10 +249,7 @@ parent.lastknownpriv='/~$uname$thisdisfn
             return
         }
         if (theform.diraction.options[theform.diraction.selectedIndex].value == "publish") {
-            pubdir(theform)
-        }
-        if (theform.diraction.options[theform.diraction.selectedIndex].value == "publishsub") {
-            pubrecdir(theform)
+            theform.submit();
         }
         if (theform.diraction.options[theform.diraction.selectedIndex].value == "editcat") {
             top.location=theform.filename.value+'default.meta'
@@ -306,7 +279,7 @@ parent.lastknownpriv='/~$uname$thisdisfn
       if (activity == 'obsolete') {
           var pubform = document.pubresource
           pubform.filename.value = theform.filename.value
-          alert("You will be taken to the publication page.\\nCheck the 'Obsolete' checkbox at the bottom of the page, and click 'Finalize Publication'.")
+          pubform.makeobsolete.value=1;
           pubform.submit()
       }
       if (activity == 'print') {
@@ -333,8 +306,8 @@ parent.lastknownpriv='/~$uname$thisdisfn
 ENDPUBDIRSCRIPT
     $r->print($pubdirscript);
 
-    if ((($uname ne $ENV{'user.name'}) || ($udom ne $ENV{'user.domain'})) &&
-	$ENV{'environment.remote'} ne 'off') {
+    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.
 		  '</h3>');
     }
@@ -355,7 +328,6 @@ sub dircontrols {
            <select name="dirtask" onChange="currdiract(this.form)">
             <option>Select action</option>
             <option value="publish">Publish directory</option>
-            <option value="publishsub">Publish with subdirectories</option>
             <option value="editcat">Edit catalog information</option>
             <option value="printdir">Print contents of directory</option>
            </select>
@@ -364,7 +336,6 @@ sub dircontrols {
           <form name="publishdir" method="post" action="/adm/publish" target="_parent">
            <input type="hidden" name="pubrec" value="" />
            <input type="hidden" name="filename" value="" />
-           <input type="hidden" name="forcerepub" value="NO" />
           </form>
           <form name="printdir" method="post" action="/adm/printout" target="_parent">
            <input type="hidden" name="postdata" value="" />
@@ -405,12 +376,7 @@ sub pubbuttons {
     $r->print('<form method="post" action="/adm/publish" target="_parent">'.
               '<table><tr><td><input type="hidden" name="filename" value="/~'.
                $uname.$thisdisfn.'/" />'.
-              '<input type="button" onClick="pubdir(this.form);" value="'.
-&mt('Publish Directory').'" />'.
-              '<input type="hidden" name="pubrec" value="" />'.
-              '<input type="hidden" name="forcerepub" value="NO" />'.
-              '<input type="button" onClick="pubrecdir(this.form);" value="'.
-&mt('Publish Directory and Sub Directories').'" /></td><td>'.
+              '<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>');
@@ -429,9 +395,8 @@ sub resourceactions {
          <input type="hidden" name="action" value="delete" />
        </form>
        <form name="pubresource" action="/adm/publish" target="_parent" method="post">
-         <input type="hidden" name="pubrec" value="" />
          <input type="hidden" name="filename" value="" />
-         <input type="hidden" name="forcerepub" value="NO" />
+         <input type="hidden" name="makeobsolete" value="0" />
        </form>
        <form name="printresource" action="/adm/printout" target="_parent" method="post">
            <input type="hidden" name="postdata" value="" />
@@ -518,8 +483,6 @@ sub putdirectory {
                     '</select>'.
                      '<input type="hidden" name="filename" value="'.$dirpath.'/'.$dirname.'/" />'.
                      '<input type="hidden" name="openname" value="'.$here.'/'.$dirname.'/" />'.
-                     '<input type="hidden" name="pubrec" value="" />'.
-                     '<input type="hidden" name="forcerepub" value="" />'.
                      '<input type="hidden" name="postdata" value="" />'.
                    '</form>';
             $$numdir ++;
@@ -545,6 +508,7 @@ sub putresource {
     my ($r, $udom, $uname, $filename, $thisdisfn, 
 	$resdir, $targetdir, $linkdir,
 	$cmtime,$bombs,$numres) = @_;
+    &Apache::lonnet::devalidate_cache_new('meta',$targetdir.'/'.$filename);
     my $pubstatus = 'unpublished';
     my $status=&mt('Unpublished');
     my $bgcolor='#FFAA99';