Diff for /loncom/interface/londocs.pm between versions 1.20 and 1.21

version 1.20, 2002/09/05 19:37:00 version 1.21, 2002/09/06 15:18:23
Line 234  sub handler { Line 234  sub handler {
     my $events='';      my $events='';
     my $showdoc=0;      my $showdoc=0;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
        ['folder','foldername','showdoc']);         ['folder','foldername']);
     unless ($ENV{'form.showdoc'}) { # got called from remote      if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
          $showdoc=$1;
       }
       unless ($showdoc) { # got called from remote
        $forcestandard=($ENV{'form.folder'}=~/^default_/);         $forcestandard=($ENV{'form.folder'}=~/^default_/);
        $forcesupplement=($ENV{'form.folder'}=~/^supplemental_/);         $forcesupplement=($ENV{'form.folder'}=~/^supplemental_/);
   
Line 247  sub handler { Line 250  sub handler {
        }         }
     } else { # got called in sequence from course      } else { # got called in sequence from course
        $allowed=0;         $allowed=0;
        $showdoc=1;         $script='</script>'.&Apache::lonxml::registerurl(1,undef).'<script>';
        $script=&Apache::lonxml::registerurl(1,undef);  
        $events='onLoad="'.&Apache::lonxml::loadevents.         $events='onLoad="'.&Apache::lonxml::loadevents.
            '" onUnload="'.&Apache::lonxml::unloadevents.'"';             '" onUnload="'.&Apache::lonxml::unloadevents.'"';
     }      }
Line 466  ENDSUPFORM Line 468  ENDSUPFORM
   } else {    } else {
 # -------------------------------------------------------- This is showdoc mode  # -------------------------------------------------------- This is showdoc mode
       $r->print("<h1>Uploaded Document</h1><p>It is recommended that you use an up-to-date virus scanner before handling this file.</p><p><table>".        $r->print("<h1>Uploaded Document</h1><p>It is recommended that you use an up-to-date virus scanner before handling this file.</p><p><table>".
          &entryline(0,"Click to download or use your browser's Save Link function",$ENV{'form.showdoc'}).'</table></p>');           &entryline(0,"Click to download or use your browser's Save Link function",$showdoc).'</table></p>');
   }    }
   $r->print('</body></html>');    $r->print('</body></html>');
   return OK;    return OK;

Removed from v.1.20  
changed lines
  Added in v.1.21


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>