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

Diff for /loncom/interface/londocs.pm between versions 1.111 and 1.113

version 1.111, 2004/03/31 05:23:59 version 1.113, 2004/04/06 23:05:29
Line 280  sub editor { Line 280  sub editor {
 # upload a file, if present  # upload a file, if present
            if (($ENV{'form.uploaddoc.filename'}) &&             if (($ENV{'form.uploaddoc.filename'}) &&
                ($ENV{'form.cmd'}=~/^upload_(\w+)/)) {                 ($ENV{'form.cmd'}=~/^upload_(\w+)/)) {
     if ($folder=~/^$1/) {      if ( ($folder=~/^$1/) || ($1 eq 'default') ) {
 # this is for a course, not a user, so set coursedoc flag  # this is for a course, not a user, so set coursedoc flag
 # probably the only place in the system where this should be "1"  # probably the only place in the system where this should be "1"
       my $url=&Apache::lonnet::userfileupload('uploaddoc',1);        my $url=&Apache::lonnet::userfileupload('uploaddoc',1);
Line 398  sub editor { Line 398  sub editor {
            my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]);             my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]);
            unless ($name) {  $name=(split(/\//,$url))[-1]; }             unless ($name) {  $name=(split(/\//,$url))[-1]; }
            unless ($name) { next; }             unless ($name) { next; }
            $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_));             $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_,$coursenum));
            $idx++;             $idx++;
         }          }
         $r->print('</table>');          $r->print('</table>');
Line 408  sub editor { Line 408  sub editor {
 # --------------------------------------------------------------- An entry line  # --------------------------------------------------------------- An entry line
   
 sub entryline {  sub entryline {
     my ($index,$title,$url,$folder,$allowed,$residx)=@_;      my ($index,$title,$url,$folder,$allowed,$residx,$coursenum)=@_;
     $title=~s/\&colon\;/\:/g;      $title=~s/\&colon\;/\:/g;
     $title=&HTML::Entities::encode(&HTML::Entities::decode(      $title=&HTML::Entities::encode(&HTML::Entities::decode(
      &Apache::lonnet::unescape($title)),'"<>&\'');       &Apache::lonnet::unescape($title)),'"<>&\'');
Line 458  END Line 458  END
     if ($uploaded) {      if ($uploaded) {
        if ($extension eq 'sequence') {         if ($extension eq 'sequence') {
   $icon=$iconpath.'/folder_closed.gif';    $icon=$iconpath.'/folder_closed.gif';
           $url=~/\/(\w+)\.sequence/;            $url=~/$coursenum\/([\/\w]+)\.sequence$/;
           $url='/adm/coursedocs?folder='.$1;            $url='/adm/coursedocs?folder='.$1;
           $isfolder=1;            $isfolder=1;
        } else {         } else {
Line 466  END Line 466  END
        }          } 
     }      }
     $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;      $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;
     if (($residx) && ($folder!~/supplemental/)) {      if ((!$isfolder) && ($residx) && ($folder!~/supplemental/)) {
        $url.=(($url=~/\?/)?'&':'?').'symb='.   my $symb=&Apache::lonnet::symbclean(
        &Apache::lonnet::escape(&Apache::lonnet::symbclean(  
           &Apache::lonnet::declutter('uploaded/'.            &Apache::lonnet::declutter('uploaded/'.
            $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'.             $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'.
            $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.'/'.$folder.             $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.'/'.$folder.
            '.sequence').             '.sequence').
            '___'.$residx.'___'.             '___'.$residx.'___'.
    &Apache::lonnet::declutter($url)));     &Apache::lonnet::declutter($url));
    (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
    $url=&Apache::lonnet::clutter($url);
    $url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb);
     }      }
     if ($isfolder) { $url.='&foldername='.      if ($isfolder) { $url.='&foldername='.
        &Apache::lonnet::escape($foldertitle); }         &Apache::lonnet::escape($foldertitle); }
     $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'" target="cat_'.$folder.      $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.
  '"><img src="'.$icon.'" border="0"></a></td>'.   '" border="0"></a></td>'.
         "<td bgcolor='#FFFFBB'><a href='$url' target='cat_$folder'>$title</a></td></tr>";          "<td bgcolor='#FFFFBB'><a href='$url'>$title</a></td></tr>";
     return $line;      return $line;
 }  }
   
Line 1125  ENDCOURSEVERIFY Line 1127  ENDCOURSEVERIFY
        $r->print('<tr><td bgcolor="#BBBBBB"><h2>'.&mt('Main Course Documents').         $r->print('<tr><td bgcolor="#BBBBBB"><h2>'.&mt('Main Course Documents').
   ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');    ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');
        my $folder=$ENV{'form.folder'};         my $folder=$ENV{'form.folder'};
        unless ($folder=~/^default/) { $folder='default'; }         if ($folder eq '') {
              $folder='default';
          }
        my $postexec='';         my $postexec='';
        if ($folder eq 'default') {         if ($folder eq 'default') {
    $r->print('<script>this.window.name="loncapaclient";</script>');     $r->print('<script>this.window.name="loncapaclient";</script>');
Removed from v.1.111  
changed lines
  Added in v.1.113

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