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

Diff for /loncom/interface/londocs.pm between versions 1.92 and 1.130

version 1.92, 2003/10/29 21:21:55 version 1.130, 2004/06/15 15:50:03
Line 68  sub mapread { Line 68  sub mapread {
   
 sub storemap {  sub storemap {
     my ($coursenum,$coursedom,$map)=@_;      my ($coursenum,$coursedom,$map)=@_;
     $hadchanges=1;      my ($outtext,$errtext)=
     return  
       &Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.        &Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
                                 $map,1);                                  $map,1);
       if ($errtext) { return ($errtext,2); }
       
       $hadchanges=1;
       return ($errtext,0);
 }  }
   
 # ----------------------------------------- Return hash with valid author names  # ----------------------------------------- Return hash with valid author names
Line 94  sub authorhosts { Line 97  sub authorhosts {
     } else {      } else {
  ($cd,$ca)=($realm=~/^\/(\w+)\/(\w+)$/);   ($cd,$ca)=($realm=~/^\/(\w+)\/(\w+)$/);
     }      }
     if (&Apache::lonnet::homeserver($ca,$cd) eq       my $allowed=0;
  $Apache::lonnet::perlvar{'lonHostID'}) {      my $myhome=&Apache::lonnet::homeserver($ca,$cd);
       my @ids=&Apache::lonnet::current_machine_ids();
       foreach my $id (@ids) { if ($id eq $myhome) { $allowed=1; } }
       if ($allowed) {
  $home++;   $home++;
  $outhash{'home_'.$ca.'@'.$cd}=1;   $outhash{'home_'.$ca.'@'.$cd}=1;
     } else {      } else {
  $outhash{'otherhome_'.$ca.'@'.$cd}=   $outhash{'otherhome_'.$ca.'@'.$cd}=$myhome;
     &Apache::lonnet::homeserver($ca,$cd);  
  $other++;   $other++;
     }      }
  }   }
Line 116  sub dumpbutton { Line 121  sub dumpbutton {
     if ($home) {      if ($home) {
  return '</td><td bgcolor="#DDDDCC">'.   return '</td><td bgcolor="#DDDDCC">'.
     '<input type="submit" name="dumpcourse" value="'.      '<input type="submit" name="dumpcourse" value="'.
     &mt('Dump Course DOCS to Construction Space').'" />';      &mt('Dump Course DOCS to Construction Space').'" />'.
       &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs');
     } else {      } else {
  return'</td><td bgcolor="#DDDDCC">'.   return'</td><td bgcolor="#DDDDCC">'.
      &mt('Dump Course DOCS to Construction Space: available on other servers');       &mt('Dump Course DOCS to Construction Space: available on other servers');
Line 250  sub group_import { Line 256  sub group_import {
  join ':', ($name, $url, $ext, 'normal', 'res');   join ':', ($name, $url, $ext, 'normal', 'res');
  }   }
     }      }
     &storemap($coursenum, $coursedom, $folder.'.sequence');      return &storemap($coursenum, $coursedom, $folder.'.sequence');
   }
   
   sub breadcrumbs {
       my ($where)=@_;
       &Apache::lonhtmlcommon::clear_breadcrumbs();
       my (@folders)=split('&',$ENV{'form.folderpath'});
       my $folderpath;
       while (@folders) {
    my $folder=shift(@folders);
    my $foldername=shift(@folders);
    if ($folderpath) {$folderpath.='&';}
    $folderpath.=$folder.'&'.$foldername;
    my $url='/adm/coursedocs?folderpath='.
       &Apache::lonnet::escape($folderpath);
       &Apache::lonhtmlcommon::add_breadcrumb(
         {'href'=>$url,
          'title'=>&Apache::lonnet::unescape($foldername),
          'text'=>'<font size="+1">'.
      &Apache::lonnet::unescape($foldername).'</font>'
          });
          
     
       }
       return &Apache::lonhtmlcommon::breadcrumbs(undef,undef,undef,undef,undef,0);
 }  }
   
 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>');      $r->print(&breadcrumbs($folder));
     }  
     my $errtext='';      my $errtext='';
     my $fatal=0;      my $fatal=0;
     ($errtext,$fatal)=      ($errtext,$fatal)=
