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

version 1.15, 2002/09/02 15:27:08 version 1.20, 2002/09/05 19:37:00
Line 60  sub storemap { Line 60  sub storemap {
   
 sub editor {  sub editor {
     my ($r,$coursenum,$coursedom,$folder,$allowed)=@_;      my ($r,$coursenum,$coursedom,$folder,$allowed)=@_;
       if ($ENV{'form.foldername'}) {
    $r->print('<h3>Folder: '.$ENV{'form.foldername'}.'</h3>');
       }
     my $errtext='';      my $errtext='';
     my $fatal=0;      my $fatal=0;
     ($errtext,$fatal)=      ($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  # 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+)/)) {
Line 83  sub editor { Line 91  sub editor {
               $comment=~s/\</\&lt\;/g;                $comment=~s/\</\&lt\;/g;
               $comment=~s/\>/\&gt\;/g;                $comment=~s/\>/\&gt\;/g;
               $comment=~s/\:/\&colon;/g;                $comment=~s/\:/\&colon;/g;
                 if ($folder=~/^supplemental/) {
     $comment=time.'___&&&___'.$ENV{'user.name'}.'___&&&___'.
         $ENV{'user.domain'}.'___&&&___'.$comment;
                 }
               my $newidx=$#Apache::lonratedt::resources+1;                my $newidx=$#Apache::lonratedt::resources+1;
               $Apache::lonratedt::resources[$newidx]=                $Apache::lonratedt::resources[$newidx]=
                   $comment.':'.$url.':'.$ext.':normal:res';                    $comment.':'.$url.':'.$ext.':normal:res';
Line 135  sub editor { Line 147  sub editor {
 # Store the changed version  # Store the changed version
  &storemap($coursenum,$coursedom,$folder.'.sequence');   &storemap($coursenum,$coursedom,$folder.'.sequence');
             }              }
  }         }
   # ---------------------------------------------------------------- End commands
 # ---------------------------------------------------------------- Print screen  # ---------------------------------------------------------------- Print screen
         my $idx=0;          my $idx=0;
         $r->print('<table>');          $r->print('<table>');
Line 167  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
     if ($url=~/^\/*uploaded\//) {      my ($extension)=($url=~/\.(\w+)$/);
  $url=&Apache::lonnet::tokenwrapper($url);      my $uploaded=($url=~/^\/*uploaded\//);
       my $icon='unknown';
       if (-e "/home/httpd/html/adm/lonIcons/$extension.gif") {
    $icon=$extension;
     }      }
     $line.='<td><a href="'.$url.'">View</a></td>';      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);
          } 
       }
       $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;
 # 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 199  sub handler { Line 232  sub handler {
     my $script='';      my $script='';
     my $allowed;      my $allowed;
     my $events='';      my $events='';
       my $showdoc=0;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
        ['folder','showdoc']);         ['folder','foldername','showdoc']);
     unless ($ENV{'form.showdoc'}) { # got called from remote      unless ($ENV{'form.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 213  sub handler { Line 247  sub handler {
        }         }
     } else { # got called in sequence from course      } else { # got called in sequence from course
        $allowed=0;         $allowed=0;
        $forcestandard=1;         $showdoc=1;
        $forcesupplement=0;         $script=&Apache::lonxml::registerurl(1,undef);
        $script=&Apache::&Apache::lonxml::registerurl(1,undef);  
        $events='onLoad="'.&Apache::lonxml::loadevents.         $events='onLoad="'.&Apache::lonxml::loadevents.
            '" onUnload="'.&Apache::lonxml::unloadevents.'"';             '" onUnload="'.&Apache::lonxml::unloadevents.'"';
     }      }
Line 240  sub handler { Line 273  sub handler {
 <html>  <html>
 <head>  <head>
 <title>The LearningOnline Network with CAPA</title>  <title>The LearningOnline Network with CAPA</title>
 <script>$script</script>  <script>
 </head>  $script
   </script>
 ENDDOCUMENT  ENDDOCUMENT
 $r->print(&Apache::loncommon::bodytag('Course Documents','',$events));     if ($allowed) {
 # --------------------------------------------------0------ Standard documents      $r->print(<<ENDNEWSCRIPT);
   <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(targetname) {
       this.document.forms.extimport.useform.value=targetname;
       window.open('/adm/rat/extpickframe.html');
   }
   
   function finishpick() {
       var title=this.document.forms.extimport.title.value;
       var url=this.document.forms.extimport.url.value;
       var form=this.document.forms.extimport.useform.value;
       eval
        ('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+
       '";this.document.forms.'+form+'.submit();');
   }
   </script>
   ENDNEWSCRIPT
     }
   # -------------------------------------------------------------------- Body tag
     $r->print('</head>'.
               &Apache::loncommon::bodytag('Course Documents','',$events));
     unless ($showdoc) {
   # --------------------------------------------------------- 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=~/^default/) { $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);
 <table><tr>  <table cellspacing=2><tr>
 <th>Upload a new main course document</th>  <th bgcolor="#DDDDDD">Upload a new main course document</th>
 <th>Import a published document</th>  <th bgcolor="#DDDDDD">Import a published document</th>
 <th>Special documents</th>  <th bgcolor="#DDDDDD">Special documents</th>
 </tr>  </tr>
 <tr><td>  <tr><td bgcolor="#DDDDDD">
 File:<br />  File:<br />
 <form action="/adm/coursedocs" 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">
Line 264  File:<br /> Line 330  File:<br />
 Title:<br />   Title:<br /> 
 <input type="text" size="50" name="comment">  <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="foldername" value="$ENV{'form.foldername'}">
 <input type="hidden" name="cmd" value="upload_default">  <input type="hidden" name="cmd" value="upload_default">
 <input type="submit" value="Upload Document">  <input type="submit" value="Upload Document">
 </form>  </form>
 </td>  </td>
 <td>  <td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="simpleedit">  <form action="/adm/coursedocs" method="post" name="simpleedit">
   <input type="hidden" name="folder" value="$folder">
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <input type=button onClick=  <input type=button onClick=
 "javascript:groupsearch()" value="Group Search">  "javascript:groupsearch()" value="Search">
 <input type=button onClick=  <input type=button onClick=
 "javascript:groupimport();" value="Group Import">  "javascript:groupimport();" value="Import">
 </form>  </form>
 </td><td>  </td><td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="newfolder">  <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 type=hidden name="importdetail" value="">
 <input name="newfolder" type="button" onClick="javascript:newfolder();"  <input name="newfolder" type="button"
   onClick="javascript:makenewfolder(this.form,'$folderseq');"
 value="New Folder" />  value="New Folder" />
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newext">  <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 type=hidden name="importdetail" value="">
 <input name="newext" type="button" onClick="javascript:newext();"  <input name="newext" type="button" onClick="javascript:makenewext('newext');"
 value="External Resource" />  value="External Resource" />
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newsyl">  <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"   <input type=hidden name="importdetail" 
 value="Syllabus=/public/$coursedom/$coursenum/syllabus">  value="Syllabus=/public/$coursedom/$coursenum/syllabus">
 <input name="newsyl" type="submit" value="Syllabus" />  <input name="newsyl" type="submit" value="Syllabus" />
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newsyl">  <form action="/adm/coursedocs" method="post" name="newnav">
   <input type="hidden" name="folder" value="$folder">
   <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">
 <input type=hidden name="importdetail"   <input type=hidden name="importdetail" 
 value="Navigate Content=/adm/navmaps">  value="Navigate Content=/adm/navmaps">
 <input name="newsyl" type="submit" value="Navigate Content" />  <input name="newnav" type="submit" value="Navigate Content" />
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newaboutme">  <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"   <input type=hidden name="importdetail" 
 value="$plainname=/adm/$udom/$uname/aboutme">  value="$plainname=/adm/$udom/$uname/aboutme">
 <input name="newaboutme" type="submit" onClick="javascript:newaboutme();"  <input name="newaboutme" type="submit" value="My Personal Info" />
 value="My Personal Info" />  
 </form>  </form>
 </td></tr>  </td></tr>
 </table>  </table>
Line 315  ENDFORM Line 393  ENDFORM
        unless ($folder=~/supplemental/) { $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>
   <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">  <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="foldername" value="$ENV{'form.foldername'}">
 <input type="hidden" name="cmd" value="upload_supplemental">  <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="supnewfolder">
   <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="supnewext">
   <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('supnewext');"
   value="External Resource" />
   </form>
   <form action="/adm/coursedocs" method="post" name="supnewsyl">
   <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="subnewaboutme">
   <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
        }         }
     }      }
       if ($allowed) {
     $r->print('</body></html>');   $r->print('<form name="extimport"><input type="hidden" name="title"><input type="hidden" name="url"><input type="hidden" name="useform"></form>');
     return OK;      }
     } else {
   # -------------------------------------------------------- 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>".
            &entryline(0,"Click to download or use your browser's Save Link function",$ENV{'form.showdoc'}).'</table></p>');
     }
     $r->print('</body></html>');
     return OK;
 }   } 
   
 1;  1;

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


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