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

Diff for /loncom/interface/londocs.pm between versions 1.8 and 1.17

version 1.8, 2002/08/20 13:02:41 version 1.17, 2002/09/04 14:50:53
Line 34  use Apache::lonnet; Line 34  use Apache::lonnet;
 use Apache::loncommon;  use Apache::loncommon;
 use Apache::lonratedt;  use Apache::lonratedt;
 use Apache::lonratsrv;  use Apache::lonratsrv;
   use Apache::lonxml;
   
 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 54  sub storemap { Line 55  sub storemap {
     my ($coursenum,$coursedom,$map)=@_;      my ($coursenum,$coursedom,$map)=@_;
     return      return
       &Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.        &Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
                                 $map);                                  $map,1);
 }  }
   
 sub editor {  sub editor {
     my ($r,$coursenum,$coursedom,$folder,$allowed)=@_;      my ($r,$coursenum,$coursedom,$folder,$allowed)=@_;
     my ($errtext,$fatal)=      if ($ENV{'form.foldername'}) {
    $r->print('<h3>Folder: '.$ENV{'form.foldername'}.'</h3>');
       }
       my $errtext='';
       my $fatal=0;
       ($errtext,$fatal)=
           &mapread($coursenum,$coursedom,$folder.'.sequence');            &mapread($coursenum,$coursedom,$folder.'.sequence');
       if ($#Apache::lonratedt::order<1) {
           $Apache::lonratedt::order[0]=1;
           $Apache::lonratedt::resources[1]='';
       }
     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 they are for this folder and user allowed to make changes
    if (($allowed) && ($ENV{'form.folder'} eq $folder)) {
   # 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;
                 if ($folder=~/^supplemental/) {
     $comment=time.'___&&&___'.$ENV{'user.name'}.'___&&&___'.
         $ENV{'user.domain'}.'___&&&___'.$comment;
                 }
                 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');
             }              }
  }  # Group import/search
       if ($ENV{'form.importdetail'}) {
                  foreach (split(/\&/,$ENV{'form.importdetail'})) {
                     if (defined($_)) {
                my ($name,$url)=split(/\=/,$_);
                        $name=&Apache::lonnet::unescape($name);
                        $url=&Apache::lonnet::unescape($url);
                        if ($url) {
                   my $idx=$#Apache::lonratedt::resources+1;
                           $Apache::lonratedt::order
                              [$#Apache::lonratedt::order+1]=$idx;
                           my $ext='false';
                           if ($url=~/^http\:\/\//) { $ext='true'; }
                           $url=~s/\:/\&colon;/g;
                           $Apache::lonratedt::resources[$idx]=
                              $name.':'.$url.':'.$ext.':normal:res';
                }
                    }
         }
   # Store the changed version
    &storemap($coursenum,$coursedom,$folder.'.sequence');
               }
          }
   # ---------------------------------------------------------------- End commands
 # ---------------------------------------------------------------- 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 91  sub entryline { Line 180  sub entryline {
 <a href='/adm/coursedocs?folder=$folder&cmd=del_$index'>Remove</td>  <a href='/adm/coursedocs?folder=$folder&cmd=del_$index'>Remove</td>
 END  END
     }      }
 # URL  # Figure out what kind of a resource this is
     $line.='<td><a href="'.$url.'">View</a></td>';      my ($extension)=($url=~/\.(\w+)$/);
       my $uploaded=($url=~/^\/*uploaded\//);
       my $icon='unknown';
       if (-e "/home/httpd/html/adm/lonIcons/$extension.gif") {
    $icon=$extension;
       }
       my $isfolder=0;
       if ($uploaded) {
          if ($extension eq 'sequence') {
     $icon='folder_closed';
             $url=~/\/(\w+)\.sequence/;
             $url='/adm/coursedocs?folder='.$1;
             $isfolder=1;
          } else {
     $url=&Apache::lonnet::tokenwrapper($url);
          } 
       }
 # Title  # Title
     $title=&Apache::lonnet::unescape($title);      $title=&Apache::lonnet::unescape($title);
       my $foldertitle=$title;
     if ($title=~      if ($title=~
  /^(\d+)\_\_\_\&\&\&\_\_\_(\w+)\_\_\_\&\&\&\_\_\_(\w+)\_\_\_\&\&\&\_\_\_(.*)$/   /^(\d+)\_\_\_\&\&\&\_\_\_(\w+)\_\_\_\&\&\&\_\_\_(\w+)\_\_\_\&\&\&\_\_\_(.*)$/
  ) { $title='<i>'.localtime($1).'</i> '.$2.' at '.$3.': <br>'.   ) { 
  &Apache::lontexconvert::msgtexconverted($4);              $foldertitle=&Apache::lontexconvert::msgtexconverted($4);
               $title='<i>'.localtime($1).'</i> '.
                   &Apache::loncommon::plainname($2,$3).': <br>'.
    $foldertitle;
  }   }
     $line.='<td>$title</td>';      if ($isfolder) { $url.='&foldername='.$foldertitle; }
     $line.='</tr>';      $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="/adm/lonIcons/'.
           $icon.'.gif" border="0"></a></td>'.
           "<td bgcolor='#FFFFBB'><a href='$url'>$title</a></td></tr>";
     return $line;      return $line;
 }  }
   
Line 114  sub handler { Line 225  sub handler {
   
 # is this a standard course?  # is this a standard course?
   
     &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;
     my $forcesupplement=($ENV{'form.folder'}=~/^supplement_/);      my $forcesupplement;
       my $script='';
       my $allowed;
       my $events='';
       &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
          ['folder','foldername','showdoc']);
       unless ($ENV{'form.showdoc'}) { # got called from remote
          $forcestandard=($ENV{'form.folder'}=~/^default_/);
          $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'});         $allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'});
     my $script='';         if ($allowed) { 
     if ($allowed) {            &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']);
        &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']);           $script=&Apache::lonratedt::editscript('simple'); 
        $script=&Apache::lonratedt::editscript('docs');          }
       } else { # got called in sequence from course
          $allowed=0;
          $forcestandard=1;
          $forcesupplement=0;
          $script=&Apache::&Apache::lonxml::registerurl(1,undef);
          $events='onLoad="'.&Apache::lonxml::loadevents.
              '" onUnload="'.&Apache::lonxml::unloadevents.'"';
     }      }
   
 # get course data  # get course data
     my $coursenum=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};      my $coursenum=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
     my $coursedom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};      my $coursedom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
   
   # get personal data
    
       my $uname=$ENV{'user.name'};
       my $udom=$ENV{'user.domain'};
       my $plainname=&Apache::lonnet::escape(
                        &Apache::loncommon::plainname($uname,$udom));
   
 # graphics settings  # graphics settings
   
     $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>
 <head>  <head>
 <title>The LearningOnline Network with CAPA</title>  <title>The LearningOnline Network with CAPA</title>
 <script>$script</script>  <script>
   $script
   
   function makenewfolder(targetform,folderseq) {
       var foldername=prompt('Name of New Folder','New Folder');
       if (foldername) {
    targetform.importdetail.value=foldername+"="+folderseq;
           targetform.submit();
       }
   }
   
   function makenewext(targetform) {
   }
   </script>
 </head>  </head>
 <body bgcolor="#FFFFFF">  
 <h1>Course Documents</h1>  
 ENDDOCUMENT  ENDDOCUMENT
 # --------------------------------------------------0------ Standard documents  $r->print(&Apache::loncommon::bodytag('Course Documents','',$events));
   # --------------------------------------------------------- Standard documents
     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);
          my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                        '.sequence';
        $r->print(<<ENDFORM);         $r->print(<<ENDFORM);
 <h3>Post a new main course document</h3>  <table cellspacing=2><tr>
 <form method="post" enctype="multipart/form-data">  <th bgcolor="#DDDDDD">Upload a new main course document</th>
   <th bgcolor="#DDDDDD">Import a published document</th>
   <th bgcolor="#DDDDDD">Special documents</th>
   </tr>
   <tr><td bgcolor="#DDDDDD">
   File:<br />
   <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:<br /> 
   <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="foldername" value="$ENV{'form.foldername'}">
   <input type="hidden" name="cmd" value="upload_default">
 <input type="submit" value="Upload Document">  <input type="submit" value="Upload Document">
 </form>  </form>
   </td>
   <td bgcolor="#DDDDDD">
   <form action="/adm/coursedocs" method="post" name="simpleedit">
   <input type="hidden" name="folder" value="$folder">
   <input type=hidden name="importdetail" value="">
   <input type=button onClick=
   "javascript:groupsearch()" value="Search">
   <input type=button onClick=
   "javascript:groupimport();" value="Import">
   </form>
   </td><td bgcolor="#DDDDDD">
   <form action="/adm/coursedocs" method="post" name="newfolder">
   <input type="hidden" name="folder" value="$folder">
   <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
   <input type=hidden name="importdetail" value="">
   <input name="newfolder" type="button"
   onClick="javascript:makenewfolder(this.form,'$folderseq');"
   value="New Folder" />
   </form>
   <form action="/adm/coursedocs" method="post" name="newext">
   <input type="hidden" name="folder" value="$folder">
   <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
   <input type=hidden name="importdetail" value="">
   <input name="newext" type="button" onClick="javascript:makenewext(this.form);"
   value="External Resource" />
   </form>
   <form action="/adm/coursedocs" method="post" name="newsyl">
   <input type="hidden" name="folder" value="$folder">
   <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
   <input type=hidden name="importdetail" 
   value="Syllabus=/public/$coursedom/$coursenum/syllabus">
   <input name="newsyl" type="submit" value="Syllabus" />
   </form>
   <form action="/adm/coursedocs" method="post" name="newnav">
   <input type=hidden name="importdetail" 
   value="Navigate Content=/adm/navmaps">
   <input name="newsyl" type="submit" value="Navigate Content" />
   </form>
   <form action="/adm/coursedocs" method="post" name="newaboutme">
   <input type="hidden" name="folder" value="$folder">
   <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
   <input type=hidden name="importdetail" 
   value="$plainname=/adm/$udom/$uname/aboutme">
   <input name="newaboutme" type="submit" value="My Personal Info" />
   </form>
   </td></tr>
   </table>
 ENDFORM  ENDFORM
        $r->print('<hr />');         $r->print('<hr />');
     }      }
Line 178  ENDFORM Line 369  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) {
          my $folderseq=
                     '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
                        '.sequence';
   
           $r->print(<<ENDSUPFORM);            $r->print(<<ENDSUPFORM);
 <h3>Post a new supplemental course document</h3>  <table cellspacing=2><tr>
 <form method="post" enctype="multipart/form-data">  <th bgcolor="#DDDDDD">Upload a new supplemental course document</th>
   <th bgcolor="#DDDDDD">Import a published document</th>
   <th bgcolor="#DDDDDD">Special documents</th>
   </tr>
   <tr><td bgcolor="#DDDDDD">
   <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="foldername" value="$ENV{'form.foldername'}">
   <input type="hidden" name="cmd" value="upload_supplemental">
 <input type="submit" value="Upload Document">  <input type="submit" value="Upload Document">
 </form>  </form>
   </td>
   <td bgcolor="#DDDDDD">
   <form action="/adm/coursedocs" method="post" name="simpleedit">
   <input type="hidden" name="folder" value="$folder">
   <input type=hidden name="importdetail" value="">
   <input type=button onClick=
   "javascript:groupsearch()" value="Search">
   <input type=button onClick=
   "javascript:groupimport();" value="Import">
   </form>
   </td><td bgcolor="#DDDDDD">
   <form action="/adm/coursedocs" method="post" name="newfolder">
   <input type="hidden" name="folder" value="$folder">
   <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
   <input type=hidden name="importdetail" value="">
   <input name="newfolder" type="button"
   onClick="javascript:makenewfolder(this.form,'$folderseq');"
   value="New Folder" />
   </form>
   <form action="/adm/coursedocs" method="post" name="newext">
   <input type="hidden" name="folder" value="$folder">
   <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
   <input type=hidden name="importdetail" value="">
   <input name="newext" type="button" onClick="javascript:makenewext(this.form);"
   value="External Resource" />
   </form>
   <form action="/adm/coursedocs" method="post" name="newsyl">
   <input type="hidden" name="folder" value="$folder">
   <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
   <input type=hidden name="importdetail" 
   value="Syllabus=/public/$coursedom/$coursenum/syllabus">
   <input name="newsyl" type="submit" value="Syllabus" />
   </form>
   <form action="/adm/coursedocs" method="post" name="newaboutme">
   <input type="hidden" name="folder" value="$folder">
   <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
   <input type=hidden name="importdetail" 
   value="$plainname=/adm/$udom/$uname/aboutme">
   <input name="newaboutme" type="submit" value="My Personal Info" />
   </form>
   </td></tr>
   </table>
 ENDSUPFORM  ENDSUPFORM
        }         }
     }      }
Removed from v.1.8  
changed lines
  Added in v.1.17

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