Line 270  sub editor { Line 299  sub editor {
    $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 they are for this folder and user allowed to make changes  # ---------------- if they are for this folder and user allowed to make changes
  if (($allowed) && ($ENV{'form.folder'} eq $folder)) {   if (($allowed) && ($ENV{'form.folder'} eq $folder)) {
   # set parameters and change order
       if (defined($ENV{'form.setparms'})) {
    my $idx=$ENV{'form.setparms'};
   # set parameters
    if ($ENV{'form.randpick_'.$idx}) {
       &Apache::lonratedt::storeparameter($idx,'parameter_randompick',$ENV{'form.randpick_'.$idx},'int_pos');
    } else {
       &Apache::lonratedt::delparameter($idx,'parameter_randompick');
    }
    if ($ENV{'form.hidprs_'.$idx}) {
       &Apache::lonratedt::storeparameter($idx,'parameter_hiddenresource','yes','string_yesno');
    } else {
       &Apache::lonratedt::delparameter($idx,'parameter_hiddenresource');
    }
    if ($ENV{'form.encprs_'.$idx}) {
       &Apache::lonratedt::storeparameter($idx,'parameter_encrypturl','yes','string_yesno');
    } else {
       &Apache::lonratedt::delparameter($idx,'parameter_encrypturl');
    }
   
    if ($ENV{'form.newpos'}) {
   # change order
   
       my $newpos=$ENV{'form.newpos'}-1;
       my $currentpos=$ENV{'form.currentpos'}-1;
       my $i;
       my @neworder=();
       if ($newpos>$currentpos) {
   # moving stuff up
    for ($i=0;$i<$currentpos;$i++) {
       $neworder[$i]=$Apache::lonratedt::order[$i];
    }
    for ($i=$currentpos;$i<$newpos;$i++) {
       $neworder[$i]=$Apache::lonratedt::order[$i+1];
    }
                           $neworder[$newpos]=$Apache::lonratedt::order[$currentpos];
    for ($i=$newpos+1;$i<=$#Apache::lonratedt::order;$i++) {
       $neworder[$i]=$Apache::lonratedt::order[$i];
    }
       } else {
   # moving stuff down
    for ($i=0;$i<$newpos;$i++) {
       $neworder[$i]=$Apache::lonratedt::order[$i];
    }
    $neworder[$newpos]=$Apache::lonratedt::order[$currentpos];
    for ($i=$newpos+1;$i<$currentpos+1;$i++) {
       $neworder[$i]=$Apache::lonratedt::order[$i-1];
    }
    for ($i=$currentpos+1;$i<=$#Apache::lonratedt::order;$i++) {
       $neworder[$i]=$Apache::lonratedt::order[$i];
    }
       }
       @Apache::lonratedt::order=@neworder;
    }
   # store the changed version
   
    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.sequence');
    if ($fatal) {
       $r->print('<p><font color="red">'.$errtext.'</font></p>');
       return;
    }
   
       }
   
 # 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,'docs');
               my $ext='false';                my $ext='false';
               if ($url=~/^http\:\/\//) { $ext='true'; }                if ($url=~/^http\:\/\//) { $ext='true'; }
               $url=~s/\:/\&colon;/g;                $url=~s/\:/\&colon;/g;
Line 295  sub editor { Line 389  sub editor {
                   $comment.':'.$url.':'.$ext.':normal:res';                    $comment.':'.$url.':'.$ext.':normal:res';
               $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=                $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=
                                                               $newidx;                                                                       $newidx;       
        &storemap($coursenum,$coursedom,$folder.'.sequence');  
         ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.sequence');
         if ($fatal) {
     $r->print('<p><font color="red">'.$errtext.'</font></p>');
     return;
         }
      }       }
             }              }
     if ($ENV{'form.cmd'}) {      if ($ENV{'form.cmd'}) {
                 my ($cmd,$idx)=split(/\_/,$ENV{'form.cmd'});                  my ($cmd,$idx)=split(/\_/,$ENV{'form.cmd'});
                 if ($cmd eq 'del') {                  if ($cmd eq 'del') {
       my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]);
       if ($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) {
    &Apache::lonnet::removeuploadedurl($url);
       }
     for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) {      for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) {
                         $Apache::lonratedt::order[$i]=                          $Apache::lonratedt::order[$i]=
                           $Apache::lonratedt::order[$i+1];                            $Apache::lonratedt::order[$i+1];
Line 335  sub editor { Line 438  sub editor {
                                           
                 }                  }
 # Store the changed version  # Store the changed version
  &storemap($coursenum,$coursedom,$folder.'.sequence');   ($errtext,$fatal)=&storemap($coursenum,$coursedom,
       $folder.'.sequence');
    if ($fatal) {
       $r->print('<p><font color="red">'.$errtext.'</font></p>');
       return;
    }
             }              }
 # Group import/search  # Group import/search
     if ($ENV{'form.importdetail'}) {      if ($ENV{'form.importdetail'}) {
Line 349  sub editor { Line 457  sub editor {
     }      }
  }   }
 # Store the changed version  # Store the changed version
  group_import($coursenum, $coursedom, $folder, @imports);   ($errtext,$fatal)=group_import($coursenum, $coursedom, $folder,
          @imports);
    if ($fatal) {
       $r->print('<p><font color="red">'.$errtext.'</font></p>');
       return;
    }
             }              }
 # Loading a complete map  # Loading a complete map
    if (($ENV{'form.importmap'}) && ($ENV{'form.loadmap'})) {     if (($ENV{'form.importmap'}) && ($ENV{'form.loadmap'})) {
               foreach         foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) {
 (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$ENV{'form.importmap'}))) {  
                    my $idx=$#Apache::lonratedt::resources;                     my $idx=$#Apache::lonratedt::resources;
                    $idx++;                     $idx++;
                    $Apache::lonratedt::resources[$idx]=$_;                     $Apache::lonratedt::resources[$idx]=$_;
                    $Apache::lonratedt::order                     $Apache::lonratedt::order
                             [$#Apache::lonratedt::order+1]=$idx;         [$#Apache::lonratedt::order+1]=$idx;
                 }         }
   
 # Store the changed version  # Store the changed version
  &storemap($coursenum,$coursedom,$folder.'.sequence');         ($errtext,$fatal)=&storemap($coursenum,$coursedom,
      $folder.'.sequence');
          if ($fatal) {
      $r->print('<p><font color="red">'.$errtext.'</font></p>');
      return;
          }
            }             }
        }         }
 # ---------------------------------------------------------------- End commands  # ---------------------------------------------------------------- End commands
