[BACK]Return to londocs.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/londocs.pm between versions 1.462 and 1.465

version 1.462, 2011/10/31 01:22:25 version 1.465, 2011/11/27 21:04:19
Line 1577  sub handle_edit_cmd { Line 1577  sub handle_edit_cmd {
   
     if ($cmd eq 'del') {      if ($cmd eq 'del') {
  if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&   if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
     ($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library|task)$/)) {      ($url!~/$LONCAPA::assess_page_seq_re/)) {
     &Apache::lonnet::removeuploadedurl($url);      &Apache::lonnet::removeuploadedurl($url);
  } else {   } else {
     &LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);      &LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
Line 2872  sub handler { Line 2872  sub handler {
     my $containertag;      my $containertag;
     my $uploadtag;      my $uploadtag;
   
   # Do we directly jump somewhere?
      if ($env{'form.command'} eq 'direct') {
          (my $mapurl) = &Apache::lonnet::decode_symb($env{'form.symb'});
          my $maptitle = &Apache::lonnet::gettitle($mapurl);
          $mapurl=~s{^.*/([^/]+)\.\w+$}{$1};
          $env{'form.folderpath'}=
                       'default&'.&Apache::lonhtmlcommon::entity_encode('Main Course Documents').
                       '&default&...::::&'.
                       &Apache::lonhtmlcommon::entity_encode($mapurl).'&'.
                           &Apache::lonhtmlcommon::entity_encode($maptitle).'::::';
      }
   
 # Where do we store these for when we come back?  # Where do we store these for when we come back?
     my $stored_folderpath='docs_folderpath';      my $stored_folderpath='docs_folderpath';
     if ($supplementalflag) {      if ($supplementalflag) {
        $stored_folderpath='docs_sup_folderpath';         $stored_folderpath='docs_sup_folderpath';
     }      }
          
 # No folderpath, no pagepath, see if we have something stored  # No folderpath, no pagepath, see if we have something stored
     if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'})) {      if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'})) {
         &Apache::loncommon::restore_course_settings($stored_folderpath,          &Apache::loncommon::restore_course_settings($stored_folderpath,
Removed from v.1.462  
changed lines
  Added in v.1.465

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