Diff for /loncom/interface/londocs.pm between versions 1.9 and 1.10

version 1.9, 2002/08/21 17:18:08 version 1.10, 2002/08/26 12:44:45
Line 38  use Apache::lonratsrv; Line 38  use Apache::lonratsrv;
 my $iconpath;  my $iconpath;
   
 # Mapread read maps into lonratedt::global arrays   # Mapread read maps into lonratedt::global arrays 
 # @links and @resources, determines status  # @order and @resources, determines status
 # sets @order - pointer to resources in right order  # sets @order - pointer to resources in right order
 # sets @resources - array with the resources with correct idx  # sets @resources - array with the resources with correct idx
 #  #
Line 59  sub storemap { Line 59  sub storemap {
   
 sub editor {  sub editor {
     my ($r,$coursenum,$coursedom,$folder,$allowed)=@_;      my ($r,$coursenum,$coursedom,$folder,$allowed)=@_;
     my ($errtext,$fatal)=      my $errtext='';
       my $fatal=0;
       ($errtext,$fatal)=
           &mapread($coursenum,$coursedom,$folder.'.sequence');            &mapread($coursenum,$coursedom,$folder.'.sequence');
     if ($fatal) {      if ($fatal) {
    $r->print('<p><font color="red">'.$errtext.'</font></p>');     $r->print('<p><font color="red">'.$errtext.'</font></p>');
     } else {      } else {
 # ------------------------------------------------------------ Process commands  # ------------------------------------------------------------ Process commands
  if ($allowed) {   if ($allowed) {
   # upload a file, if present
              if (($ENV{'form.uploaddoc.filename'}) &&
                  ($ENV{'form.cmd'}=~/^upload_(\w+)/)) {
       if ($folder=~/^$1/) {
   # this is for a course, not a user, so set coursedoc flag
   # probably the only place in the system where this should be "1"
         my $url=&Apache::lonnet::userfileupload('uploaddoc',1);
                 my $ext='false';
                 if ($url=~/^http\:\/\//) { $ext='true'; }
                 $url=~s/\:/\&colon;/g;
         my $comment=$ENV{'form.comment'};
                 $comment=~s/\</\&lt\;/g;
                 $comment=~s/\>/\&gt\;/g;
                 $comment=~s/\:/\&colon;/g;
                 my $newidx=$#Apache::lonratedt::resources+1;
                 $Apache::lonratedt::resources[$newidx]=
                     $comment.':'.$url.':'.$ext.':normal:res';
                 $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=
                                                                 $newidx;       
          &storemap($coursenum,$coursedom,$folder.'.sequence');
        }
               }
     if ($ENV{'form.cmd'}) {      if ($ENV{'form.cmd'}) {
                   my ($cmd,$idx)=split(/\_/,$ENV{'form.cmd'});
                   if ($cmd eq 'del') {
       for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) {
                           $Apache::lonratedt::order[$i]=
                             $Apache::lonratedt::order[$i+1];
                       }
                       $#Apache::lonratedt::order--;
                   } elsif ($cmd eq 'up') {
                       my $i=$Apache::lonratedt::order[$idx-1];
                       $Apache::lonratedt::order[$idx-1]=
    $Apache::lonratedt::order[$idx];
                       $Apache::lonratedt::order[$idx]=$i;
                   } elsif ($cmd eq 'down') {
                       my $i=$Apache::lonratedt::order[$idx+1];
                       $Apache::lonratedt::order[$idx+1]=
    $Apache::lonratedt::order[$idx];
                       $Apache::lonratedt::order[$idx]=$i;
                   }
   # Store the changed version
    &storemap($coursenum,$coursedom,$folder.'.sequence');
             }              }
  }   }
 # ---------------------------------------------------------------- Print screen  # ---------------------------------------------------------------- Print screen
           my $idx=0;
           $r->print('<table>');
           foreach (@Apache::lonratedt::order) {
              my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]);
              unless ($name) {  $name=(split(/\//,$url))[-1]; }
              unless ($name) { $name='EMPTY'; }
              $r->print(&entryline($idx,$name,$url,$folder,$allowed));
              $idx++;
           }
           $r->print('</table>');
     }      }
 }  }
   
Line 92  sub entryline { Line 145  sub entryline {
 END  END
     }      }
 # URL  # URL
       if ($url=~/^\/*uploaded\//) {
    $url=&Apache::lonnet::tokenwrapper($url);
       }
     $line.='<td><a href="'.$url.'">View</a></td>';      $line.='<td><a href="'.$url.'">View</a></td>';
 # Title  # Title
     $title=&Apache::lonnet::unescape($title);      $title=&Apache::lonnet::unescape($title);
Line 100  END Line 156  END
  ) { $title='<i>'.localtime($1).'</i> '.$2.' at '.$3.': <br>'.   ) { $title='<i>'.localtime($1).'</i> '.$2.' at '.$3.': <br>'.
  &Apache::lontexconvert::msgtexconverted($4);   &Apache::lontexconvert::msgtexconverted($4);
  }   }
     $line.='<td>$title</td>';      $line.="<td>$title</td>";
     $line.='</tr>';      $line.='</tr>';
     return $line;      return $line;
 }  }
Line 117  sub handler { Line 173  sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['folder']);      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['folder']);
     my $standard=($ENV{'request.course.uri'}=~/^\/uploaded\//);      my $standard=($ENV{'request.course.uri'}=~/^\/uploaded\//);
     my $forcestandard=($ENV{'form.folder'}=~/^default_/);      my $forcestandard=($ENV{'form.folder'}=~/^default_/);
     my $forcesupplement=($ENV{'form.folder'}=~/^supplement_/);      my $forcesupplement=($ENV{'form.folder'}=~/^supplemental_/);
   
 # does this user have privileges to post, etc?  # does this user have privileges to post, etc?
     my $allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'});      my $allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'});
Line 135  sub handler { Line 191  sub handler {
   
     $iconpath = $r->dir_config('lonIconsURL') . "/";      $iconpath = $r->dir_config('lonIconsURL') . "/";
   
 # upload a file, if present  
     if (($ENV{'form.uploaddoc.filename'}) && ($allowed)) {  
 # this is for a course, not a user, so set coursedoc flag  
 # probably the only place in the system where this should be "1"  
  my $url=&Apache::lonnet::userfileupload('uploaddoc',1);  
  my $comment=$ENV{'form.comment'};  
         $comment=~s/\</\&lt\;/g;  
         $comment=~s/\>/\&gt\;/g;          
     }  
   
 # print screen  # print screen
     $r->print(<<ENDDOCUMENT);      $r->print(<<ENDDOCUMENT);
 <html>  <html>
Line 158  $r->print(&Apache::loncommon::bodytag('C Line 204  $r->print(&Apache::loncommon::bodytag('C
     if (($standard) && ($allowed) && (!$forcesupplement)) {      if (($standard) && ($allowed) && (!$forcesupplement)) {
        $r->print('<h2>Main Course Documents</h2>');         $r->print('<h2>Main Course Documents</h2>');
        my $folder=$ENV{'form.folder'};         my $folder=$ENV{'form.folder'};
        unless ($folder) { $folder='default'; }         unless ($folder=~/^default/) { $folder='default'; }
        &editor($r,$coursenum,$coursedom,$folder,$allowed);         &editor($r,$coursenum,$coursedom,$folder,$allowed);
        $r->print(<<ENDFORM);         $r->print(<<ENDFORM);
 <h3>Post a new main course document</h3>  <h3>Post a new main course document</h3>
 <form method="post" enctype="multipart/form-data">  <form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
 <input type="file" name="uploaddoc" size="50">  <input type="file" name="uploaddoc" size="50">
 <br />  <br />
 Title: <input type="text" size="50" name="comment">  Title: <input type="text" size="50" name="comment">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="cmd" value="upload_main">  <input type="hidden" name="cmd" value="upload_default">
 <input type="submit" value="Upload Document">  <input type="submit" value="Upload Document">
 </form>  </form>
 ENDFORM  ENDFORM
Line 177  ENDFORM Line 223  ENDFORM
     if (!$forcestandard) {      if (!$forcestandard) {
        $r->print('<h2>Supplemental Course Documents</h2>');         $r->print('<h2>Supplemental Course Documents</h2>');
        my $folder=$ENV{'form.folder'};         my $folder=$ENV{'form.folder'};
        unless ($folder) { $folder='supplemental'; }         unless ($folder=~/supplemental/) { $folder='supplemental'; }
        &editor($r,$coursenum,$coursedom,$folder,$allowed);         &editor($r,$coursenum,$coursedom,$folder,$allowed);
        if ($allowed) {         if ($allowed) {
           $r->print(<<ENDSUPFORM);            $r->print(<<ENDSUPFORM);
 <h3>Post a new supplemental course document</h3>  <h3>Post a new supplemental course document</h3>
 <form method="post" enctype="multipart/form-data">  <form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
 <input type="file" name="uploaddoc" size="50">  <input type="file" name="uploaddoc" size="50">
 <br />Comment:<br />  <br />Comment:<br />
 <textarea cols=50 rows=4 name='comment'>  <textarea cols=50 rows=4 name='comment'>
 </textarea>  </textarea>
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folder" value="$folder">
 <input type="hidden" name="cmd" value="upload_suppl">  <input type="hidden" name="cmd" value="upload_supplemental">
 <input type="submit" value="Upload Document">  <input type="submit" value="Upload Document">
 </form>  </form>
 ENDSUPFORM  ENDSUPFORM

Removed from v.1.9  
changed lines
  Added in v.1.10


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