Line 373  sub editor { Line 490  sub editor {
         foreach (@Apache::lonratedt::order) {          foreach (@Apache::lonratedt::order) {
            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) { $name='NO RESOURCE'; $url='/adm/notfound.html'; }             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 384  sub editor { Line 501  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)),'"<>&\'');
     my $renametitle=$title;      my $renametitle=$title;
     my $foldertitle=$title;      my $foldertitle=$title;
     if ($title=~      my $orderidx=$Apache::lonratedt::order[$index];
  /^(\d+)\_\_\_\&amp\;\&amp\;\&amp\;\_\_\_(\w+)\_\_\_\&amp\;\&amp\;\&amp\;\_\_\_(\w+)\_\_\_\&amp\;\&amp\;\&amp\;\_\_\_(.*)$/      if ($title=~ /^(\d+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(.*)$/ ) { 
  ) {    $foldertitle=&Apache::lontexconvert::msgtexconverted($4);
             $foldertitle=&Apache::lontexconvert::msgtexconverted($4);   $renametitle=$4;
             $renametitle=$4;   $title='<i>'.&Apache::lonlocal::locallocaltime($1).'</i> '.
             $title='<i>'.&Apache::lonlocal::locallocaltime($1).'</i> '.      &Apache::loncommon::plainname($2,$3).': <br />'.
                 &Apache::loncommon::plainname($2,$3).': <br />'.      $foldertitle;
  $foldertitle;      }
  }  
     $renametitle=~s/\&quot\;/\\\"/g;      $renametitle=~s/\&quot\;/\\\"/g;
     my $line='<tr>';      my $line='<tr>';
 # Edit commands  # Edit commands
      if ($allowed) {      my $folderpath;
  my %lt=('up' => 'Move Up',      if ($ENV{'form.folderpath'}) {
  'dw' => 'Move Down',   $folderpath=&Apache::lonnet::escape($ENV{'form.folderpath'});
  'rm' => 'Remove',   # $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"');
  'rn' => 'Rename');      }
       $line.=(<<END);      if ($allowed) {
    my $incindex=$index+1;
    my $selectbox='';
    if ($folder!~/^supplemental/) {
       $selectbox=
    '<input type="hidden" name="currentpos" value="'.$incindex.'" />'.
    '<select name="newpos" onChange="this.form.submit()">';
       for (my $i=1;$i<=$#Apache::lonratedt::order+1;$i++) {
    if ($i==$incindex) {
       $selectbox.='<option value="" selected="1">('.$i.')</option>';
    } else {
       $selectbox.='<option value="'.$i.'">'.$i.'</option>';
    }
       }
       $selectbox.='</select>';
    }
    my %lt=&Apache::lonlocal::texthash(
                   'up' => 'Move Up',
    'dw' => 'Move Down',
    'rm' => 'Remove',
    'rn' => 'Rename');
    $line.=(<<END);
   <form name="entry_$index" action="/adm/coursedocs" method="post">
   <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
   <input type="hidden" name="setparms" value="$orderidx" />
 <td><table border='0' cellspacing='2' cellpadding='0'>  <td><table border='0' cellspacing='2' cellpadding='0'>
 <tr><td bgcolor="#DDDDDD">  <tr><td bgcolor="#DDDDDD">
 <a href='/adm/coursedocs?folder=$folder&cmd=up_$index'>  <a href='/adm/coursedocs?cmd=up_$index&folderpath=$folderpath'>
 <img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr>  <img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr>
 <tr><td bgcolor="#DDDDDD">  <tr><td bgcolor="#DDDDDD">
 <a href='/adm/coursedocs?folder=$folder&cmd=down_$index'>  <a href='/adm/coursedocs?cmd=down_$index&folderpath=$folderpath'>
 <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr>  <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr>
 </table></td><td bgcolor="#DDDDDD">  </table></td>
 <a href='javascript:removeres("$folder","$index","$renametitle");'>  <td>$selectbox
   </td><td bgcolor="#DDDDDD">
   <a href='javascript:removeres("$folderpath","$index","$renametitle");'>
 <font size="-2" color="#990000">$lt{'rm'}</font></a>  <font size="-2" color="#990000">$lt{'rm'}</font></a>
 <a href='javascript:changename("$folder","$index","$renametitle");'>  <a href='javascript:changename("$folderpath","$index","$renametitle");'>
 <font size="-2" color="#009900">$lt{'rn'}</font></a></td>  <font size="-2" color="#009900">$lt{'rn'}</font></a></td>
 END  END
     }      }
 # Figure out what kind of a resource this is  # Figure out what kind of a resource this is
     my ($extension)=($url=~/\.(\w+)$/);      my ($extension)=($url=~/\.(\w+)$/);
     my $uploaded=($url=~/^\/*uploaded\//);      my $uploaded=($url=~/^\/*uploaded\//);
     my $icon='unknown';      my $icon=&Apache::loncommon::icon($url);
     if (-e "/home/httpd/html/adm/lonIcons/$extension.gif") {  
  $icon=$extension;  
     }  
     my $isfolder=0;      my $isfolder=0;
       my $folderarg;
     if ($uploaded) {      if ($uploaded) {
        if ($extension eq 'sequence') {         if ($extension eq 'sequence') {
   $icon='folder_closed';    $icon=$iconpath.'/folder_closed.gif';
           $url=~/\/(\w+)\.sequence/;            $url=~/$coursenum\/([\/\w]+)\.sequence$/;
           $url='/adm/coursedocs?folder='.$1;            $url='/adm/coursedocs?';
     $folderarg=$1;
           $isfolder=1;            $isfolder=1;
        } else {         }
   $url=&Apache::lonnet::tokenwrapper($url);  
        }   
     }      }
     $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);
    if ($url=~/^\/*uploaded\//) {
       $url=~/\.(\w+)$/;
       my $embstyle=&Apache::loncommon::fileembstyle($1);
       if (($embstyle eq 'img') || ($embstyle eq 'emb')) {
    $url='/adm/wrapper'.$url;
       } elsif ($embstyle eq 'ssi') {
    #do nothing with these
       } elsif ($url!~/\.(sequence|page)$/) {
    $url='/adm/coursedocs/showdoc'.$url;
       }
    }
    $url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb);
       }
       my $parameterset='&nbsp;';
       if ($isfolder) {
    my $foldername=&Apache::lonnet::escape($foldertitle);
    my $folderpath=$ENV{'form.folderpath'};
    if ($folderpath) { $folderpath.='&' };
    $folderpath.=$folderarg.'&'.$foldername;
    $url.='folderpath='.&Apache::lonnet::escape($folderpath);
    $parameterset=&mt('Randomly Pick: ').
       '<input type="text" size="4" name="randpick_'.$orderidx.'" value="'.
       (&Apache::lonratedt::getparameter($orderidx,'parameter_randompick'))[0].'" />';
       }
       $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.
    '" border="0"></a></td>'.
           "<td bgcolor='#FFFFBB'><a href='$url'>$title</a></td>";
       if (($allowed) && ($folder!~/^supplemental/)) {
     my %lt=&Apache::lonlocal::texthash(
          'hd' => 'Hidden',
          'ec' => 'URL hidden',
          'sp' => 'Store Parameters');
    my $enctext=
       ((&Apache::lonratedt::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="1"':'');
    my $hidtext=
       ((&Apache::lonratedt::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':'');
    $line.=(<<ENDPARMS);
   <td bgcolor="#BBBBFF"><font size='-2'>
   <input type="checkbox" name="hidprs_$orderidx" $hidtext/> $lt{'hd'}</td>
   <td bgcolor="#BBBBFF"><font size='-2'>
   <input type="checkbox" name="encprs_$orderidx" $enctext/> $lt{'ec'}</td>
   <td bgcolor="#BBBBFF"><font size="-2">$parameterset</font></td>
   <td bgcolor="#BBBBFF"><font size='-2'>
   <input type="submit" value="$lt{'sp'}" />
   </font></td>
   ENDPARMS
     }      }
     if ($isfolder) { $url.='&foldername='.      $line.="</form></tr>";
        &Apache::lonnet::escape($foldertitle); }  
     $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'" target="cat_'.$folder.  
 '"><img src="/adm/lonIcons/'.  
         $icon.'.gif" border="0"></a></td>'.  
         "<td bgcolor='#FFFFBB'><a href='$url' target='cat_$folder'>$title</a></td></tr>";  
     return $line;      return $line;
 }  }
   
Line 484  sub checkonthis { Line 665  sub checkonthis {
     $alreadyseen{$url}=1;      $alreadyseen{$url}=1;
     $r->rflush();      $r->rflush();
     if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) {      if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) {
        $r->print('<br />');         $r->print("\n<br />");
        for (my $i=0;$i<=$level*5;$i++) {         for (my $i=0;$i<=$level*5;$i++) {
            $r->print('&nbsp;');             $r->print('&nbsp;');
        }         }
Line 510  sub checkonthis { Line 691  sub checkonthis {
                  &Apache::lonxml::xmlparse($r,'web',                   &Apache::lonxml::xmlparse($r,'web',
                    &Apache::lonnet::getfile(                     &Apache::lonnet::getfile(
                     &Apache::lonnet::filelocation('',$url)));                      &Apache::lonnet::filelocation('',$url)));
    undef($Apache::lonhomework::parsing_a_problem);
  $ENV{'request.filename'}=$oldpath;   $ENV{'request.filename'}=$oldpath;
                  if (($Apache::lonxml::errorcount) ||                   if (($Apache::lonxml::errorcount) ||
                      ($Apache::lonxml::warningcount)) {                       ($Apache::lonxml::warningcount)) {
      if ($Apache::lonxml::errorcount) {       if ($Apache::lonxml::errorcount) {
                         $r->print('<font color="red"><b>'.                          $r->print('<img src="/adm/lonMisc/bomb.gif" /><font color="red"><b>'.
   $Apache::lonxml::errorcount.' '.    $Apache::lonxml::errorcount.' '.
   &mt('error(s)').'</b></font> ');    &mt('error(s)').'</b></font> ');
                      }                       }
Line 538  sub checkonthis { Line 720  sub checkonthis {
           } elsif ($result==HTTP_SERVICE_UNAVAILABLE) {            } elsif ($result==HTTP_SERVICE_UNAVAILABLE) {
              $r->print('<font color="red"><b>'.&mt('connection down').'</b></font>');               $r->print('<font color="red"><b>'.&mt('connection down').'</b></font>');
           } elsif ($result==HTTP_NOT_FOUND) {            } elsif ($result==HTTP_NOT_FOUND) {
              $r->print('<font color="red"><b>'.&mt('not found').'</b></font>');        unless ($url=~/\$/) {
     $r->print('<font color="red"><b>'.&mt('not found').'</b></font>');
         } else {
     $r->print('<font color="yellow"><b>'.&mt('unable to verify variable URL').'</b></font>');
         }
           } else {            } else {
              $r->print('<font color="red"><b>'.&mt('access denied').'</b></font>');               $r->print('<font color="red"><b>'.&mt('access denied').'</b></font>');
           }            }
Line 567  sub verifycontent { Line 753  sub verifycontent {
        }         }
    }     }
    &untiehash();     &untiehash();
    $r->print('<h1>'.&mt('Done').'.</h1>');     $r->print('<h1>'.&mt('Done').'.</h1>'.'<a href="/adm/coursedocs">'.
        &mt('Return to DOCS').'</a>');
 }  }
   
 # -------------------------------------------------------------- Check Versions  # -------------------------------------------------------------- Check Versions
Line 596  sub checkversions { Line 783  sub checkversions {
  $haschanged=1;   $haschanged=1;
  foreach (keys %hash) {   foreach (keys %hash) {
     if ($_=~/^ids\_(\/res\/.+)$/) {      if ($_=~/^ids\_(\/res\/.+)$/) {
  my $src=$1;   $newsetversions{$1}='mostrecent';
     }      }
  }   }
     } elsif ($ENV{'form.setcurrent'}) {      } elsif ($ENV{'form.setcurrent'}) {
  $haschanged=1;   $haschanged=1;
  foreach (keys %hash) {   foreach (keys %hash) {
     if ($_=~/^ids\_(\/res\/.+)$/) {      if ($_=~/^ids\_(\/res\/.+)$/) {
  my $src=$1;   my $getvers=&Apache::lonnet::getversion($1);
    if ($getvers>0) {
       $newsetversions{$1}=$getvers;
    }
     }      }
  }   }
     } elsif ($ENV{'form.setversions'}) {      } elsif ($ENV{'form.setversions'}) {
Line 611  sub checkversions { Line 801  sub checkversions {
  foreach (keys %ENV) {   foreach (keys %ENV) {
     if ($_=~/^form\.set_version_(.+)$/) {      if ($_=~/^form\.set_version_(.+)$/) {
  my $src=$1;   my $src=$1;
  &Apache::lonnet::logthis('Found: '.$1.' '.$ENV{$_});  
  if (($ENV{$_}) && ($ENV{$_} ne $setversions{$src})) {   if (($ENV{$_}) && ($ENV{$_} ne $setversions{$src})) {
     $newsetversions{$src}=$ENV{$_};      $newsetversions{$src}=$ENV{$_};
  }   }
Line 705  sub checkversions { Line 894  sub checkversions {
 <input type="submit" name="display" value="$lt{'sd'}" />  <input type="submit" name="display" value="$lt{'sd'}" />
 <h3>$header</h3>  <h3>$header</h3>
 <input type="submit" name="setversions" value="$lt{'sv'}" />  <input type="submit" name="setversions" value="$lt{'sv'}" />
 <table border="2">  <table border="0">
 <tr>  
 <th>$lt{'fi'}</th><th>$lt{'md'}</th><th>$lt{'mr'}</th>  
 <th>$lt{'ve'}</th><th>$lt{'vu'}</th><th>$lt{'di'}</th></tr>  
 ENDHEADERS  ENDHEADERS
     foreach (sort keys %changes) {      foreach (sort keys %changes) {
  if ($changes{$_}>$starttime) {   if ($changes{$_}>$starttime) {
     my ($root,$extension)=($_=~/^(.*)\.(\w+)$/);      my ($root,$extension)=($_=~/^(.*)\.(\w+)$/);
     my $currentversion=&Apache::lonnet::getversion($_);      my $currentversion=&Apache::lonnet::getversion($_);
       if ($currentversion<0) {
    $currentversion=&mt('Could not be determined.');
       }
     my $linkurl=&Apache::lonnet::clutter($_);      my $linkurl=&Apache::lonnet::clutter($_);
     $r->print(      $r->print(
       '<tr><td><b>'.        '<tr><td colspan="5"><br /><br /><font size="+1"><b>'.
       &Apache::lonnet::gettitle($linkurl).        &Apache::lonnet::gettitle($linkurl).
    '</b><br /><a href="'.$linkurl.'" target="cat">'.$linkurl.                        '</b></font></td></tr>'.
       '</a></td><td>'.                        '<tr><td>&nbsp;&nbsp;&nbsp;</td>'.
       &Apache::lonlocal::locallocaltime($changes{$_}).                        '<td colspan="4">'.
                       '</td><td><font size="+2">'.                        '<a href="'.$linkurl.'" target="cat">'.$linkurl.
       $currentversion.'</font></td><td><font size="+2">');        '</a></td></tr>'.
                         '<tr><td></td>'.
                         '<td title="'.$lt{'md'}.'">'.
         &Apache::lonlocal::locallocaltime(
                              &Apache::lonnet::metadata($root.'.'.$extension,
                                                        'lastrevisiondate')
                                                           ).
                         '</td>'.
                         '<td title="'.$lt{'mr'}.'"><nobr>Most Recent: '.
                         '<font size="+1">'.$currentversion.'</font>'.
                         '</nobr></td>'.
                         '<td title="'.$lt{'ve'}.'"><nobr>In Course: '.
                         '<font size="+1">');
 # Used in course  # Used in course
     my $usedversion=$hash{'version_'.$linkurl};      my $usedversion=$hash{'version_'.$linkurl};
     if ($usedversion) {      if (($usedversion) && ($usedversion ne 'mostrecent')) {
  $r->print($usedversion);   $r->print($usedversion);
     } else {      } else {
  $r->print($currentversion);   $r->print($currentversion);
     }      }
     $r->print('</font></td><td>');      $r->print('</font></nobr></td><td title="'.$lt{'vu'}.'">'.
                         '<nobr>Use: ');
 # Set version  # Set version
     $r->print(&Apache::loncommon::select_form($setversions{$linkurl},      $r->print(&Apache::loncommon::select_form($setversions{$linkurl},
       'set_version_'.$linkurl,        'set_version_'.$linkurl,
       ('' => '',        ('' => '',
        'current' => 'most recent',         'mostrecent' => 'most recent',
        map {$_,$_} (1..$currentversion))));         map {$_,$_} (1..$currentversion))));
     $r->print('</td><td><font size="1"><ul>');      $r->print('</nobr></td></tr><tr><td></td>');
     my $lastold=1;      my $lastold=1;
     for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {      for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
  my $url=$root.'.'.$prevvers.'.'.$extension;   my $url=$root.'.'.$prevvers.'.'.$extension;
Line 746  ENDHEADERS Line 948  ENDHEADERS
     $lastold=$prevvers;      $lastold=$prevvers;
  }   }
     }      }
               # 
               # Code to figure out how many version entries should go in
               # each of the four columns
               my $entries_per_col = 0;
               my $num_entries = ($currentversion-$lastold);
               if ($num_entries % 4 == 0) {
                   $entries_per_col = $num_entries/4;
               } else {
                   $entries_per_col = $num_entries/4 + 1;
               }
               my $entries_count = 0;
               $r->print('<td valign="top"><font size="-2">'); 
               my $cols_output = 1;
             for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) {              for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) {
  my $url=$root.'.'.$prevvers.'.'.$extension;   my $url=$root.'.'.$prevvers.'.'.$extension;
  $r->print('<li><a href="'.&Apache::lonnet::clutter($url).   $r->print('<nobr><a href="'.&Apache::lonnet::clutter($url).
   '">'.&mt('Version').' '.$prevvers.'</a> ('.    '">'.&mt('Version').' '.$prevvers.'</a> ('.
   &Apache::lonlocal::locallocaltime(&Apache::lonnet::metadata($url,'lastrevisiondate')).    &Apache::lonlocal::locallocaltime(
                                   &Apache::lonnet::metadata($url,
                                                             'lastrevisiondate')
                                                               ).
   ')');    ')');
  if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') {   if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') {
                     $r->print(' <a href="/adm/diff?filename='.                      $r->print(' <a href="/adm/diff?filename='.
Line 758  ENDHEADERS Line 976  ENDHEADERS
       '&versionone='.$prevvers.        '&versionone='.$prevvers.
       '">'.&mt('Diffs').'</a>');        '">'.&mt('Diffs').'</a>');
  }   }
  $r->print('</li>');   $r->print('</nobr><br />');
                   if (++$entries_count % $entries_per_col == 0) {
                       $r->print('</font></td>');
                       if ($cols_output != 4) {
                           $r->print('<td valign="top"><font size="-2">');
                           $cols_output++;
                       }
                   }
     }      }
     $r->print('</ul></font></td></tr>');              while($cols_output++ < 4) {
                   $r->print('</font></td><td><font>')
               }
       $r->print('</font></td></tr>'."\n");
  }   }
     }      }
     $r->print('</table></form>');      $r->print('</table></form>');
Line 774  sub changewarning { Line 1002  sub changewarning {
     $r->print(      $r->print(
 '<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'.   '<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'. 
 '<form method="post" action="/adm/roles" target="loncapaclient">'.  '<form method="post" action="/adm/roles" target="loncapaclient">'.
 '<input type="hidden" name="orgurl" value="/adm/coursedocs" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'.  '<input type="hidden" name="orgurl" value="/adm/coursedocs?folderpath='.
   &Apache::lonnet::escape($ENV{'form.folderpath'}).
   '" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'.
 &mt('Changes will become active for your current session after').  &mt('Changes will become active for your current session after').
 ' <input type="hidden" name="'.  ' <input type="hidden" name="'.
 $ENV{'request.role'}.'" value="1" /><input type="button" value="'.  $ENV{'request.role'}.'" value="1" /><input type="button" value="'.
Line 789  sub handler { Line 1019  sub handler {
     $r->send_http_header;      $r->send_http_header;
     return OK if $r->header_only;      return OK if $r->header_only;
   
     &Apache::lonlocal::clearreroutetrans();  
 # --------------------------------------------- Initialize help topics for this  # --------------------------------------------- Initialize help topics for this
   foreach ('Adding_Course_Doc','Main_Course_Documents',    foreach ('Adding_Course_Doc','Main_Course_Documents',
            'Adding_External_Resource','Navigate_Content',             'Adding_External_Resource','Navigate_Content',
            'Adding_Folders','Docs_Overview', 'Load_Map',             'Adding_Folders','Docs_Overview', 'Load_Map',
            'Supplemental', 'Score_Upload_Form',             'Supplemental', 'Score_Upload_Form',
            'Importing_LON-CAPA_Resource','Uploading_From_Harddrive') {             'Importing_LON-CAPA_Resource','Uploading_From_Harddrive',
      'Check_Resource_Versions','Verify_Content') {
       $help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_);        $help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_);
   }    }
     # Composite help files      # Composite help files
Line 828  sub handler { Line 1058  sub handler {
     my $events='';      my $events='';
     my $showdoc=0;      my $showdoc=0;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
        ['folder','foldername']);      ['folderpath']);
       if ($ENV{'form.folderpath'}) {
    my (@folderpath)=split('&',$ENV{'form.folderpath'});
    $ENV{'form.foldername'}=&Apache::lonnet::unescape(pop(@folderpath));
    $ENV{'form.folder'}=pop(@folderpath);
       } 
     if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {      if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
        $showdoc=$1;         $showdoc='/'.$1;
     }      }
     unless ($showdoc) { # got called from remote      unless ($showdoc) { # got called from remote
        $forcestandard=($ENV{'form.folder'}=~/^default_/);         $forcestandard=($ENV{'form.folder'}=~/^default_/);
Line 927  function makebulboard() { Line 1162  function makebulboard() {
    }     }
 }  }
   
   function makeabout() {
      var user=prompt("Enter user\@domain for User's 'About Me' Page");
      if (user) {
          var comp=new Array();
          comp=user.split('\@');
          if ((typeof(comp[0])!=undefined) && (typeof(comp[1])!=undefined)) {
      if ((comp[0]) && (comp[1])) {
          this.document.forms.newaboutsomeone.importdetail.value=
      'About '+user+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
          this.document.forms.newaboutsomeone.submit();
      }
          }
      }
   }
   
   function makeims() {
       var caller = document.forms.ims.folder.value
       var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one"
       newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes")
       newWindow.location.href = newlocation
   }
   
   
 function finishpick() {  function finishpick() {
     var title=this.document.forms.extimport.title.value;      var title=this.document.forms.extimport.title.value;
     var url=this.document.forms.extimport.url.value;      var url=this.document.forms.extimport.url.value;
Line 936  function finishpick() { Line 1194  function finishpick() {
     '";this.document.forms.'+form+'.submit();');      '";this.document.forms.'+form+'.submit();');
 }  }
   
 function changename(folder,index,oldtitle) {  function changename(folderpath,index,oldtitle) {
     var title=prompt('New Title',oldtitle);      var title=prompt('New Title',oldtitle);
     if (title) {      if (title) {
  this.document.forms.renameform.title.value=title;   this.document.forms.renameform.title.value=title;
  this.document.forms.renameform.cmd.value='rename_'+index;   this.document.forms.renameform.cmd.value='rename_'+index;
  this.document.forms.renameform.folder.value=folder;   this.document.forms.renameform.folderpath.value=folderpath;
         this.document.forms.renameform.submit();          this.document.forms.renameform.submit();
     }      }
 }  }
   
 function removeres(folder,index,oldtitle) {  function removeres(folderpath,index,oldtitle) {
     if ((oldtitle=='NO RESOURCE') || (confirm('Remove "'+oldtitle+'"?'))) {      if (confirm('Remove "'+oldtitle+'"?')) {
  this.document.forms.renameform.cmd.value='del_'+index;   this.document.forms.renameform.cmd.value='del_'+index;
  this.document.forms.renameform.folder.value=folder;   this.document.forms.renameform.folderpath.value=folderpath;
         this.document.forms.renameform.submit();          this.document.forms.renameform.submit();
     }      }
 }  }
   
 </script>  </script>
   
 ENDNEWSCRIPT  ENDNEWSCRIPT
Line 960  ENDNEWSCRIPT Line 1219  ENDNEWSCRIPT
 # -------------------------------------------------------------------- Body tag  # -------------------------------------------------------------------- Body tag
   $r->print('</head>'.    $r->print('</head>'.
             &Apache::loncommon::bodytag('Course Documents','',$events,              &Apache::loncommon::bodytag('Course Documents','',$events,
  '','',$showdoc));   '','',$showdoc).
       &Apache::loncommon::help_open_faq(273).
       &Apache::loncommon::help_open_bug('RAT'));
   unless ($showdoc) {    unless ($showdoc) {
 # -----------------------------------------------------------------------------  # -----------------------------------------------------------------------------
        my %lt=&Apache::lonlocal::texthash(         my %lt=&Apache::lonlocal::texthash(
Line 981  ENDNEWSCRIPT Line 1242  ENDNEWSCRIPT
                 'sipr' => 'Simple Problem',                  'sipr' => 'Simple Problem',
                 'scuf' => 'Score Upload Form',                  'scuf' => 'Score Upload Form',
                 'bull' => 'Bulletin Board',                  'bull' => 'Bulletin Board',
                 'mypi' => 'My Personal Info'                  'mypi' => 'My Personal Info',
    'abou' => 'About User',
                   'imsf' => 'Import IMS package',
                   'file' =>  'File',
                   'title' => 'Title',
                   'comment' => 'Comment' 
   );    );
 # -----------------------------------------------------------------------------  # -----------------------------------------------------------------------------
     if ($allowed) {      if ($allowed) {
Line 990  ENDNEWSCRIPT Line 1256  ENDNEWSCRIPT
  'vc' => 'Verify Content',   'vc' => 'Verify Content',
  'cv' => 'Check/Set Resource Versions',   'cv' => 'Check/Set Resource Versions',
   );    );
   
          my $folderpath=$ENV{'form.folderpath'};
          if (!$folderpath) {
      if ($ENV{'form.folder'} eq '' ||
          $ENV{'form.folder'} eq 'supplemental') {
          $folderpath='default&'.
      &Apache::lonnet::escape(&mt('Main Course Documents'));
      }
          }
        $r->print(<<ENDCOURSEVERIFY);         $r->print(<<ENDCOURSEVERIFY);
 <form name="renameform" method="post" action="/adm/coursedocs">  <form name="renameform" method="post" action="/adm/coursedocs">
 <input type="hidden" name="title" />  <input type="hidden" name="title" />
 <input type="hidden" name="cmd" />  <input type="hidden" name="cmd" />
 <input type="hidden" name="folder" />  <input type="hidden" name="folderpath" />
 </form>  </form>
 <form name="simpleedit" method="post" action="/adm/coursedocs">  <form name="simpleedit" method="post" action="/adm/coursedocs">
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <input type="hidden" name="folder" />  <input type="hidden" name="folderpath" value="$folderpath" />
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="courseverify">  <form action="/adm/coursedocs" method="post" name="courseverify">
 <table bgcolor="#AAAAAA" width="100%" cellspacing="4" cellpadding="4">  <table bgcolor="#AAAAAA" width="100%" cellspacing="4" cellpadding="4">
 <tr><td bgcolor="#DDDDCC">  <tr><td bgcolor="#DDDDCC">
 <input type="submit" name="verify" value="$lt{'vc'}" />  <input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}
 </td><td bgcolor="#DDDDCC">  </td><td bgcolor="#DDDDCC">
 <input type="submit" name="versions" value="$lt{'cv'}" />      <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
 $dumpbut  $dumpbut
 </td></tr></table>  </td></tr></table>
 </form>  </form>
 ENDCOURSEVERIFY  ENDCOURSEVERIFY
        $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',         $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
      'Editing the Table of Contents for your Course'));       &mt('Editing the Table of Contents for your Course')));
     }      }
 # --------------------------------------------------------- Standard documents  # --------------------------------------------------------- Standard documents
     $r->print('<table border=2 cellspacing=4 cellpadding=4>');      $r->print('<table border=2 cellspacing=4 cellpadding=4>');
     if (($standard) && ($allowed) && (!$forcesupplement)) {      if (($standard) && ($allowed) && (!$forcesupplement)) {
        $r->print('<tr><td bgcolor="#BBBBBB"><h2>'.&mt('Main Course Documents').   $r->print('<tr><td bgcolor="#BBBBBB">');
   ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');  #  '<h2>'.&mt('Main Course Documents').
   #  ($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 eq 'supplemental') {
              $folder='default';
      $ENV{'form.folderpath'}='default&'.&Apache::lonnet::escape(&mt('Main Course Documents'));
          }
        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>');
        } else {         } else {
            $postexec='self.close();';             #$postexec='self.close();';
        }         }
        $hadchanges=0;         $hadchanges=0;
        &editor($r,$coursenum,$coursedom,$folder,$allowed);         &editor($r,$coursenum,$coursedom,$folder,$allowed);
Line 1040  ENDCOURSEVERIFY Line 1319  ENDCOURSEVERIFY
 <th bgcolor="#DDDDDD">$lt{'spec'}</th>  <th bgcolor="#DDDDDD">$lt{'spec'}</th>
 </tr>  </tr>
 <tr><td bgcolor="#DDDDDD">  <tr><td bgcolor="#DDDDDD">
 File:<br />  $lt{'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="40">  <input type="file" name="uploaddoc" size="40">
 <br />  <br />
 Title:<br />  $lt{'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="folderpath" value="$ENV{'form.folderpath'}" />
 <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="$lt{'upld'}">  
 <nobr>  <nobr>
   <input type="submit" value="$lt{'upld'}">
  $help{'Uploading_From_Harddrive'}   $help{'Uploading_From_Harddrive'}
 </nobr>  </nobr>
 </form>  </form>
 </td>  </td>
 <td bgcolor="#DDDDDD">  <td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="simpleeditdefault">  <form action="/adm/coursedocs" method="post" name="simpleeditdefault">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">  <input type=button onClick="javascript:groupsearch()" value="$lt{'srch'}">
 <input type=button onClick=  
 "javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="$lt{'srch'}">  
 <nobr>  <nobr>
 <input type=button onClick=  <input type=button onClick="javascript:groupimport();" value="$lt{'impo'}">
 "javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="$lt{'impo'}">  
 $help{'Importing_LON-CAPA_Resource'}  $help{'Importing_LON-CAPA_Resource'}
 </nobr>  </nobr>
 <p>  <p>
Line 1077  $help{'Load_Map'}</nobr> Line 1352  $help{'Load_Map'}</nobr>
 </form>  </form>
 </td><td bgcolor="#DDDDDD">  </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="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">  
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <nobr>  <nobr>
 <input name="newfolder" type="button"  <input name="newfolder" type="button"
Line 1087  value="$lt{'newf'}" />$help{'Adding_Fold Line 1361  value="$lt{'newf'}" />$help{'Adding_Fold
 </nobr>  </nobr>
 </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="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">  
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <nobr>  <nobr>
 <input name="newext" type="button" onClick="javascript:makenewext('newext');"  <input name="newext" type="button" onClick="javascript:makenewext('newext');"
Line 1096  value="$lt{'extr'}" /> $help{'Adding_Ext Line 1369  value="$lt{'extr'}" /> $help{'Adding_Ext
 </nobr>  </nobr>
 </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="folderpath" value="$ENV{'form.folderpath'}" />
 <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">
 <nobr>  <nobr>
Line 1106  value="Syllabus=/public/$coursedom/$cour Line 1378  value="Syllabus=/public/$coursedom/$cour
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newnav">  <form action="/adm/coursedocs" method="post" name="newnav">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <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">
 <nobr>  <nobr>
Line 1116  $help{'Navigate_Content'} Line 1387  $help{'Navigate_Content'}
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newsmppg">  <form action="/adm/coursedocs" method="post" name="newsmppg">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">  
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <nobr>  <nobr>
 <input name="newsmppg" type="button" value="$lt{'sipa'}"  <input name="newsmppg" type="button" value="$lt{'sipa'}"
Line 1125  onClick="javascript:makesmppage();" /> $ Line 1395  onClick="javascript:makesmppage();" /> $
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newsmpproblem">  <form action="/adm/coursedocs" method="post" name="newsmpproblem">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">  
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <nobr>  <nobr>
 <input name="newsmpproblem" type="button" value="$lt{'sipr'}"  <input name="newsmpproblem" type="button" value="$lt{'sipr'}"
Line 1134  onClick="javascript:makesmpproblem();" / Line 1403  onClick="javascript:makesmpproblem();" /
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newexamupload">  <form action="/adm/coursedocs" method="post" name="newexamupload">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">  
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <nobr>  <nobr>
 <input name="newexamupload" type="button" value="$lt{'scuf'}"  <input name="newexamupload" type="button" value="$lt{'scuf'}"
Line 1144  $help{'Score_Upload_Form'} Line 1412  $help{'Score_Upload_Form'}
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="newbul">  <form action="/adm/coursedocs" method="post" name="newbul">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">  
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <nobr>  <nobr>
 <input name="newbulletin" type="button" value="$lt{'bull'}"  <input name="newbulletin" type="button" value="$lt{'bull'}"
Line 1154  $help{'Bulletin Board'} Line 1421  $help{'Bulletin Board'}
 </nobr>  </nobr>
 </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="folderpath" value="$ENV{'form.folderpath'}" />
 <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">
 <nobr>  <nobr>
Line 1163  value="$plainname=/adm/$udom/$uname/abou Line 1429  value="$plainname=/adm/$udom/$uname/abou
 $help{'My Personal Info'}  $help{'My Personal Info'}
 </nobr>  </nobr>
 </form>  </form>
   <form action="/adm/coursedocs" method="post" name="newaboutsomeone">
   <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
   <input type=hidden name="importdetail" value="">
   <nobr>
   <input name="newaboutsomeone" type="button" value="$lt{'abou'}" 
   onClick="javascript:makeabout();" />
   </nobr>
   </form>
   <form action="/adm/imsimportdocs" method="post" name="ims">
   <input type="hidden" name="folder" value="$folder" />
   <input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />
   </nobr>
   </form>
 </td></tr>  </td></tr>
 </table>  </table>
 ENDFORM  ENDFORM
Line 1170  ENDFORM Line 1449  ENDFORM
     }      }
 # ----------------------------------------------------- Supplemental documents  # ----------------------------------------------------- Supplemental documents
     if (!$forcestandard) {      if (!$forcestandard) {
        $r->print(         $r->print('<tr><td bgcolor="#BBBBBB">');
   '<tr><td bgcolor="#BBBBBB"><h2>'.&mt('Supplemental Course Documents').  # '<h2>'.&mt('Supplemental Course Documents').
   ($allowed?' '.$help{'Supplemental'}:'').'</h2>');  #  ($allowed?' '.$help{'Supplemental'}:'').'</h2>');
        my $folder=$ENV{'form.folder'};         my $folder=$ENV{'form.folder'};
        unless ($folder=~/supplemental/) { $folder='supplemental'; }         unless ($folder=~/^supplemental/) {
      $folder='supplemental';
          }
          if ($folder =~ /^supplemental$/ &&
      $ENV{'form.folderpath'} =~ /^default\&/) {
      $ENV{'form.folderpath'}='supplemental&'.
          &Apache::lonnet::escape(&mt('Supplemental Course Documents'));
          }
        &editor($r,$coursenum,$coursedom,$folder,$allowed);         &editor($r,$coursenum,$coursedom,$folder,$allowed);
        if ($allowed) {         if ($allowed) {
        my $folderseq=         my $folderseq=
Line 1184  ENDFORM Line 1470  ENDFORM
           $r->print(<<ENDSUPFORM);            $r->print(<<ENDSUPFORM);
 <table cellspacing=4 cellpadding=4><tr>  <table cellspacing=4 cellpadding=4><tr>
 <th bgcolor="#DDDDDD">$lt{'upls'}</th>  <th bgcolor="#DDDDDD">$lt{'upls'}</th>
 <th bgcolor="#DDDDDD">$lt{'impp'}</th>  
 <th bgcolor="#DDDDDD">$lt{'spec'}</th>  <th bgcolor="#DDDDDD">$lt{'spec'}</th>
 </tr>  </tr>
 <tr><td bgcolor="#DDDDDD">  <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="40">  <input type="file" name="uploaddoc" size="40">
 <br />Comment:<br />  <br />$lt{'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">  <br />
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="cmd" value="upload_supplemental">  <input type="hidden" name="cmd" value="upload_supplemental">
 <nobr>  <nobr>
 <input type="submit" value="$lt{'upld'}">  <input type="submit" value="$lt{'upld'}">
Line 1203  ENDFORM Line 1488  ENDFORM
 </form>  </form>
 </td>  </td>
 <td bgcolor="#DDDDDD">  <td bgcolor="#DDDDDD">
 <form action="/adm/coursedocs" method="post" name="simpleeditsupplement">  
 <input type="hidden" name="folder" value="$folder">  
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">  
 <input type=hidden name="importdetail" value="">  
 <input type=button onClick=  
 "javascript:document.forms.simpleedit.folder.value='$folder';groupsearch()" value="$lt{'srch'}">  
 <input type=button onClick=  
 "javascript:document.forms.simpleedit.folder.value='$folder';groupimport();" value="$lt{'impo'}">$help{'Importing_LON-CAPA_Resource'}  
 <p>  
 <hr />  
 <input type="text" size="20" name="importmap">  
 <input type=button   
 onClick="javascript:openbrowser('simpleeditsupplement','importmap','sequence,page','')"  
 value="$lt{'selm'}"><input type="submit" name="loadmap" value="$lt{'load'}">$help{'Load_Map'}  
 </p>  
 </form>  
 </td><td bgcolor="#DDDDDD">  
 <form action="/adm/coursedocs" method="post" name="supnewfolder">  <form action="/adm/coursedocs" method="post" name="supnewfolder">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">  
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <nobr>  <nobr>
 <input name="newfolder" type="button"  <input name="newfolder" type="button"
Line 1231  value="$lt{'newf'}" /> $help{'Adding_Fol Line 1498  value="$lt{'newf'}" /> $help{'Adding_Fol
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="supnewext">  <form action="/adm/coursedocs" method="post" name="supnewext">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <input type="hidden" name="foldername" value="$ENV{'form.foldername'}">  
 <input type=hidden name="importdetail" value="">  <input type=hidden name="importdetail" value="">
 <nobr>  <nobr>
 <input name="newext" type="button"   <input name="newext" type="button" 
Line 1241  value="$lt{'extr'}" /> $help{'Adding_Ext Line 1507  value="$lt{'extr'}" /> $help{'Adding_Ext
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="supnewsyl">  <form action="/adm/coursedocs" method="post" name="supnewsyl">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <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">
 <nobr>  <nobr>
Line 1251  $help{'Syllabus'} Line 1516  $help{'Syllabus'}
 </nobr>  </nobr>
 </form>  </form>
 <form action="/adm/coursedocs" method="post" name="subnewaboutme">  <form action="/adm/coursedocs" method="post" name="subnewaboutme">
 <input type="hidden" name="folder" value="$folder">  <input type="hidden" name="folderpath" value="$ENV{'form.folderpath'}" />
 <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">
 <nobr>  <nobr>
Line 1276  ENDSUPFORM Line 1540  ENDSUPFORM
          &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table></p>');           &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table></p>');
   }    }
  }   }
  $r->print(&Apache::lonlocal::endreroutetrans().'</body></html>');   $r->print('</body></html>');
  return OK;   return OK;
 }   } 
   
Removed from v.1.92  
changed lines
  Added in v.1.130

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