Diff for /loncom/interface/londocs.pm between versions 1.314.2.2 and 1.376

version 1.314.2.2, 2008/12/21 15:47:50 version 1.376, 2009/07/10 15:05:28
Line 26 Line 26
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
   
   
   
 package Apache::londocs;  package Apache::londocs;
   
 use strict;  use strict;
Line 53  my %alreadyseen=(); Line 55  my %alreadyseen=();
   
 my $hadchanges;  my $hadchanges;
   
 # Available help topics  
   
 my %help=();  my %help=();
   
 # Mapread read maps into LONCAPA::map:: global arrays   
 # @order and @resources, determines status  
 # sets @order - pointer to resources in right order  
 # sets @resources - array with the resources with correct idx  
 #  
   
 sub mapread {  sub mapread {
     my ($coursenum,$coursedom,$map)=@_;      my ($coursenum,$coursedom,$map)=@_;
Line 76  sub storemap { Line 72  sub storemap {
       &LONCAPA::map::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.        &LONCAPA::map::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
       $map,1);        $map,1);
     if ($errtext) { return ($errtext,2); }      if ($errtext) { return ($errtext,2); }
       
     $hadchanges=1;      $hadchanges=1;
     return ($errtext,0);      return ($errtext,0);
 }  }
   
 # ----------------------------------------- Return hash with valid author names  
   
 sub authorhosts {  sub authorhosts {
     my %outhash=();      my %outhash=();
     my $home=0;      my $home=0;
     my $other=0;      my $other=0;
     foreach (keys %env) {      foreach my $key (keys(%env)) {
  if ($_=~/^user\.role\.(au|ca)\.(.+)$/) {   if ($key=~/^user\.role\.(au|ca)\.(.+)$/) {
     my $role=$1;      my $role=$1;
     my $realm=$2;      my $realm=$2;
     my ($start,$end)=split(/\./,$env{$_});      my ($start,$end)=split(/\./,$env{$key});
     if (($start) && ($start>time)) { next; }      if (($start) && ($start>time)) { next; }
     if (($end) && (time>$end)) { next; }      if (($end) && (time>$end)) { next; }
     my $ca; my $cd;      my ($ca,$cd);
     if ($1 eq 'au') {      if ($1 eq 'au') {
  $ca=$env{'user.name'};   $ca=$env{'user.name'};
  $cd=$env{'user.domain'};   $cd=$env{'user.domain'};
Line 116  sub authorhosts { Line 112  sub authorhosts {
     }      }
     return ($home,$other,%outhash);      return ($home,$other,%outhash);
 }  }
 # ------------------------------------------------------ Generate "dump" button  
   
 sub dumpbutton {  sub dumpbutton {
     my ($home,$other,%outhash)=&authorhosts();      my ($home,$other,%outhash)=&authorhosts();
     my $type = &Apache::loncommon::course_type();      my $type = &Apache::loncommon::course_type();
     if ($home+$other==0) { return ''; }      if ($home+$other==0) { return ''; }
     if ($home) {      if ($home) {
  return '<div>'.   return '<input type="submit" name="dumpcourse" value="'.
     '<input type="submit" name="dumpcourse" value="'.  
     &mt('Dump '.$type.' DOCS to Construction Space').'" />'.      &mt('Dump '.$type.' DOCS to Construction Space').'" />'.
     &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs').      &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs').'<br />';
     '</div>';  
     } else {      } else {
  return '<div>'.   return '<div>'.
      &mt('Dump '.$type.       &mt('Dump '.$type.
Line 139  sub dumpbutton { Line 133  sub dumpbutton {
 sub clean {  sub clean {
     my ($title)=@_;      my ($title)=@_;
     $title=~s/[^\w\/\!\$\%\^\*\-\_\=\+\;\:\,\\\|\`\~]+/\_/gs;      $title=~s/[^\w\/\!\$\%\^\*\-\_\=\+\;\:\,\\\|\`\~]+/\_/gs;
     return $title;      return $title;
 }  }
 # -------------------------------------------------------- Actually dump course  
   
   
 sub dumpcourse {  sub dumpcourse {
     my ($r) = @_;      my ($r) = @_;
     my $type = &Apache::loncommon::course_type();      my $type = &Apache::loncommon::course_type();
     $r->print(&Apache::loncommon::start_page('Dump '.$type.' DOCS to Construction Space').      $r->print(&Apache::loncommon::start_page('Dump '.$type.' DOCS to Construction Space').
       '<form name="dumpdoc" method="post">');        '<form name="dumpdoc" action="" method="post">');
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Dump '.$type.' DOCS to Construction Space'));      $r->print(&Apache::lonhtmlcommon::breadcrumbs('Dump '.$type.' DOCS to Construction Space'));
     my ($home,$other,%outhash)=&authorhosts();      my ($home,$other,%outhash)=&authorhosts();
     unless ($home) { return ''; }      unless ($home) { return ''; }
Line 161  sub dumpcourse { Line 156  sub dumpcourse {
  my $title=$env{'form.authorfolder'};   my $title=$env{'form.authorfolder'};
  $title=&clean($title);   $title=&clean($title);
  my %replacehash=();   my %replacehash=();
  foreach (keys %env) {   foreach my $key (keys(%env)) {
     if ($_=~/^form\.namefor\_(.+)/) {      if ($key=~/^form\.namefor\_(.+)/) {
  $replacehash{$1}=$env{$_};   $replacehash{$1}=$env{$key};
     }      }
  }   }
  my $crs='/uploaded/'.$env{'request.course.id'}.'/';   my $crs='/uploaded/'.$env{'request.course.id'}.'/';
  $crs=~s/\_/\//g;   $crs=~s/\_/\//g;
  foreach (keys %replacehash) {   foreach my $item (keys(%replacehash)) {
     my $newfilename=$title.'/'.$replacehash{$_};      my $newfilename=$title.'/'.$replacehash{$item};
     $newfilename=~s/\.(\w+)$//;      $newfilename=~s/\.(\w+)$//;
     my $ext=$1;      my $ext=$1;
     $newfilename=&clean($newfilename);      $newfilename=&clean($newfilename);
Line 180  sub dumpcourse { Line 175  sub dumpcourse {
     my $fail=0;      my $fail=0;
     for (my $i=0;$i<$#dirs;$i++) {      for (my $i=0;$i<$#dirs;$i++) {
  $makepath.='/'.$dirs[$i];   $makepath.='/'.$dirs[$i];
  unless (-e $makepath) {    unless (-e $makepath) {
     unless(mkdir($makepath,0777)) { $fail=1; }       unless(mkdir($makepath,0777)) { $fail=1; }
  }   }
     }      }
     $r->print('<br /><tt>'.$_.'</tt> => <tt>'.$newfilename.'</tt>: ');      $r->print('<br /><tt>'.$item.'</tt> => <tt>'.$newfilename.'</tt>: ');
     if (my $fh=Apache::File->new('>'.$path.'/'.$newfilename)) {      if (my $fh=Apache::File->new('>'.$path.'/'.$newfilename)) {
  if ($_=~/\.(sequence|page|html|htm|xml|xhtml)$/) {   if ($item=~/\.(sequence|page|html|htm|xml|xhtml)$/) {
     print $fh &Apache::lonclonecourse::rewritefile(      print $fh &Apache::lonclonecourse::rewritefile(
          &Apache::lonclonecourse::readfile($env{'request.course.id'},$_),           &Apache::lonclonecourse::readfile($env{'request.course.id'},$item),
      (%replacehash,$crs => '')       (%replacehash,$crs => '')
     );      );
  } else {   } else {
     print $fh      print $fh
          &Apache::lonclonecourse::readfile($env{'request.course.id'},$_);           &Apache::lonclonecourse::readfile($env{'request.course.id'},$item);
        }         }
  $fh->close();   $fh->close();
     } else {      } else {
Line 211  sub dumpcourse { Line 206  sub dumpcourse {
     $r->print(      $r->print(
       '<h3>'.&mt('Select the Construction Space').'</h3><select name="authorspace">');        '<h3>'.&mt('Select the Construction Space').'</h3><select name="authorspace">');
  }   }
  foreach (sort keys %outhash) {   foreach my $key (sort(keys(%outhash))) {
     if ($_=~/^home_(.+)$/) {      if ($key=~/^home_(.+)$/) {
  if ($home==1) {   if ($home==1) {
     $r->print(      $r->print(
   '<input type="hidden" name="authorspace" value="'.$1.'" />');    '<input type="hidden" name="authorspace" value="'.$1.'" />');
Line 238  sub dumpcourse { Line 233  sub dumpcourse {
                  .'<th>'.&mt('Title').'</th>'                   .'<th>'.&mt('Title').'</th>'
                  .'<th>'.&mt('Save as ...').'</th>'                   .'<th>'.&mt('Save as ...').'</th>'
                  .&Apache::loncommon::end_data_table_header_row());                   .&Apache::loncommon::end_data_table_header_row());
  foreach (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) {   foreach my $file (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) {
     $r->print(&Apache::loncommon::start_data_table_row()      $r->print(&Apache::loncommon::start_data_table_row()
                      .'<td>'.$_.'</td>');                       .'<td>'.$file.'</td>');
     my ($ext)=($_=~/\.(\w+)$/);      my ($ext)=($file=~/\.(\w+)$/);
     my $title=$hash{'title_'.$hash{      my $title=$hash{'title_'.$hash{
  'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$_}};   'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$file}};
     $r->print('<td>'.($title?$title:'&nbsp;').'</td>');      $r->print('<td>'.($title?$title:'&nbsp;').'</td>');
     if (!$title) {      if (!$title) {
  $title=$_;   $title=$file;
     } else {      } else {
  $title=~s|/|_|g;   $title=~s|/|_|g;
     }      }
     $title=~s/\.(\w+)$//;      $title=~s/\.(\w+)$//;
     $title=&clean($title);      $title=&clean($title);
     $title.='.'.$ext;      $title.='.'.$ext;
     $r->print("\n<td><input type='text' size='60' name='namefor_".$_."' value='".$title."' /></td>"      $r->print("\n<td><input type='text' size='60' name='namefor_".$file."' value='".$title."' /></td>"
                      .&Apache::loncommon::end_data_table_row());                       .&Apache::loncommon::end_data_table_row());
  }   }
  $r->print(&Apache::loncommon::end_data_table());   $r->print(&Apache::loncommon::end_data_table());
Line 263  sub dumpcourse { Line 258  sub dumpcourse {
     }      }
 }  }
   
 # ------------------------------------------------------ Generate "export" button  
   
 sub exportbutton {  sub exportbutton {
     my $type = &Apache::loncommon::course_type();      my $type = &Apache::loncommon::course_type();
     return '<div>'.      return '<input type="submit" name="exportcourse" value="'.
             '<input type="submit" name="exportcourse" value="'.  
             &mt('Export '.$type.' to IMS').'" />'.              &mt('Export '.$type.' to IMS').'" />'.
     &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'</div>';      &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'<br />';
 }  }
   
   
   
 sub exportcourse {  sub exportcourse {
     my $r=shift;      my $r=shift;
     my $type = &Apache::loncommon::course_type();      my $type = &Apache::loncommon::course_type();
     my %discussiontime = &Apache::lonnet::dump('discussiontimes',      my %discussiontime = &Apache::lonnet::dump('discussiontimes',
                                                $env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'});                                                 $env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'});
     my $numdisc = keys %discussiontime;      my $numdisc = keys(%discussiontime);
     my $navmap = Apache::lonnavmaps::navmap->new();      my $navmap = Apache::lonnavmaps::navmap->new();
       if (!defined($navmap)) {
           $r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package').
                     '<h2>'.&mt('IMS Export Failed').'</h2>'.
                     '<div class="LC_error">'.
                     &mt('Unable to retrieve information about course contents').
                     '</div><a href="/adm/coursedocs">'.&mt('Return to Course Editor').'</a>');
           &Apache::lonnet::logthis('IMS export failed - could not create navmap object in '.lc($type).':'.$env{'request.course.id'});
           return;
       }
     my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef);      my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef);
     my $curRes;      my $curRes;
     my $outcome;      my $outcome;
Line 316  sub exportcourse { Line 321  sub exportcourse {
                 open(OUTPUT, "zip -r $imszip *  2> /dev/null |");                  open(OUTPUT, "zip -r $imszip *  2> /dev/null |");
                 close(OUTPUT);                  close(OUTPUT);
                 chdir $cwd;                  chdir $cwd;
                 $outcome .= &mt('Download the zip file from <a href="[_1]">IMS '.lc($type).' archive</a><br />',$imszipfile,);                  $outcome .= '<p>'
                              .&mt('Download the zip file from [_1]IMS '.lc($type).' archive[_2]'
                                  ,'<a href="'.$imszipfile.'">','</a>')
                              .'</p>';
                 if ($copyresult) {                  if ($copyresult) {
                     $outcome .= &mt('The following errors occurred during export - [_1]',$copyresult);                      $outcome .= '<p class="LC_error">'
                                  .&mt('The following errors occurred during export - [_1]'
                                      ,$copyresult)
                                  .'</p>';
                 }                  }
             } else {              } else {
                 $outcome = '<br />'.&mt('Unfortunately you will not be able to retrieve an IMS archive of this posts at this time, because there was a problem creating a manifest file.').'<br />';                  $outcome = '<br />'.&mt('Unfortunately you will not be able to retrieve an IMS archive of this posts at this time, because there was a problem creating a manifest file.').'<br />';
Line 330  sub exportcourse { Line 341  sub exportcourse {
         $r->print(&Apache::loncommon::end_page());          $r->print(&Apache::loncommon::end_page());
     } else {      } else {
         my $display;          my $display;
         $display = '<form name="exportdoc" method="post">'."\n";          $display = '<form name="exportdoc" action="" method="post">'."\n";
         $display .= &mt('Choose which items you wish to export from your '.$type.'.<br /><br />');          $display .= '<p>'
         $display .= '<table border="0" cellspacing="0" cellpadding="3">'.                     .&mt('Choose which items you wish to export from your '.$type.'.')
                     '<tr><td><fieldset><legend>&nbsp;<b>Content items</b></legend>'.                     .'</p>';
                     '<input type="button" value="check all" '.          $display .= '<div class="LC_columnSection"><fieldset>'.
                       '<legend>'.&mt('Content items').'</legend>'.
                       '<input type="button" value="'.&mt('check all').'" '.
                     'onclick="javascript:checkAll(document.exportdoc.archive)" />'.                      'onclick="javascript:checkAll(document.exportdoc.archive)" />'.
                     '&nbsp;&nbsp;<input type="button" value="uncheck all"'.                      '&nbsp;&nbsp;<input type="button" value="'.&mt('uncheck all').'"'.
                     ' onclick="javascript:uncheckAll(document.exportdoc.archive)" /></fieldset></td>'.                      ' onclick="javascript:uncheckAll(document.exportdoc.archive)" /></fieldset>'.
                     '<td>&nbsp;</td><td>&nbsp;</td>'.                      '<fieldset>'.
                     '<td align="right"><fieldset><legend>&nbsp;<b>Discussion posts'.                      '<legend>'.&mt('Discussion posts').'</legend>'.
                     '</b></legend><input type="button" value="check all"'.                      '<input type="button" value="'.&mt('check all').'"'.
                     ' onclick="javascript:checkAll(document.exportdoc.discussion)" />'.                      ' onclick="javascript:checkAll(document.exportdoc.discussion)" />'.
                     '&nbsp;&nbsp;<input type="button" value="uncheck all"'.                      '&nbsp;&nbsp;<input type="button" value="'.&mt('uncheck all').'"'.
                     ' onclick="javascript:uncheckAll(document.exportdoc.discussion)" /></fieldset></td>'.                      ' onclick="javascript:uncheckAll(document.exportdoc.discussion)" />'.
                     '</tr></table>';                      '</fieldset></div>';
         my $curRes;          my $curRes;
         my $depth = 0;          my $depth = 0;
         my $count = 0;          my $count = 0;
Line 353  sub exportcourse { Line 366  sub exportcourse {
         my %parent = ();          my %parent = ();
         my %children = ();          my %children = ();
         my $lastcontainer = $startcount;          my $lastcontainer = $startcount;
         my @bgcolors = ('#F6F6F6','#FFFFFF');          $display .= &Apache::loncommon::start_data_table()
         $display .= '<table cellspacing="0"><tr>'.                     .&Apache::loncommon::start_data_table_header_row()
             '<td><b>Export content item?<br /></b></td><td>&nbsp;</td><td align="right">'."\n";                     .'<th>'.&mt('Export content item?').'</th>'
                      .'<th>';
         if ($numdisc > 0) {          if ($numdisc > 0) {
             $display.='<b>Export&nbsp;discussion posts?</b>'."\n";              $display .= &mt('Export discussion posts?');
           } else {
                $display .= '&nbsp;';
         }          }
         $display.='&nbsp;</td></tr>';          $display .= '</th>'
                      .&Apache::loncommon::end_data_table_header_row();
         while ($curRes = $it->next()) {          while ($curRes = $it->next()) {
             if (ref($curRes)) {              if (ref($curRes)) {
                 $count ++;                  $count ++;
Line 380  sub exportcourse { Line 397  sub exportcourse {
                         $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard';                          $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard';
                     }                      }
                 }                  }
                 my $color = $count%2;                  $display .= &Apache::loncommon::start_data_table_row()
                 $display .='<tr bgcolor='.$bgcolors[$color].'><td>'."\n".                             .'<td>'."\n"
                     '<input type="checkbox" name="archive" value="'.$count.'" ';                             .'<input type="checkbox" name="archive" value="'.$count.'" ';
                 if (($curRes->is_sequence()) || ($curRes->is_page())) {                  if (($curRes->is_sequence()) || ($curRes->is_page())) {
                     my $checkitem = $count + $boards + $startcount;                      my $checkitem = $count + $boards + $startcount;
                     $display .= 'onClick="javascript:propagateCheck('."'$checkitem'".')"';                      $display .= 'onclick="javascript:propagateCheck('."'$checkitem'".')"';
                 }                  }
                 $display .= ' />'."\n";                  $display .= ' />'."\n";
                 for (my $i=0; $i<$depth; $i++) {                  for (my $i=0; $i<$depth; $i++) {
                     $display .= '<img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" /><img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" />'."\n";                      $display .= '<img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" alt="" />'
                                  .'<img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" alt="" />'."\n";
                 }                  }
                 if ($curRes->is_sequence()) {                  if ($curRes->is_sequence()) {
                     $display .= '<img src="/adm/lonIcons/navmap.folder.open.gif">&nbsp;'."\n";                      $display .= '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" />&nbsp;'."\n";
                     $lastcontainer = $count + $startcount + $boards;                      $lastcontainer = $count + $startcount + $boards;
                 } elsif ($curRes->is_page()) {                  } elsif ($curRes->is_page()) {
                     $display .= '<img src="/adm/lonIcons/navmap.page.open.gif">&nbsp;'."\n";                      $display .= '<img src="/adm/lonIcons/navmap.page.open.gif" alt="" />&nbsp;'."\n";
                     $lastcontainer = $count + $startcount + $boards;                      $lastcontainer = $count + $startcount + $boards;
                 }                  }
                 my $currelem = $count+$boards+$startcount;                  my $currelem = $count+$boards+$startcount;
                 $children{$parent{$depth}} .= $currelem.':';                  $children{$parent{$depth}} .= $currelem.':';
                 $display .= '&nbsp;'.$curRes->title().'</td>';                  $display .= '&nbsp;'.$curRes->title().'</td>'."\n";
   
                   # Existing discussion posts?
                 if ($discussiontime{$ressymb} > 0) {                  if ($discussiontime{$ressymb} > 0) {
                     $boards ++;                      $boards ++;
                     $currelem = $count+$boards+$startcount;                      $currelem = $count+$boards+$startcount;
                     $display .= '<td>&nbsp;</td><td align="right"><input type="checkbox" name="discussion" value="'.$count.'" />&nbsp;</td>'."\n";                      $display .= '<td align="right">'
                                  .'<input type="checkbox" name="discussion" value="'.$count.'" />'
                                  .'</td>'."\n";
                 } else {                  } else {
                     $display .= '<td colspan="2">&nbsp;</td>'."\n";                      $display .= '<td>&nbsp;</td>'."\n";
                 }                  }
                   $display .= &Apache::loncommon::end_data_table_row();
             }              }
         }          }
           $display .= &Apache::loncommon::end_data_table();
         my $scripttag = qq|          my $scripttag = qq|
 <script>  <script type="text/javascript">
   // <![CDATA[
 function checkAll(field) {  function checkAll(field) {
     if (field.length > 0) {      if (field.length > 0) {
         for (i = 0; i < field.length; i++) {          for (i = 0; i < field.length; i++) {
Line 422  function checkAll(field) { Line 446  function checkAll(field) {
         field.checked = true          field.checked = true
     }      }
 }  }
                                                                                   
 function uncheckAll(field) {  function uncheckAll(field) {
     if (field.length > 0) {      if (field.length > 0) {
         for (i = 0; i < field.length; i++) {          for (i = 0; i < field.length; i++) {
Line 437  function propagateCheck(item) { Line 461  function propagateCheck(item) {
     if (document.exportdoc.elements[item].checked == true) {      if (document.exportdoc.elements[item].checked == true) {
         containerCheck(item)          containerCheck(item)
     }      }
 }   }
   
 function containerCheck(item) {  function containerCheck(item) {
     document.exportdoc.elements[item].checked = true      document.exportdoc.elements[item].checked = true
Line 448  function containerCheck(item) { Line 472  function containerCheck(item) {
     }      }
         |;          |;
   
         foreach my $container (sort { $a <=> $b } keys %children) {          foreach my $container (sort { $a <=> $b } (keys(%children))) {
             my @contents = split/:/,$children{$container};              my @contents = split(/:/,$children{$container});
             for (my $i=0; $i<@contents; $i ++) {              for (my $i=0; $i<@contents; $i ++) {
                 $scripttag .= '    parents['.$container.']['.$i.'] = '.$contents[$i]."\n";                  $scripttag .= '    parents['.$container.']['.$i.'] = '.$contents[$i]."\n";
             }              }
Line 460  function containerCheck(item) { Line 484  function containerCheck(item) {
         for (var j=0; j<parents[item].length; j++) {          for (var j=0; j<parents[item].length; j++) {
             containerCheck(parents[item][j])              containerCheck(parents[item][j])
         }          }
      }          }
 }  }
   // ]]>
 </script>  </script>
         |;          |;
  $r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package',   $r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package',
  $scripttag));   $scripttag));
  $r->print(&Apache::lonhtmlcommon::breadcrumbs('Export '.lc($type).' to IMS content package'));   $r->print(&Apache::lonhtmlcommon::breadcrumbs('Export '.lc($type).' to IMS content package'));
  $r->print($display.'</table>'.   $r->print($display.
                   '<p><input type="hidden" name="finishexport" value="1">'.                    '<p><input type="hidden" name="finishexport" value="1" />'.
                   '<input type="submit" name="exportcourse" value="'.                    '<input type="submit" name="exportcourse" value="'.
                   &mt('Export '.$type.' DOCS').'" /></p></form>'.                    &mt('Export '.$type.' DOCS').'" /></p></form>');
   &Apache::loncommon::end_page());  
     }      }
 }  }
   
Line 557  sub build_package { Line 580  sub build_package {
             if ($curRes->is_sequence() || $curRes->is_page()) {              if ($curRes->is_sequence() || $curRes->is_page()) {
                 $lastcontainer = $count;                  $lastcontainer = $count;
             }              }
             if (grep/^$count$/,@$exportitems) {              if (grep(/^$count$/,@$exportitems)) {
                 &get_dependencies($exportitems,\%parent,$depth,\@dependencies);                  &get_dependencies($exportitems,\%parent,$depth,\@dependencies);
             }              }
         }          }
Line 581  sub build_package { Line 604  sub build_package {
   
         if (ref($curRes)) {          if (ref($curRes)) {
             $count ++;              $count ++;
             if ((grep/^$count$/,@$exportitems) || (grep/^$count$/,@dependencies)) {              if ((grep(/^$count$/,@$exportitems)) || (grep(/^$count$/,@dependencies))) {
                 my $symb = $curRes->symb();                  my $symb = $curRes->symb();
                 my $isvisible = 'true';                  my $isvisible = 'true';
                 my $resourceref;                  my $resourceref;
Line 615  sub build_package { Line 638  sub build_package {
                      '   <resource identifier="RES-'.$env{'request.course.id'}.'-'.$count.                       '   <resource identifier="RES-'.$env{'request.course.id'}.'-'.$count.
                      '" type="webcontent" href="'.$content_file.'">'."\n".                       '" type="webcontent" href="'.$content_file.'">'."\n".
                      '       <file href="'.$content_file.'" />'."\n";                       '       <file href="'.$content_file.'" />'."\n";
                         foreach (@hrefs) {                          foreach my $item (@hrefs) {
                             $imsresources .=                              $imsresources .=
                      '        <file href="'.$_.'" />'."\n";                       '        <file href="'.$item.'" />'."\n";
                         }                          }
                         if (grep/^$count$/,@$discussions) {                          if (grep(/^$count$/,@$discussions)) {
                             my $ressymb = $symb;                              my $ressymb = $symb;
                             my $mode;                              my $mode;
                             if ($ressymb =~ m|adm/($match_domain)/($match_username)/(\d+)/bulletinboard$|) {                              if ($ressymb =~ m|adm/($match_domain)/($match_username)/(\d+)/bulletinboard$|) {
Line 660  sub build_package { Line 683  sub build_package {
 sub get_dependencies {  sub get_dependencies {
     my ($exportitems,$parent,$depth,$dependencies) = @_;      my ($exportitems,$parent,$depth,$dependencies) = @_;
     if ($depth > 1) {      if ($depth > 1) {
         if ((!grep/^$$parent{$depth}$/,@$exportitems) && (!grep/^$$parent{$depth}$/,@$dependencies)) {          if ((!grep(/^$$parent{$depth}$/,@$exportitems)) && (!grep(/^$$parent{$depth}$/,@$dependencies))) {
             push @$dependencies, $$parent{$depth};              push(@{$dependencies},$$parent{$depth});
             if ($depth > 2) {              if ($depth > 2) {
                 &get_dependencies($exportitems,$parent,$depth-1,$dependencies);                  &get_dependencies($exportitems,$parent,$depth-1,$dependencies);
             }              }
Line 755  sub replicate_content { Line 778  sub replicate_content {
     if ($caller eq 'templateupload') {      if ($caller eq 'templateupload') {
         $url = $symb;          $url = $symb;
         $url =~ s#//#/#g;          $url =~ s#//#/#g;
     } else {       } else {
         ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);          ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
     }      }
     my $content;      my $content;
Line 795  sub replicate_content { Line 818  sub replicate_content {
                     $$message = 'Could not render '.$url.' server message - '.$rtncode."<br />\n";                      $$message = 'Could not render '.$url.' server message - '.$rtncode."<br />\n";
                 }                  }
             } elsif ($caller eq 'noedit') {              } elsif ($caller eq 'noedit') {
 # Need to render the resource without the LON-CAPA Internal header and the Post discussion footer, and then set $content equal to this.   # Need to render the resource without the LON-CAPA Internal header and the Post discussion footer, and then set $content equal to this.
                 $repstatus = 'ok';                  $repstatus = 'ok';
                 $content = 'Not the owner of this resource';                   $content = 'Not the owner of this resource';
             }              }
             if ($repstatus eq 'ok') {              if ($repstatus eq 'ok') {
                 print $copiedfile $content;                  print $copiedfile $content;
Line 848  sub extract_media { Line 871  sub extract_media {
             }              }
         }          }
         if ($caller eq 'resource') {          if ($caller eq 'resource') {
             my $respath =  $Apache::lonnet::perlvar{'lonDocRoot'}.'/res';                my $respath =  $Apache::lonnet::perlvar{'lonDocRoot'}.'/res';
             my $embed_path = &Apache::lonnet::filelocation($respath,$embed_url);               my $embed_path = &Apache::lonnet::filelocation($respath,$embed_url);
             $embed_content = &Apache::lonnet::getfile($embed_path);              $embed_content = &Apache::lonnet::getfile($embed_path);
             unless ($embed_content eq -1) {              unless ($embed_content eq -1) {
                 $repstatus = 'ok';                  $repstatus = 'ok';
             }              }
         } elsif ($caller eq 'uploaded') {          } elsif ($caller eq 'uploaded') {
               
             $repstatus = &Apache::lonnet::getuploaded('GET',$embed_url,$cdom,$cnum,\$embed_content,$rtncode);              $repstatus = &Apache::lonnet::getuploaded('GET',$embed_url,$cdom,$cnum,\$embed_content,$rtncode);
         }          }
         if ($repstatus eq 'ok') {          if ($repstatus eq 'ok') {
Line 867  sub extract_media { Line 890  sub extract_media {
             my $copiedfile;              my $copiedfile;
             if ($copiedfile = Apache::File->new('>'.$destination)) {              if ($copiedfile = Apache::File->new('>'.$destination)) {
                 print $copiedfile $embed_content;                  print $copiedfile $embed_content;
                 push @{$href}, 'resources/'.$count.'/res/'.$filename;                  push(@{$href},'resources/'.$count.'/res/'.$filename);
                 my $attrib_regexp = '';                  my $attrib_regexp = '';
                 if (@{$allfiles{$embed_file}} > 1) {                  if (@{$allfiles{$embed_file}} > 1) {
                     $attrib_regexp = join('|',@{$allfiles{$embed_file}});                      $attrib_regexp = join('|',@{$allfiles{$embed_file}});
Line 911  sub store_template { Line 934  sub store_template {
     }      }
 }  }
   
 # Imports the given (name, url) resources into the course  
 # coursenum, coursedom, and folder must precede the list  
 sub group_import {  sub group_import {
     my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_;      my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_;
   
     while (@files) {      while (@files) {
  my ($name, $url, $residx) = @{ shift(@files) };   my ($name, $url, $residx) = @{ shift(@files) };
         if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$})           if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$})
      && ($caller eq 'londocs')       && ($caller eq 'londocs')
      && (!&Apache::lonnet::stat_file($url))) {       && (!&Apache::lonnet::stat_file($url))) {
       
             my $errtext = '';              my $errtext = '';
             my $fatal = 0;              my $fatal = 0;
             my $newmapstr = '<map>'."\n".              my $newmapstr = '<map>'."\n".
Line 941  sub group_import { Line 963  sub group_import {
             }              }
         }          }
  if ($url) {   if ($url) {
     if (!$residx       if (!$residx
  || defined($LONCAPA::map::zombies[$residx])) {   || defined($LONCAPA::map::zombies[$residx])) {
  $residx = &LONCAPA::map::getresidx($url,$residx);   $residx = &LONCAPA::map::getresidx($url,$residx);
  push(@LONCAPA::map::order, $residx);   push(@LONCAPA::map::order, $residx);
Line 950  sub group_import { Line 972  sub group_import {
     if ($url=~m{^http://} || $url=~m{^https://}) { $ext = 'true'; }      if ($url=~m{^http://} || $url=~m{^https://}) { $ext = 'true'; }
     $url  = &LONCAPA::map::qtunescape($url);      $url  = &LONCAPA::map::qtunescape($url);
     $name = &LONCAPA::map::qtunescape($name);      $name = &LONCAPA::map::qtunescape($name);
     $LONCAPA::map::resources[$residx] =       $LONCAPA::map::resources[$residx] =
  join(':', ($name, $url, $ext, 'normal', 'res'));   join(':', ($name, $url, $ext, 'normal', 'res'));
  }   }
     }      }
Line 981  sub breadcrumbs { Line 1003  sub breadcrumbs {
  my $url='/adm/coursedocs?folderpath='.   my $url='/adm/coursedocs?folderpath='.
     &escape($folderpath);      &escape($folderpath);
     my $name=&unescape($foldername);      my $name=&unescape($foldername);
 # randompick number, hidden, encrypted, random order, is appended with ":"s to the foldername  # randompick number, hidden, encrypted, random order, is appended with ":"s to the foldername
      $name=~s/\:(\d*)\:(\w*)\:(\w*):(\d*)$//;       $name=~s/\:(\d*)\:(\w*)\:(\w*):(\d*)$//;
     if ($1 ne '') {       if ($1 ne '') {
                $randompick=$1;                 $randompick=$1;
             } else {              } else {
                $randompick=-1;                 $randompick=-1;
Line 1001  sub breadcrumbs { Line 1023  sub breadcrumbs {
     &Apache::lonhtmlcommon::add_breadcrumb(      &Apache::lonhtmlcommon::add_breadcrumb(
       {'href'=>$url.$cpinfo,        {'href'=>$url.$cpinfo,
        'title'=>$name,         'title'=>$name,
        'text'=>'<font size="+1">'.         'text'=>$name,
    $name.'</font>',  
        'no_mt'=>1,         'no_mt'=>1,
        });         });
  $plain.=$name.' &gt; ';   $plain.=$name.' &gt; ';
     }      }
     $plain=~s/\&gt\;\s*$//;      $plain=~s/\&gt\;\s*$//;
     return (&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp',      return (&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp',
        'LC_docs_path'),$randompick,$ishidden,$isencrypted,$plain,$is_random_order);         'LC_docs_path', undef, 1 ),$randompick,$ishidden,$isencrypted,$plain,$is_random_order);
 }  }
   
 sub log_docs {  sub log_docs {
Line 1047  sub log_docs { Line 1068  sub log_docs {
                        'currentfolder' => $env{'form.folder'});                         'currentfolder' => $env{'form.folder'});
         if ($parmidx) {          if ($parmidx) {
            $storehash{'parameter_res'}=$oldresources[$parmidx];             $storehash{'parameter_res'}=$oldresources[$parmidx];
            foreach my $parm (keys %parmaction) {             foreach my $parm (keys(%parmaction)) {
               $storehash{'parameter_action_'.$parm}=$parmaction{$parm};                $storehash{'parameter_action_'.$parm}=$parmaction{$parm};
               $storehash{'parameter_value_'.$parm}=$parmvalue{$parm};                $storehash{'parameter_value_'.$parm}=$parmvalue{$parm};
            }             }
Line 1074  sub log_docs { Line 1095  sub log_docs {
 }  }
   
   
 #  
 # Docs Change Log  
 #  
 sub docs_change_log {  sub docs_change_log {
     my ($r)=@_;      my ($r)=@_;
     my $folder=$env{'form.folder'};      my $folder=$env{'form.folder'};
Line 1122  sub docs_change_log { Line 1143  sub docs_change_log {
     foreach my $key (@changes) {      foreach my $key (@changes) {
  $wholeentry.=':'.$docslog{$id}{'logentry'}{$key};   $wholeentry.=':'.$docslog{$id}{'logentry'}{$key};
     }      }
     if ($wholeentry!~/\Q$env{'form.containingphrase'}\E/i) { next; }               if ($wholeentry!~/\Q$env{'form.containingphrase'}\E/i) { next; }
  }   }
         my $count = 0;          my $count = 0;
         my $time =          my $time =
Line 1173  sub docs_change_log { Line 1194  sub docs_change_log {
     if ($oldname ne '' && $oldname ne $newname) {      if ($oldname ne '' && $oldname ne $newname) {
  $r->print(&LONCAPA::map::qtescape($newname));   $r->print(&LONCAPA::map::qtescape($newname));
     }      }
  }           }
  $r->print('<ul>');   $r->print('<ul>');
  for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {   for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
             if ($docslog{$id}{'logentry'}{'after_order_res_'.$idx}) {              if ($docslog{$id}{'logentry'}{'after_order_res_'.$idx}) {
Line 1211  sub update_paste_buffer { Line 1232  sub update_paste_buffer {
   
     my ($errtext,$fatal) = &mapread($coursenum,$coursedom,      my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
     $env{'form.copyfolder'});      $env{'form.copyfolder'});
       
     return if ($fatal);      return if ($fatal);
   
 # Mark for copying  # Mark for copying
Line 1220  sub update_paste_buffer { Line 1241  sub update_paste_buffer {
         &Apache::lonnet::appenv({'docs.markedcopy_supplemental' => $title});          &Apache::lonnet::appenv({'docs.markedcopy_supplemental' => $title});
  ($title) = &parse_supplemental_title($title);   ($title) = &parse_supplemental_title($title);
     } elsif ($env{'docs.markedcopy_supplemental'}) {      } elsif ($env{'docs.markedcopy_supplemental'}) {
         &Apache::lonnet::delenv('docs\\.markedcopy_supplemental');          &Apache::lonnet::delenv('docs.markedcopy_supplemental');
     }      }
     $url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};      $url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
   
Line 1271  ENDPASTE Line 1292  ENDPASTE
 sub do_paste_from_buffer {  sub do_paste_from_buffer {
     my ($coursenum,$coursedom,$folder) = @_;      my ($coursenum,$coursedom,$folder) = @_;
   
     return 0 if (!$env{'form.pastemarked'});      if (!$env{'form.pastemarked'}) {
           return;
       }
   
 # paste resource to end of list  # paste resource to end of list
     my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'});      my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'});
Line 1279  sub do_paste_from_buffer { Line 1302  sub do_paste_from_buffer {
 # Maps need to be copied first  # Maps need to be copied first
     if (($url=~/\.(page|sequence)$/) && ($url=~/^\/uploaded\//)) {      if (($url=~/\.(page|sequence)$/) && ($url=~/^\/uploaded\//)) {
  $title=&mt('Copy of').' '.$title;   $title=&mt('Copy of').' '.$title;
  my $newid=$$.time;   my $newid=$$.int(rand(100)).time;
  my ($oldid,$ext) = ($url=~/^(.+)\.(\w+)$/);   my ($oldid,$ext) = ($url=~/^(.+)\.(\w+)$/);
         if ($oldid =~ m{^(/uploaded/\Q$coursedom\E/\Q$coursenum\E/)(\D+)(\d+)$}) {          if ($oldid =~ m{^(/uploaded/\Q$coursedom\E/\Q$coursenum\E/)(\D+)(\d+)$}) {
             my $path = $1;              my $path = $1;
Line 1308  sub do_paste_from_buffer { Line 1331  sub do_paste_from_buffer {
         }          }
  my $storefn=$newurl;   my $storefn=$newurl;
  $storefn=~s{^/\w+/$match_domain/$match_username/}{};   $storefn=~s{^/\w+/$match_domain/$match_username/}{};
  &Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn,   my $paste_map_result =
    &Apache::lonnet::getfile($url));              &Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn,
          &Apache::lonnet::getfile($url));
           if ($paste_map_result eq '/adm/notfound.html') {
               if ($url=~/\.page$/) {
                   return &mt('Paste failed: an error occurred saving the composite page');
               } else {
                   return &mt('Paste failed: an error occurred saving the folder');
               }
           }
  $url = $newurl;   $url = $newurl;
     }      }
 # published maps can only exists once, so remove it from paste buffer when done  # published maps can only exists once, so remove it from paste buffer when done
     if (($url=~/\.(page|sequence)$/) && ($url=~m {^/res/})) {      if (($url=~/\.(page|sequence)$/) && ($url=~m {^/res/})) {
  &Apache::lonnet::delenv('docs\\.markedcopy');   &Apache::lonnet::delenv('docs.markedcopy');
     }      }
     if ($url=~ m{/smppg$}) {      if ($url=~ m{/smppg$}) {
  my $db_name = &Apache::lonsimplepage::get_db_name($url);   my $db_name = &Apache::lonsimplepage::get_db_name($url);
Line 1325  sub do_paste_from_buffer { Line 1356  sub do_paste_from_buffer {
     $db_name =~ s{_\d*$ }{_$now}x;      $db_name =~ s{_\d*$ }{_$now}x;
     my $result=&Apache::lonnet::put($db_name,\%contents,      my $result=&Apache::lonnet::put($db_name,\%contents,
     $coursedom,$coursenum);      $coursedom,$coursenum);
     $url =~ s{/(\d*)/smppg$ }{/$now/smppg}x;       $url =~ s{/(\d*)/smppg$ }{/$now/smppg}x;
     $title=&mt('Copy of').' '.$title;      $title=&mt('Copy of').' '.$title;
  }   }
     }      }
Line 1339  sub do_paste_from_buffer { Line 1370  sub do_paste_from_buffer {
         if ($folder =~ /^supplemental/) {          if ($folder =~ /^supplemental/) {
             $title = $env{'docs.markedcopy_supplemental'};              $title = $env{'docs.markedcopy_supplemental'};
         } else {          } else {
             (undef,undef,$title) =               (undef,undef,$title) =
                 &parse_supplemental_title($env{'docs.markedcopy_supplemental'});                  &parse_supplemental_title($env{'docs.markedcopy_supplemental'});
         }          }
     } else {      } else {
Line 1351  sub do_paste_from_buffer { Line 1382  sub do_paste_from_buffer {
   
     $LONCAPA::map::resources[$newidx]= $title.':'.$url.':'.$ext.':normal:res';      $LONCAPA::map::resources[$newidx]= $title.':'.$url.':'.$ext.':normal:res';
     push(@LONCAPA::map::order, $newidx);      push(@LONCAPA::map::order, $newidx);
       return 'ok';
 # Store the result  # Store the result
 }  }
   
Line 1362  sub uniqueness_check { Line 1394  sub uniqueness_check {
         $url=&LONCAPA::map::qtescape($url);          $url=&LONCAPA::map::qtescape($url);
         if ($newurl eq $url) {          if ($newurl eq $url) {
             $unique = 0;              $unique = 0;
             last;                  last;
         }          }
     }      }
     return $unique;      return $unique;
Line 1388  sub update_parameter { Line 1420  sub update_parameter {
  &remember_parms($idx,$which,'set',$value);   &remember_parms($idx,$which,'set',$value);
     } else {      } else {
  &LONCAPA::map::delparameter($idx,'parameter_'.$which);   &LONCAPA::map::delparameter($idx,'parameter_'.$which);
   
  &remember_parms($idx,$which,'del');   &remember_parms($idx,$which,'del');
     }      }
     return 1;      return 1;
Line 1416  sub handle_edit_cmd { Line 1448  sub handle_edit_cmd {
  &LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);   &LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
  splice(@LONCAPA::map::order, $idx, 1);   splice(@LONCAPA::map::order, $idx, 1);
   
     } elsif ($cmd eq 'up'       } elsif ($cmd eq 'up'
      && ($idx) && (defined($LONCAPA::map::order[$idx-1]))) {       && ($idx) && (defined($LONCAPA::map::order[$idx-1]))) {
  @LONCAPA::map::order[$idx-1,$idx] = @LONCAPA::map::order[$idx,$idx-1];   @LONCAPA::map::order[$idx-1,$idx] = @LONCAPA::map::order[$idx,$idx-1];
   
Line 1456  sub editor { Line 1488  sub editor {
         $LONCAPA::map::order[0]=$idx;          $LONCAPA::map::order[0]=$idx;
         $LONCAPA::map::resources[$idx]='';          $LONCAPA::map::resources[$idx]='';
     }      }
       
     my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order)=      my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order)=
  &breadcrumbs($folder,$allowed,$type);   &breadcrumbs($folder,$allowed,$type);
     $r->print($breadcrumbtrail);      $r->print($breadcrumbtrail);
       
 # ------------------------------------------------------------ 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
Line 1481  sub editor { Line 1513  sub editor {
     ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);      ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
     return $errtext if ($fatal);      return $errtext if ($fatal);
  }   }
       
  if ($env{'form.pastemarked'}) {   if ($env{'form.pastemarked'}) {
     &do_paste_from_buffer($coursenum,$coursedom,$folder);              my $paste_res =
     ($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container);                  &do_paste_from_buffer($coursenum,$coursedom,$folder);
     return $errtext if ($fatal);              if ($paste_res eq 'ok') {
                   ($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container);
                   return $errtext if ($fatal);
               } elsif ($paste_res ne '') {
                   $r->print('<p><span class="LC_error">'.$paste_res.'</span></p>');
               }
  }   }
   
  $r->print($upload_output);   $r->print($upload_output);
Line 1497  sub editor { Line 1534  sub editor {
 # Group import/search  # Group import/search
  if ($env{'form.importdetail'}) {   if ($env{'form.importdetail'}) {
     my @imports;      my @imports;
     foreach (split(/\&/,$env{'form.importdetail'})) {      foreach my $item (split(/\&/,$env{'form.importdetail'})) {
  if (defined($_)) {   if (defined($item)) {
     my ($name,$url,$residx)=      my ($name,$url,$residx)=
  map {&unescape($_)} split(/\=/,$_);   map {&unescape($_)} split(/\=/,$item);
     push(@imports, [$name, $url, $residx]);      push(@imports, [$name, $url, $residx]);
  }   }
     }      }
Line 1522  sub editor { Line 1559  sub editor {
  return $errtext if ($fatal);   return $errtext if ($fatal);
     } else {      } else {
  $r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>');   $r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>');
   
     }      }
  }   }
  &log_differences($plain);   &log_differences($plain);
Line 1537  sub editor { Line 1574  sub editor {
   ($ishidden?'<li>'.&mt('contents hidden').'</li>':'').    ($ishidden?'<li>'.&mt('contents hidden').'</li>':'').
   ($isencrypted?'<li>'.&mt('URLs hidden').'</li>':'').    ($isencrypted?'<li>'.&mt('URLs hidden').'</li>':'').
   '</ul></p>');    '</ul></p>');
     }                                                                                                           }
     if ($randompick>=0) {      if ($randompick>=0) {
  $r->print('<p>'.&mt('Caution: this folder is set to randomly pick a subset of resources. Adding or removing resources from this folder will change the set of resources that the students see, resulting in spurious or missing credit for completed problems, not limited to ones you modify. Do not modify the contents of this folder if it is in active student use.').'</p>');   $r->print('<p>'.&mt('Caution: this folder is set to randomly pick a subset of resources. Adding or removing resources from this folder will change the set of resources that the students see, resulting in spurious or missing credit for completed problems, not limited to ones you modify. Do not modify the contents of this folder if it is in active student use.').'</p>');
     }      }
Line 1641  sub process_file_upload { Line 1678  sub process_file_upload {
    <input type="hidden" name="phasetwo" value="'.$total_embedded.'" />';     <input type="hidden" name="phasetwo" value="'.$total_embedded.'" />';
     $phase_status = 'phasetwo';      $phase_status = 'phasetwo';
   
                     $$upload_output .=                       $$upload_output .=
  'This file contains embedded multimedia objects, which need to be uploaded to LON-CAPA.<br />'.   'This file contains embedded multimedia objects, which need to be uploaded to LON-CAPA.<br />'.
  &Apache::loncommon::ask_for_embedded_content(   &Apache::loncommon::ask_for_embedded_content(
                             '/adm/coursedocs',$state,$allfiles,$codebase);                              '/adm/coursedocs',$state,$allfiles,$codebase);
Line 1696  sub parse_supplemental_title { Line 1733  sub parse_supplemental_title {
     }      }
     if (wantarray) {      if (wantarray) {
  return ($title,$foldertitle,$renametitle);   return ($title,$foldertitle,$renametitle);
     }       }
     return $title;      return $title;
 }  }
   
Line 1717  sub entryline { Line 1754  sub entryline {
     }      }
   
     my $orderidx=$LONCAPA::map::order[$index];      my $orderidx=$LONCAPA::map::order[$index];
       
   
     $renametitle=~s/\\/\\\\/g;      $renametitle=~s/\\/\\\\/g;
     $renametitle=~s/\&quot\;/\\\"/g;      $renametitle=~s/\&quot\;/\\\"/g;
Line 1744  sub entryline { Line 1781  sub entryline {
  my $incindex=$index+1;   my $incindex=$index+1;
  my $selectbox='';   my $selectbox='';
  if (($folder!~/^supplemental/) &&   if (($folder!~/^supplemental/) &&
     ($#LONCAPA::map::order>0) &&       ($#LONCAPA::map::order>0) &&
     ((split(/\:/,      ((split(/\:/,
      $LONCAPA::map::resources[$LONCAPA::map::order[0]]))[1]        $LONCAPA::map::resources[$LONCAPA::map::order[0]]))[1]
      ne '') &&        ne '') &&
     ((split(/\:/,      ((split(/\:/,
      $LONCAPA::map::resources[$LONCAPA::map::order[1]]))[1]        $LONCAPA::map::resources[$LONCAPA::map::order[1]]))[1]
      ne '')) {       ne '')) {
     $selectbox=      $selectbox=
  '<input type="hidden" name="currentpos" value="'.$incindex.'" />'.   '<input type="hidden" name="currentpos" value="'.$incindex.'" />'.
  '<select name="newpos" onChange="this.form.submit()">';   '<select name="newpos" onchange="this.form.submit()">';
     for (my $i=1;$i<=$#LONCAPA::map::order+1;$i++) {      for (my $i=1;$i<=$#LONCAPA::map::order+1;$i++) {
  if ($i==$incindex) {   if ($i==$incindex) {
     $selectbox.='<option value="" selected="1">('.$i.')</option>';      $selectbox.='<option value="" selected="selected">('.$i.')</option>';
  } else {   } else {
     $selectbox.='<option value="'.$i.'">'.$i.'</option>';      $selectbox.='<option value="'.$i.'">'.$i.'</option>';
  }   }
Line 1777  sub entryline { Line 1814  sub entryline {
  # no copy for published maps   # no copy for published maps
  $nocopy = 1;   $nocopy = 1;
     } else {      } else {
  foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url),1)) {   foreach my $item (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url),1)) {
     my ($title,$url,$ext,$type)=split(/\:/,$_);      my ($title,$url,$ext,$type)=split(/\:/,$item);
     if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) {      if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) {
  $nocopy=1;   $nocopy=1;
  last;   last;
Line 1786  sub entryline { Line 1823  sub entryline {
  }   }
     }      }
  }   }
         if ($url=~/^\/res\/lib\/templates\//) {           if ($url=~/^\/res\/lib\/templates\//) {
            $nocopy=1;              $nocopy=1;
            $nocut=1;             $nocut=1;
         }          }
         my $copylink='&nbsp;';          my $copylink='&nbsp;';
         my $cutlink='&nbsp;';          my $cutlink='&nbsp;';
   
  my $skip_confirm = 0;   my $skip_confirm = 0;
  if ( $folder =~ /^supplemental/   if ( $folder =~ /^supplemental/
      || ($url =~ m{( /smppg$       || ($url =~ m{( /smppg$
Line 1878  END Line 1915  END
     &Apache::lonnet::allowuploaded('/adm/coursedoc',$url);      &Apache::lonnet::allowuploaded('/adm/coursedoc',$url);
  }   }
     }      }
       
     my $orig_url = $url;      my $orig_url = $url;
       $orig_url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
     my $external = ($url=~s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/});      my $external = ($url=~s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/});
     if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) {      if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) {
  my $symb=&Apache::lonnet::symbclean(   my $symb=&Apache::lonnet::symbclean(
Line 1901  END Line 1939  END
     } elsif ($url!~/\.(sequence|page)$/) {      } elsif ($url!~/\.(sequence|page)$/) {
  $url='/adm/coursedocs/showdoc'.$url;   $url='/adm/coursedocs/showdoc'.$url;
     }      }
  } elsif ($url=~m|^/ext/|) {    } elsif ($url=~m|^/ext/|) {
     $url='/adm/wrapper'.$url;      $url='/adm/wrapper'.$url;
     $external = 1;      $external = 1;
  }   }
Line 1912  END Line 1950  END
         }          }
  if ($container eq 'page') {   if ($container eq 'page') {
     my $symb=$env{'form.pagesymb'};      my $symb=$env{'form.pagesymb'};
           
     $url=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]);      $url=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]);
     $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);      $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
  }   }
Line 1922  END Line 1960  END
  my $foldername=&escape($foldertitle);   my $foldername=&escape($foldertitle);
  my $folderpath=$env{'form.folderpath'};   my $folderpath=$env{'form.folderpath'};
  if ($folderpath) { $folderpath.='&' };   if ($folderpath) { $folderpath.='&' };
 # Append randompick number, hidden, and encrypted with ":" to foldername,   # Append randompick number, hidden, and encrypted with ":" to foldername,
 # so it gets transferred between levels  # so it gets transferred between levels
  $folderpath.=$folderarg.'&'.$foldername.':'.(&LONCAPA::map::getparameter($orderidx,   $folderpath.=$folderarg.'&'.$foldername.':'.(&LONCAPA::map::getparameter($orderidx,
                                               'parameter_randompick'))[0]                                                'parameter_randompick'))[0]
Line 1934  END Line 1972  END
                                               'parameter_randomorder'))[0]=~/^yes$/i);                                                'parameter_randomorder'))[0]=~/^yes$/i);
  $url.='folderpath='.&escape($folderpath).$cpinfo;   $url.='folderpath='.&escape($folderpath).$cpinfo;
  $parameterset='<label>'.&mt('Randomly Pick: ').   $parameterset='<label>'.&mt('Randomly Pick: ').
     '<input type="text" size="4" onChange="this.form.changeparms.value='."'randompick'".';this.form.submit()" name="randompick_'.$orderidx.'" value="'.      '<input type="text" size="4" onchange="this.form.changeparms.value='."'randompick'".';this.form.submit()" name="randompick_'.$orderidx.'" value="'.
     (&LONCAPA::map::getparameter($orderidx,      (&LONCAPA::map::getparameter($orderidx,
                                               'parameter_randompick'))[0].                                                'parameter_randompick'))[0].
                                               '" />'.                                                '" />'.
Line 1942  END Line 1980  END
     my $ro_set=      my $ro_set=
     ((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':'');      ((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':'');
  $rand_order_text ='   $rand_order_text ='
 <span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" onClick="this.form.changeparms.value=\'randomorder\';this.form.submit()" '.$ro_set.' /> '.&mt('Random Order').' </label></span>';  <span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" onclick="this.form.changeparms.value=\'randomorder\';this.form.submit()" '.$ro_set.' /> '.&mt('Random Order').' </label></span>';
     }      }
     if ($ispage) {      if ($ispage) {
         my $pagename=&escape($pagetitle);          my $pagename=&escape($pagetitle);
Line 1980  END Line 2018  END
        'hd' => 'Hidden',         'hd' => 'Hidden',
        'ec' => 'URL hidden');         'ec' => 'URL hidden');
  my $enctext=   my $enctext=
     ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="1"':'');      ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="checked"':'');
  my $hidtext=   my $hidtext=
     ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':'');      ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="checked"':'');
  $line.=(<<ENDPARMS);   $line.=(<<ENDPARMS);
   <td class="LC_docs_entry_parameter">    <td class="LC_docs_entry_parameter">
     $form_start      $form_start
     <label><input type="checkbox" name="hiddenresource_$orderidx" onClick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label>      <label><input type="checkbox" name="hiddenresource_$orderidx" onclick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label>
     $form_end      $form_end
   </td>    </td>
   <td class="LC_docs_entry_parameter">    <td class="LC_docs_entry_parameter">
     $form_start      $form_start
     <label><input type="checkbox" name="encrypturl_$orderidx" onClick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label>      <label><input type="checkbox" name="encrypturl_$orderidx" onclick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label>
     $form_end      $form_end
   </td>    </td>
   <td class="LC_docs_entry_parameter">$form_start $rand_order_text $form_end</td>    <td class="LC_docs_entry_parameter">$form_start $rand_order_text $form_end</td>
Line 2002  ENDPARMS Line 2040  ENDPARMS
     return $line;      return $line;
 }  }
   
 # ---------------------------------------------------------------- tie the hash  =pod
   
   =item tiehash()
   
   tie the hash
   
   =cut
   
 sub tiehash {  sub tiehash {
     my ($mode)=@_;      my ($mode)=@_;
Line 2019  sub tiehash { Line 2063  sub tiehash {
                 $hashtied=1;                  $hashtied=1;
     }      }
  }   }
     }          }
 }  }
   
 sub untiehash {  sub untiehash {
Line 2028  sub untiehash { Line 2072  sub untiehash {
     return OK;      return OK;
 }  }
   
 # --------------------------------------------------------------- check on this  
   
   
 sub checkonthis {  sub checkonthis {
     my ($r,$url,$level,$title)=@_;      my ($r,$url,$level,$title)=@_;
Line 2067  sub checkonthis { Line 2112  sub checkonthis {
                  if (($errorcount) ||                   if (($errorcount) ||
                      ($warningcount)) {                       ($warningcount)) {
      if ($errorcount) {       if ($errorcount) {
                         $r->print('<img src="/adm/lonMisc/bomb.gif" /><span class="LC_error">'.                          $r->print('<img src="/adm/lonMisc/bomb.gif" alt="'.&mt('bomb').'" /><span class="LC_error">'.
                           &mt('[quant,_1,error]',$errorcount).'</span>');                            &mt('[quant,_1,error]',$errorcount).'</span>');
                      }                       }
      if ($warningcount) {       if ($warningcount) {
Line 2081  sub checkonthis { Line 2126  sub checkonthis {
              }               }
      my $dependencies=       my $dependencies=
                 &Apache::lonnet::metadata($url,'dependencies');                  &Apache::lonnet::metadata($url,'dependencies');
              foreach (split(/\,/,$dependencies)) {               foreach my $dep (split(/\,/,$dependencies)) {
  if (($_=~/^\/res\//) && (!$alreadyseen{$_})) {   if (($dep=~/^\/res\//) && (!$alreadyseen{$dep})) {
                     &checkonthis($r,$_,$level+1);                      &checkonthis($r,$dep,$level+1);
                  }                   }
              }               }
           } elsif ($result eq 'unavailable') {            } elsif ($result eq 'unavailable') {
Line 2092  sub checkonthis { Line 2137  sub checkonthis {
       unless ($url=~/\$/) {        unless ($url=~/\$/) {
   $r->print('<span class="LC_error">'.&mt('not found').'</b></span>');    $r->print('<span class="LC_error">'.&mt('not found').'</b></span>');
       } else {        } else {
   $r->print('<span class="LC_unknown">'.&mt('unable to verify variable URL').'</span>');    $r->print('<span class="LC_error">'.&mt('unable to verify variable URL').'</span>');
       }        }
           } else {            } else {
              $r->print('<span class="LC_error">'.&mt('access denied').'</span>');               $r->print('<span class="LC_error">'.&mt('access denied').'</span>');
Line 2102  sub checkonthis { Line 2147  sub checkonthis {
 }  }
   
   
 #  
 # ----------------------------------------------------------------- List Symbs  =pod
 #   
   =item list_symbs()
   
   List Symbs
   
   =cut
   
 sub list_symbs {  sub list_symbs {
     my ($r) = @_;      my ($r) = @_;
   
       my $type = &Apache::loncommon::course_type();
     $r->print(&Apache::loncommon::start_page('Symb List'));      $r->print(&Apache::loncommon::start_page('Symb List'));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Symb List'));      $r->print(&Apache::lonhtmlcommon::breadcrumbs('Symb List'));
     my $navmap = Apache::lonnavmaps::navmap->new();      my $navmap = Apache::lonnavmaps::navmap->new();
     $r->print("<pre>\n");      if (!defined($navmap)) {
     foreach my $res ($navmap->retrieveResources()) {          $r->print('<h2>'.&mt('Retrieval of List Failed').'</h2>'.
  $r->print($res->compTitle()."\t".$res->symb()."\n");                    '<div class="LC_error">'.
                     &mt('Unable to retrieve information about course contents').
                     '</div>');
           &Apache::lonnet::logthis('Symb list failed - could not create navmap object in '.lc($type).':'.$env{'request.course.id'});
       } else {
           $r->print("<pre>\n");
           foreach my $res ($navmap->retrieveResources()) {
       $r->print($res->compTitle()."\t".$res->symb()."\n");
           }
           $r->print("\n</pre>\n");
     }      }
     $r->print("\n</pre>\n");  
     $r->print('<a href="/adm/coursedocs">'.&mt('Return to DOCS').'</a>');      $r->print('<a href="/adm/coursedocs">'.&mt('Return to DOCS').'</a>');
 }  }
   
   
 #  
 # -------------------------------------------------------------- Verify Content  
 #   
 sub verifycontent {  sub verifycontent {
     my ($r) = @_;      my ($r) = @_;
     my $type = &Apache::loncommon::course_type();      my $type = &Apache::loncommon::course_type();
Line 2134  sub verifycontent { Line 2191  sub verifycontent {
    undef %alreadyseen;     undef %alreadyseen;
    %alreadyseen=();     %alreadyseen=();
    &tiehash();     &tiehash();
    foreach (keys %hash) {     foreach my $key (keys(%hash)) {
        if ($hash{$_}=~/\.(page|sequence)$/) {         if ($hash{$key}=~/\.(page|sequence)$/) {
    if (($_=~/^src_/) && ($alreadyseen{&unescape($hash{$_})})) {     if (($key=~/^src_/) && ($alreadyseen{&unescape($hash{$key})})) {
        $r->print('<hr /><span class="LC_error">'.         $r->print('<hr /><span class="LC_error">'.
  &mt('The following sequence or page is included more than once in your '.$type.': ').   &mt('The following sequence or page is included more than once in your '.$type.': ').
  &unescape($hash{$_}).'</span><br />'.   &unescape($hash{$key}).'</span><br />'.
  &mt('Note that grading records for problems included in this sequence or folder will overlap.<hr />'));   &mt('Note that grading records for problems included in this sequence or folder will overlap.<hr />'));
    }     }
        }         }
        if (($_=~/^src\_(.+)$/) && (!$alreadyseen{&unescape($hash{$_})})) {         if (($key=~/^src\_(.+)$/) && (!$alreadyseen{&unescape($hash{$key})})) {
            &checkonthis($r,$hash{$_},0,$hash{'title_'.$1});             &checkonthis($r,$hash{$key},0,$hash{'title_'.$1});
        }         }
    }     }
    &untiehash();     &untiehash();
Line 2153  sub verifycontent { Line 2210  sub verifycontent {
 }  }
   
   
 # -------------------------------------------------------------- Check Versions  
   
 sub devalidateversioncache {  sub devalidateversioncache {
     my $src=shift;      my $src=shift;
     &Apache::lonnet::devalidate_cache_new('courseresversion',$env{'request.course.id'}.'_'.      &Apache::lonnet::devalidate_cache_new('courseresversion',$env{'request.course.id'}.'_'.
Line 2184  sub checkversions { Line 2239  sub checkversions {
     my %newsetversions=();      my %newsetversions=();
     if ($env{'form.setmostrecent'}) {      if ($env{'form.setmostrecent'}) {
  $haschanged=1;   $haschanged=1;
  foreach (keys %hash) {   foreach my $key (keys(%hash)) {
     if ($_=~/^ids\_(\/res\/.+)$/) {      if ($key=~/^ids\_(\/res\/.+)$/) {
  $newsetversions{$1}='mostrecent';   $newsetversions{$1}='mostrecent';
                 &devalidateversioncache($1);                  &devalidateversioncache($1);
     }      }
  }   }
     } elsif ($env{'form.setcurrent'}) {      } elsif ($env{'form.setcurrent'}) {
  $haschanged=1;   $haschanged=1;
  foreach (keys %hash) {   foreach my $key (keys(%hash)) {
     if ($_=~/^ids\_(\/res\/.+)$/) {      if ($key=~/^ids\_(\/res\/.+)$/) {
  my $getvers=&Apache::lonnet::getversion($1);   my $getvers=&Apache::lonnet::getversion($1);
  if ($getvers>0) {   if ($getvers>0) {
     $newsetversions{$1}=$getvers;      $newsetversions{$1}=$getvers;
Line 2203  sub checkversions { Line 2258  sub checkversions {
  }   }
     } elsif ($env{'form.setversions'}) {      } elsif ($env{'form.setversions'}) {
  $haschanged=1;   $haschanged=1;
  foreach (keys %env) {   foreach my $key (keys(%env)) {
     if ($_=~/^form\.set_version_(.+)$/) {      if ($key=~/^form\.set_version_(.+)$/) {
  my $src=$1;   my $src=$1;
  if (($env{$_}) && ($env{$_} ne $setversions{$src})) {   if (($env{$key}) && ($env{$key} ne $setversions{$src})) {
     $newsetversions{$src}=$env{$_};      $newsetversions{$src}=$env{$key};
     &devalidateversioncache($src);      &devalidateversioncache($src);
  }   }
     }      }
Line 2216  sub checkversions { Line 2271  sub checkversions {
     if ($haschanged) {      if ($haschanged) {
         if (&Apache::lonnet::put('resourceversions',\%newsetversions,          if (&Apache::lonnet::put('resourceversions',\%newsetversions,
   $env{'course.'.$env{'request.course.id'}.'.domain'},    $env{'course.'.$env{'request.course.id'}.'.domain'},
   $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {    $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {
     $r->print('<h1>'.&mt('Your Version Settings have been Saved').'</h1>');      $r->print('<h1>'.&mt('Your Version Settings have been Saved').'</h1>');
  } else {   } else {
     $r->print('<h1><span class="LC_error">'.&mt('An Error Occured while Attempting to Save your Version Settings').'</span></h1>');      $r->print('<h1><span class="LC_error">'.&mt('An Error Occured while Attempting to Save your Version Settings').'</span></h1>');
Line 2228  sub checkversions { Line 2283  sub checkversions {
 # show all documents  # show all documents
  $header=&mt('All Documents in '.$type);   $header=&mt('All Documents in '.$type);
  $allsel=1;   $allsel=1;
  foreach (keys %hash) {   foreach my $key (keys(%hash)) {
     if ($_=~/^ids\_(\/res\/.+)$/) {      if ($key=~/^ids\_(\/res\/.+)$/) {
  my $src=$1;   my $src=$1;
  $changes{$src}=1;   $changes{$src}=1;
     }      }
Line 2239  sub checkversions { Line 2294  sub checkversions {
  %changes=&Apache::lonnet::dump   %changes=&Apache::lonnet::dump
  ('versionupdate',$env{'course.'.$env{'request.course.id'}.'.domain'},   ('versionupdate',$env{'course.'.$env{'request.course.id'}.'.domain'},
                      $env{'course.'.$env{'request.course.id'}.'.num'});                       $env{'course.'.$env{'request.course.id'}.'.num'});
  my $firstkey=(keys %changes)[0];   my $firstkey=(keys(%changes))[0];
  unless ($firstkey=~/^error\:/) {   unless ($firstkey=~/^error\:/) {
     unless ($env{'form.timerange'}) {      unless ($env{'form.timerange'}) {
  $env{'form.timerange'}=604800;   $env{'form.timerange'}=604800;
Line 2303  sub checkversions { Line 2358  sub checkversions {
 <input type="submit" name="setversions" value="$lt{'sv'}" />  <input type="submit" name="setversions" value="$lt{'sv'}" />
 <table border="0">  <table border="0">
 ENDHEADERS  ENDHEADERS
     foreach (sort keys %changes) {      foreach my $key (sort(keys(%changes))) {
  if ($changes{$_}>$starttime) {   if ($changes{$key}>$starttime) {
     my ($root,$extension)=($_=~/^(.*)\.(\w+)$/);      my ($root,$extension)=($key=~/^(.*)\.(\w+)$/);
     my $currentversion=&Apache::lonnet::getversion($_);      my $currentversion=&Apache::lonnet::getversion($key);
     if ($currentversion<0) {      if ($currentversion<0) {
  $currentversion=&mt('Could not be determined.');   $currentversion=&mt('Could not be determined.');
     }      }
     my $linkurl=&Apache::lonnet::clutter($_);      my $linkurl=&Apache::lonnet::clutter($key);
     $r->print(      $r->print(
       '<tr><td colspan="5"><br /><br /><font size="+1"><b>'.        '<tr><td colspan="5"><br /><br /><font size="+1"><b>'.
       &Apache::lonnet::gettitle($linkurl).        &Apache::lonnet::gettitle($linkurl).
Line 2357  ENDHEADERS Line 2412  ENDHEADERS
     $lastold=$prevvers;      $lastold=$prevvers;
  }   }
     }      }
             #               #
             # Code to figure out how many version entries should go in              # Code to figure out how many version entries should go in
             # each of the four columns              # each of the four columns
             my $entries_per_col = 0;              my $entries_per_col = 0;
Line 2368  ENDHEADERS Line 2423  ENDHEADERS
                 $entries_per_col = $num_entries/4 + 1;                  $entries_per_col = $num_entries/4 + 1;
             }              }
             my $entries_count = 0;              my $entries_count = 0;
             $r->print('<td valign="top"><font size="-2">');               $r->print('<td valign="top"><font size="-2">');
             my $cols_output = 1;              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;
Line 2447  sub changewarning { Line 2502  sub changewarning {
  $message='Changes will become active for your current session after [_1], or the next time you log in.';   $message='Changes will become active for your current session after [_1], or the next time you log in.';
     }      }
     $r->print("\n\n".      $r->print("\n\n".
 '<script type="text/javascript">function reinit(tf) { tf.submit();'.$postexec.' }</script>'."\n".   '<script type="text/javascript">'."\n".
   '// <![CDATA['."\n".
   'function reinit(tf) { tf.submit();'.$postexec.' }'."\n".
   '// ]]>'."\n".
   '</script>'."\n".
 '<form name="reinitform" method="post" action="/adm/roles" target="loncapaclient">'.  '<form name="reinitform" method="post" action="/adm/roles" target="loncapaclient">'.
 '<input type="hidden" name="orgurl" value="'.$url.  '<input type="hidden" name="orgurl" value="'.$url.
 '" /><input type="hidden" name="selectrole" value="1" /><h3><span class="LC_warning">'.  '" /><input type="hidden" name="selectrole" value="1" /><p class="LC_warning">'.
 &mt($message,' <input type="hidden" name="'.  &mt($message,' <input type="hidden" name="'.
     $env{'request.role'}.'" value="1" /><input type="button" value="'.      $env{'request.role'}.'" value="1" /><input type="button" value="'.
     &mt('re-initializing '.$course_type).'" onClick="reinit(this.form)" />').      &mt('re-initializing '.$course_type).'" onclick="reinit(this.form)" />').
 $help{'Caching'}.'</span></h3></form>'."\n\n");  $help{'Caching'}.'</p></form>'."\n\n");
 }  }
   
 # =========================================== Breadcrumbs for special functions  
   
 sub init_breadcrumbs {  sub init_breadcrumbs {
     my ($form,$text)=@_;      my ($form,$text)=@_;
Line 2473  sub init_breadcrumbs { Line 2531  sub init_breadcrumbs {
     bug=>'Instructor Interface'});      bug=>'Instructor Interface'});
 }  }
   
 # ================================================================ Main Handler  
   
   
 sub handler {  sub handler {
     my $r = shift;      my $r = shift;
     &Apache::loncommon::content_type($r,'text/html');      &Apache::loncommon::content_type($r,'text/html');
Line 2481  sub handler { Line 2541  sub handler {
     return OK if $r->header_only;      return OK if $r->header_only;
     my $type = &Apache::loncommon::course_type();      my $type = &Apache::loncommon::course_type();
   
   
 # --------------------------------------------- Initialize help topics for this  # --------------------------------------------- Initialize help topics for this
     foreach ('Adding_Course_Doc','Main_Course_Documents',      foreach my $topic ('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','Adding_Pages',                 'Supplemental','Score_Upload_Form','Adding_Pages',
      'Importing_LON-CAPA_Resource','Uploading_From_Harddrive',                 'Importing_LON-CAPA_Resource','Uploading_From_Harddrive',
      'Check_Resource_Versions','Verify_Content') {                 'Check_Resource_Versions','Verify_Content') {
  $help{$_}=&Apache::loncommon::help_open_topic('Docs_'.$_);   $help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic);
     }      }
     # Composite help files      # Composite help files
     $help{'Syllabus'} = &Apache::loncommon::help_open_topic(      $help{'Syllabus'} = &Apache::loncommon::help_open_topic(
Line 2499  sub handler { Line 2560  sub handler {
     'Option_Response_Simple');      'Option_Response_Simple');
     $help{'Bulletin Board'} = &Apache::loncommon::help_open_topic(      $help{'Bulletin Board'} = &Apache::loncommon::help_open_topic(
     'Docs_About_Bulletin_Board,Docs_Editing_Templated_Pages');      'Docs_About_Bulletin_Board,Docs_Editing_Templated_Pages');
     $help{'My Personal Info'} = &Apache::loncommon::help_open_topic(      $help{'My Personal Information Page'} = &Apache::loncommon::help_open_topic(
   'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages');    'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages');
     $help{'Group Files'} = &Apache::loncommon::help_open_topic('Docs_About_Group_Files');      $help{'Group Portfolio'} = &Apache::loncommon::help_open_topic('Docs_About_Group_Files');
     $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching');      $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching');
   
 # does this user have privileges to modify docs  # does this user have privileges to modify docs
Line 2534  sub handler { Line 2595  sub handler {
     my $showdoc=0;      my $showdoc=0;
     my $containertag;      my $containertag;
     my $uploadtag;      my $uploadtag;
   
   
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
     ['folderpath','pagepath',      ['folderpath','pagepath',
      'pagesymb']);       'pagesymb']);
Line 2575  sub handler { Line 2638  sub handler {
        $showdoc='/'.$1;         $showdoc='/'.$1;
     }      }
     unless ($showdoc) { # got called from remote      unless ($showdoc) { # got called from remote
        if (($env{'form.folder'}=~/^(?:group|default)_/) ||          if (($env{'form.folder'}=~/^(?:group|default)_/) ||
           ($env{'form.folder'} =~ m:^\d+/(pages|sequences)/:)) {            ($env{'form.folder'} =~ m:^\d+/(pages|sequences)/:)) {
            $forcestandard = 1;             $forcestandard = 1;
        }          }
        $forcesupplement=($env{'form.folder'}=~/^supplemental_/);         $forcesupplement=($env{'form.folder'}=~/^supplemental_/);
   
        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('simple');
        }         }
     } else { # got called in sequence from course      } else { # got called in sequence from course
        $allowed=0;         $allowed=0;
Line 2593  sub handler { Line 2656  sub handler {
     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   # get personal data
     my $uname=$env{'user.name'};      my $uname=$env{'user.name'};
     my $udom=$env{'user.domain'};      my $udom=$env{'user.domain'};
     my $plainname=&escape(&Apache::loncommon::plainname($uname,$udom));      my $plainname=&escape(&Apache::loncommon::plainname($uname,$udom));
Line 2606  sub handler { Line 2669  sub handler {
  $script .= &editing_js($udom,$uname);   $script .= &editing_js($udom,$uname);
     }      }
 # -------------------------------------------------------------------- Body tag  # -------------------------------------------------------------------- Body tag
     $script = '<script type="text/javascript">'."\n".$script."\n".'</script>';      $script = '<script type="text/javascript">'."\n"
                 .'// <![CDATA['."\n"
                 .$script."\n"
                 .'// ]]>'."\n"
                 .'</script>'."\n";
       my $brcrum = [{href=>"/adm/createuser",text=>"$type Documents"}];
     $r->print(&Apache::loncommon::start_page("$type Documents", $script,      $r->print(&Apache::loncommon::start_page("$type Documents", $script,
      {'force_register' => $showdoc,}).      {'force_register' => $showdoc,
                                        'bread_crumbs' => $brcrum}).
       &Apache::loncommon::help_open_menu('','',273,'RAT'));        &Apache::loncommon::help_open_menu('','',273,'RAT'));
     
   my %allfiles = ();    my %allfiles = ();
   my %codebase = ();    my %codebase = ();
   my ($upload_result,$upload_output);    my ($upload_result,$upload_output);
   if ($allowed) {    if ($allowed) {
       if (($env{'form.uploaddoc.filename'}) &&        if (($env{'form.uploaddoc.filename'}) &&
   ($env{'form.cmd'}=~/^upload_(\w+)/)) {    ($env{'form.cmd'}=~/^upload_(\w+)/)) {
 # Process file upload - phase one - upload and parse primary file.    # Process file upload - phase one - upload and parse primary file.
   undef($hadchanges);    undef($hadchanges);
           $upload_result = &process_file_upload(\$upload_output,$coursenum,            $upload_result = &process_file_upload(\$upload_output,$coursenum,
  $coursedom,\%allfiles,   $coursedom,\%allfiles,
Line 2642  sub handler { Line 2711  sub handler {
                   $newname{$i} = &process_secondary_uploads(\$upload_output,$coursedom,$coursenum,'embedded_item_',$i,$residx);                    $newname{$i} = &process_secondary_uploads(\$upload_output,$coursedom,$coursenum,'embedded_item_',$i,$residx);
                   $origname{$i} = &unescape($env{'form.embedded_orig_'.$i});                    $origname{$i} = &unescape($env{'form.embedded_orig_'.$i});
                   if (exists($env{'form.embedded_codebase_'.$i})) {                    if (exists($env{'form.embedded_codebase_'.$i})) {
                       $javacodebase =  &unescape($env{'form.embedded_codebase_'.$i});                          $javacodebase =  &unescape($env{'form.embedded_codebase_'.$i});
                       $origname{$i} =~ s#^\Q$javacodebase\E/##;                         $origname{$i} =~ s#^\Q$javacodebase\E/##;
                   }                    }
                   my @attributes = ();                    my @attributes = ();
                   if ($env{'form.embedded_attrib_'.$i} =~ /:/) {                    if ($env{'form.embedded_attrib_'.$i} =~ /:/) {
                       @attributes = split/:/,$env{'form.embedded_attrib_'.$i};                        @attributes = split(/:/,$env{'form.embedded_attrib_'.$i});
                   } else {                    } else {
                       @attributes = ($env{'form.embedded_attrib_'.$i});                        @attributes = ($env{'form.embedded_attrib_'.$i});
                   }                    }
                   foreach (@attributes) {                    foreach my $attr (@attributes) {
                       push(@{$attribs{$i}},&unescape($_));                        push(@{$attribs{$i}},&unescape($attr));
                   }                    }
                   if ($javacodebase) {                    if ($javacodebase) {
                       $codebase{$i} = $javacodebase;                        $codebase{$i} = $javacodebase;
Line 2670  sub handler { Line 2739  sub handler {
               my $updateflag = 0;                my $updateflag = 0;
               my $getstatus = &Apache::lonnet::getuploaded('GET',$primary_url,$coursedom,$coursenum,\$content,\$rtncode);                my $getstatus = &Apache::lonnet::getuploaded('GET',$primary_url,$coursedom,$coursenum,\$content,\$rtncode);
               if ($getstatus eq 'ok') {                if ($getstatus eq 'ok') {
                   foreach my $item (keys %newname) {                    foreach my $item (keys(%newname)) {
                       if ($newname{$item} ne $origname{$item}) {                        if ($newname{$item} ne $origname{$item}) {
                           my $attrib_regexp = '';                            my $attrib_regexp = '';
                           if (@{$attribs{$item}} > 1) {                            if (@{$attribs{$item}} > 1) {
Line 2679  sub handler { Line 2748  sub handler {
                               $attrib_regexp = $attribs{$item}[0];                                $attrib_regexp = $attribs{$item}[0];
                           }                            }
                           if ($content =~ m#($attrib_regexp\s*=\s*['"]?)\Q$origname{$item}\E(['"]?)#) {                            if ($content =~ m#($attrib_regexp\s*=\s*['"]?)\Q$origname{$item}\E(['"]?)#) {
                           }                             }
                           $content =~ s#($attrib_regexp\s*=\s*['"]?)\Q$origname{$item}\E(['"]?)#$1$newname{$item}$2#gi;                             $content =~ s#($attrib_regexp\s*=\s*['"]?)\Q$origname{$item}\E(['"]?)#$1$newname{$item}$2#gi;
                       }                        }
                       if (exists($codebase{$item})) {                        if (exists($codebase{$item})) {
                           $content =~ s/(codebase\s*=\s*["']?)\Q$codebase{$item}\E(["']?)/$1.$2/i; #' stupid emacs                            $content =~ s/(codebase\s*=\s*["']?)\Q$codebase{$item}\E(["']?)/$1.$2/i; #' stupid emacs
Line 2692  sub handler { Line 2761  sub handler {
                   my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};                    my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
                   my $url = &Apache::lonnet::store_edited_file($primary_url,$content,$docudom,$docuname,\$saveresult);                    my $url = &Apache::lonnet::store_edited_file($primary_url,$content,$docudom,$docuname,\$saveresult);
               } else {                } else {
                   &Apache::lonnet::logthis('retrieval of uploaded file - '.$primary_url.' - for editing, failed: '.$getstatus);                     &Apache::lonnet::logthis('retrieval of uploaded file - '.$primary_url.' - for editing, failed: '.$getstatus);
               }                }
           }            }
       }        }
Line 2704  sub handler { Line 2773  sub handler {
                 'uplm' => 'Upload a new main '.lc($type).' document',                  'uplm' => 'Upload a new main '.lc($type).' document',
                 'upls' => 'Upload a new supplemental '.lc($type).' document',                  'upls' => 'Upload a new supplemental '.lc($type).' document',
                 'impp' => 'Import a document',                  'impp' => 'Import a document',
                 'pubd' => 'Published documents',                  'pubd' => 'Published Documents',
  'copm' => 'All documents out of a published map into this folder',   'copm' => 'All documents out of a published map into this folder',
                 'spec' => 'Special documents',  
                 'upld' => 'Upload Document',                  'upld' => 'Upload Document',
                 'srch' => 'Search',                  'srch' => 'Search',
                 'impo' => 'Import',                  'impo' => 'Import',
Line 2719  sub handler { Line 2787  sub handler {
                 'extr' => 'External Resource',                  'extr' => 'External Resource',
                 'syll' => 'Syllabus',                  'syll' => 'Syllabus',
                 'navc' => 'Navigate Contents',                  'navc' => 'Navigate Contents',
                 'sipa' => 'Simple Page',                  'sipa' => 'Simple Course Page',
                 'sipr' => 'Simple Problem',                  'sipr' => 'Simple Problem',
                 'drbx' => 'Drop Box',                  'drbx' => 'Drop Box',
                 'scuf' => 'Score Upload Form',                  'scuf' => 'Score Upload Form',
                 'bull' => 'Bulletin Board',                  'bull' => 'Discussion Board',
                 'mypi' => 'My Personal Info',                  'mypi' => 'My Personal Information Page',
                 'grpo' => 'Group Files',                  'grpo' => 'Group Portfolio',
                 'rost' => 'Course Roster',                  'rost' => 'Course Roster',
  'abou' => 'About User',   'abou' => 'Personal Information Page for a User',
                 'imsf' => 'Import IMS package',                  'imsf' => 'Import IMS package',
                 'file' =>  'File',                  'file' =>  'File',
                 'title' => 'Title',                  'title' => 'Title',
                 'comment' => 'Comment',                  'comment' => 'Comment',
                 'parse' => 'If HTML file, upload embedded images/multimedia files'                  'parse' => 'Upload embedded images/multimedia files if HTML file!',
    'nd' => 'Upload Document',
    'pm' => 'Published Map',
    'sd' => 'Special Document',
    'mo' => 'More Options',
    'hao' => 'Hide all Options'
   );    );
 # -----------------------------------------------------------------------------  # -----------------------------------------------------------------------------
    my $fileupload=(<<FIUP);
    $lt{'file'}:<br />
    <input type="file" name="uploaddoc" size="40" />
   FIUP
   
    my $checkbox=(<<CHBO);
    <!-- <label>$lt{'parse'}?
    <input type="checkbox" name="parserflag" />
    </label> -->
    <label>
    <input type="checkbox" name="parserflag" checked="checked" /> $lt{'parse'}
    </label>
   CHBO
   
    my $fileuploadform=(<<FUFORM);
    <form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
    <input type="hidden" name="active" value="aa" />
    $fileupload
    <br />
    $lt{'title'}:<br />
    <input type="text" size="50" name="comment" />
    $uploadtag
    <input type="hidden" name="cmd" value="upload_default" />
    <br />
    <span class="LC_nobreak">
    $checkbox
    </span>
    <br />
    <br />
    <span class="LC_nobreak">
    <input type="submit" value="$lt{'upld'}" />
    $help{'Uploading_From_Harddrive'}
    </span>
    </form>
   FUFORM
   
    my $simpleeditdefaultform=(<<SEDFFORM);
    <form action="/adm/coursedocs" method="post" name="simpleeditdefault">
    <input type="hidden" name="active" value="bb" />
    $lt{'pubd'}<br />
    $uploadtag
    <input type="button" onclick="javascript:groupsearch()" value="$lt{'srch'}" />
    <br />
    <span class="LC_nobreak">
    <input type="button" onclick="javascript:groupimport();" value="$lt{'impo'}" />
    $help{'Importing_LON-CAPA_Resource'}
    </span>
    <br />
    <input type="button" onclick="javascript:groupopen(0,1,1);" value="$lt{'book'}" />
    <hr />
    <p>
    $lt{'copm'}<br />
    <input type="text" size="40" name="importmap" /><br />
    <span class="LC_nobreak"><input type="button"
    onclick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
    value="$lt{'selm'}" /> <input type="submit" name="loadmap" value="$lt{'load'}" />
    $help{'Load_Map'}</span>
    </p>
    </form>
   SEDFFORM
   
    my $extresourcesform=(<<ERFORM);
    <form action="/adm/coursedocs" method="post" name="newext">
    $uploadtag
    <input type="hidden" name="importdetail" value="" />
    <span class="LC_nobreak">
    <input name="newext" type="button" onclick="javascript:makenewext('newext');"
    value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
    </span>
    </form>
   ERFORM
   
     if ($allowed) {      if ($allowed) {
  &update_paste_buffer($coursenum,$coursedom);   &update_paste_buffer($coursenum,$coursedom);
        my $dumpbut=&dumpbutton();  
        my $exportbut=&exportbutton();  
        my %lt=&Apache::lonlocal::texthash(         my %lt=&Apache::lonlocal::texthash(
  'vc' => 'Verify Content',   'vc' => 'Verify Content',
  'cv' => 'Check/Set Resource Versions',   'cv' => 'Check/Set Resource Versions',
Line 2758  sub handler { Line 2901  sub handler {
            $containertag = '<input type="hidden" name="folderpath" value="" />';             $containertag = '<input type="hidden" name="folderpath" value="" />';
            $uploadtag = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';             $uploadtag = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
        }         }
    $r->print(<<HIDDENFORM);
        $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="markcopy" />
   <input type="hidden" name="markcopy" />     <input type="hidden" name="copyfolder" />
   <input type="hidden" name="copyfolder" />     $containertag
   $containertag   </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="" />     $uploadtag
   $uploadtag   </form>
 </form>  HIDDENFORM
 <form action="/adm/coursedocs" method="post" name="courseverify">      }
   <div class="LC_docs_course_commands">  # --------------------------------------------------------- Main tab structure
       my $activeClass = 1;
       <div>      my $active = '';
         <input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}      $r->print('<ul class="LC_TabContentBigger" id="mainnav">');
       </div>      if (($standard) && ($allowed) && (!$forcesupplement) && (($env{'form.folderpath'}=~/^default/) || ($env{'form.pagepath'}))) {
       <div>          if($activeClass == 1){
         <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}             $active = 'class="active"';
       </div>     $activeClass = 0;
         $dumpbut   }
         $exportbut      }
       <div>      $r->print('<li '.$active.' onclick="javascript:showPage(this,\'mainCourseDocuments\',\'mainnav\',\'maincoursedoc\');">'.&mt('Main Course Documents').'</li>');
         <input type="submit" name="listsymbs" value="$lt{'ls'}" />      $active = '';
       </div>      if (!$forcestandard || ($env{'form.folderpath'}=~/^supplemental/)) {
       <div>          if($activeClass == 1){
         <input type="hidden" name="folder" value="$env{'form.folder'}" />             $active = 'class="active"';
         <input type="submit" name="docslog" value="$lt{'sl'}" />          }
       </div>      }
   </div>      $r->print('<li '.$active.' onclick="javascript:showPage(this,\'supplCourseDocuments\',\'mainnav\',\'maincoursedoc\');">'.&mt('Supplemental Course Documents').'</li>');
 </form>      $r->print('</ul>'
 <div style="clear: both; height: 0px;">&nbsp;</div>               .'<div class="LC_Box" style="clear:both;margin:0;">'
 ENDCOURSEVERIFY               .'<div id="maincoursedoc" style="margin:0 0;padding:0 0;">');
        $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',  
      &mt('Editing the Table of Contents for your '.$type)));  
     }  
 # --------------------------------------------------------- Standard documents  # --------------------------------------------------------- Standard documents
     $r->print('<table class="LC_docs_documents">');         my $savefolderpath;
          my $active = 'style="display: none;"';
     if (($standard) && ($allowed) && (!$forcesupplement)) {         if($activeClass == 0){
  $r->print('<tr><td class="LC_docs_document">');            $active = 'style="display: block;"';
 #  '<h2>'.&mt('Main Course Documents').         }
 #  ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');         $r->print('<div class="LC_ContentBox" id="mainCourseDocuments" '.$active.'>');
        my $folder=$env{'form.folder'};         my $folder=$env{'form.folder'};
        if ($folder eq '' || $folder eq 'supplemental') {         if ($folder eq '' || $folder=~/^supplemental/) {
            $folder='default';             $folder='default';
      $savefolderpath = $env{'form.folderpath'};
    $env{'form.folderpath'}='default&'.&escape(&mt('Main '.$type.' Documents'));     $env{'form.folderpath'}='default&'.&escape(&mt('Main '.$type.' Documents'));
            $uploadtag = '<input type="hidden" name="folderpath" value="'.             $uploadtag = '<input type="hidden" name="folderpath" value="'.
        &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';         &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
        }         }
        my $postexec='';         my $postexec='';
        if ($folder eq 'default') {         if ($folder eq 'default') {
    $r->print('<script type="text/javascript">this.window.name="loncapaclient";</script>');             $r->print('<script type="text/javascript">'."\n"
                       .'// <![CDATA['."\n"
                       .'this.window.name="loncapaclient";'."\n"
                       .'// ]]>'."\n"
                       .'</script>'."\n"
          );
        } else {         } else {
            #$postexec='self.close();';             #$postexec='self.close();';
        }         }
        $hadchanges=0;  
        my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,  
    $upload_output,$type);  
        if ($error) {  
    $r->print('<p><span class="LC_error">'.$error.'</span></p>');  
        }  
        if ($hadchanges) {  
    &mark_hash_old()  
        }  
        &changewarning($r,$postexec);  
        my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.         my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
                      '.sequence';                       '.sequence';
        my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.         my $pageseq = '/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
Line 2835  ENDCOURSEVERIFY Line 2971  ENDCOURSEVERIFY
     $container='page';      $container='page';
  }   }
  my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container;   my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container;
        $r->print(<<ENDFORM);  
 <table class="LC_docs_adddocs">  
 <tr>  
 <th>$lt{'uplm'}</th>   my $recoverform=(<<RFORM);
 <th>$lt{'impp'}</th>   <form action="/adm/groupsort" method="post" name="recover">
 <th>$lt{'spec'}</th>   <input type="button" name="recovermap" onclick="javascript:groupopen('$readfile',1,0)" value="$lt{'reco'}" />
 </tr>   </form>
 <tr>  RFORM
 <td>  
 $lt{'file'}:<br />   my $imspform=(<<IMSPFORM);
 <form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">   <form action="/adm/imsimportdocs" method="post" name="ims">
 <input type="file" name="uploaddoc" size="40" />   <input type="hidden" name="folder" value="$folder" />
 <br />   <input name="imsimport" type="button" value="$lt{'imsf'}" onclick="javascript:makeims();" />
 $lt{'title'}:<br />   </form>
 <input type="text" size="50" name="comment" />  IMSPFORM
 $uploadtag  
 <input type="hidden" name="cmd" value="upload_default" />   my $newnavform=(<<NNFORM);
 <br />   <form action="/adm/coursedocs" method="post" name="newnav">
 <span class="LC_nobreak">   <input type="hidden" name="active" value="cc" />
 <label>$lt{'parse'}?   $uploadtag
 <input type="checkbox" name="parserflag" checked="checked" />   <input type="hidden" name="importdetail" 
 </label>   value="$lt{'navc'}=/adm/navmaps" />
 </span>   <span class="LC_nobreak">
 <br />   <input name="newnav" type="submit" value="$lt{'navc'}" />
 <br />   $help{'Navigate_Content'}
 <span class="LC_nobreak">   </span>
 <input type="submit" value="$lt{'upld'}" />   </form>
  $help{'Uploading_From_Harddrive'}  NNFORM
 </span>   my $newsmppageform=(<<NSPFORM);
 </form>   <form action="/adm/coursedocs" method="post" name="newsmppg">
 </td>   <input type="hidden" name="active" value="cc" />
 <td>   $uploadtag
 <form action="/adm/coursedocs" method="post" name="simpleeditdefault">   <input type="hidden" name="importdetail" value="" />
 $lt{'pubd'}<br />   <span class="LC_nobreak">
 $uploadtag   <input name="newsmppg" type="button" value="$lt{'sipa'}"
 <input type="button" onClick="javascript:groupsearch()" value="$lt{'srch'}" />   onclick="javascript:makesmppage();" /> $help{'Simple Page'}
 <br />   </span>
 <span class="LC_nobreak">   </form>
 <input type="button" onClick="javascript:groupimport();" value="$lt{'impo'}" />  NSPFORM
 $help{'Importing_LON-CAPA_Resource'}  
 </span>   my $newsmpproblemform=(<<NSPROBFORM);
 <br />   <form action="/adm/coursedocs" method="post" name="newsmpproblem">
 <input type="button" onClick="javascript:groupopen(0,1,1);" value="$lt{'book'}" />   <input type="hidden" name="active" value="cc" />
 <hr />   $uploadtag
 <p>   <input type="hidden" name="importdetail" value="" />
 $lt{'copm'}<br />   <span class="LC_nobreak">
 <input type="text" size="40" name="importmap" /><br />   <input name="newsmpproblem" type="button" value="$lt{'sipr'}"
 <span class="LC_nobreak"><input type="button"    onclick="javascript:makesmpproblem();" />$help{'Simple Problem'}
 onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"   </span>
 value="$lt{'selm'}" /> <input type="submit" name="loadmap" value="$lt{'load'}" />   </form>
 $help{'Load_Map'}</span>  
 </p>  NSPROBFORM
 </form>  
 <hr />   my $newdropboxform=(<<NDBFORM);
 <form action="/adm/groupsort" method="post" name="recover">   <form action="/adm/coursedocs" method="post" name="newdropbox">
 <input type="button" name="recovermap" onClick="javascript:groupopen('$readfile',1,0)" value="$lt{'reco'}" />   <input type="hidden" name="active" value="cc" />
 </form>   $uploadtag
 ENDFORM   <input type="hidden" name="importdetail" value="" />
        unless ($env{'form.pagepath'}) {   <span class="LC_nobreak">
    $r->print(<<ENDFORM);   <input name="newdropbox" type="button" value="$lt{'drbx'}"
 <hr />   onclick="javascript:makedropbox();" />
 <form action="/adm/coursedocs" method="post" name="newext">   </span>
 $uploadtag   </form>
 <input type="hidden" name="importdetail" value="" />  NDBFORM
 <span class="LC_nobreak">  
 <input name="newext" type="button" onClick="javascript:makenewext('newext');"   my $newexuploadform=(<<NEXUFORM);
 value="$lt{'extr'}" /> $help{'Adding_External_Resource'}   <form action="/adm/coursedocs" method="post" name="newexamupload">
 </span>   <input type="hidden" name="active" value="cc" />
 </form>   $uploadtag
 <br /><form action="/adm/imsimportdocs" method="post" name="ims">   <input type="hidden" name="importdetail" value="" />
 <input type="hidden" name="folder" value="$folder" />   <span class="LC_nobreak">
 <input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />   <input name="newexamupload" type="button" value="$lt{'scuf'}"
 </form>   onclick="javascript:makeexamupload();" />
 ENDFORM   $help{'Score_Upload_Form'}
        }   </span>
        $r->print('</td><td>');   </form>
   NEXUFORM
   
    my $newbulform=(<<NBFORM);
    <form action="/adm/coursedocs" method="post" name="newbul">
    <input type="hidden" name="active" value="cc" />
    $uploadtag
    <input type="hidden" name="importdetail" value="" />
    <span class="LC_nobreak">
    <input name="newbulletin" type="button" value="$lt{'bull'}"
    onclick="javascript:makebulboard();" />
    $help{'Bulletin Board'}
    </span>
    </form>
   NBFORM
   
    my $newaboutmeform=(<<NAMFORM);
    <form action="/adm/coursedocs" method="post" name="newaboutme">
    <input type="hidden" name="active" value="cc" />
    $uploadtag
    <input type="hidden" name="importdetail" 
    value="$plainname=/adm/$udom/$uname/aboutme" />
    <span class="LC_nobreak">
    <input name="newaboutme" type="submit" value="$lt{'mypi'}" />
    $help{'My Personal Information Page'}
    </span>
    </form>
   NAMFORM
   
    my $newaboutsomeoneform=(<<NASOFORM);
    <form action="/adm/coursedocs" method="post" name="newaboutsomeone">
    <input type="hidden" name="active" value="cc" />
    $uploadtag
    <input type="hidden" name="importdetail" value="" />
    <span class="LC_nobreak">
    <input name="newaboutsomeone" type="button" value="$lt{'abou'}" 
    onclick="javascript:makeabout();" />
    </span>
    </form>
   NASOFORM
   
   
    my $newrosterform=(<<NROSTFORM);
    <form action="/adm/coursedocs" method="post" name="newroster">
    <input type="hidden" name="active" value="cc" />
    $uploadtag
    <input type="hidden" name="importdetail" 
    value="$lt{'rost'}=/adm/viewclasslist" />
    <span class="LC_nobreak">
    <input name="newroster" type="submit" value="$lt{'rost'}" />
    $help{'Course Roster'}
    </span>
    </form>
   NROSTFORM
   
   my $specialdocumentsform;
   my $newfolderform;
   
        unless ($env{'form.pagepath'}) {         unless ($env{'form.pagepath'}) {
    my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');     my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
            $r->print(<<ENDFORM);  
 <br /><form action="/adm/coursedocs" method="post" name="newfolder">   my $newpageform=(<<NPFORM);
 <input type="hidden" name="folderpath" value="$path" />   <form action="/adm/coursedocs" method="post" name="newpage">
 <input type="hidden" name="importdetail" value="" />   <input type="hidden" name="folderpath" value="$path" />
 <span class="LC_nobreak">   <input type="hidden" name="importdetail" value="" />
 <input name="newfolder" type="button"   <input type="hidden" name="active" value="cc" />
 onClick="javascript:makenewfolder(this.form,'$folderseq');"   <span class="LC_nobreak">
 value="$lt{'newf'}" />$help{'Adding_Folders'}   <input name="newpage" type="button"
 </span>   onclick="javascript:makenewpage(this.form,'$pageseq');"
 </form>   value="$lt{'newp'}" />$help{'Adding_Pages'}
 <br /><form action="/adm/coursedocs" method="post" name="newpage">   </span>
 <input type="hidden" name="folderpath" value="$path" />   </form>
 <input type="hidden" name="importdetail" value="" />  NPFORM
 <span class="LC_nobreak">  
 <input name="newpage" type="button"   $newfolderform=(<<NFFORM);
 onClick="javascript:makenewpage(this.form,'$pageseq');"   <form action="/adm/coursedocs" method="post" name="newfolder">
 value="$lt{'newp'}" />$help{'Adding_Pages'}   <input type="hidden" name="folderpath" value="$path" />
 </span>   <input type="hidden" name="importdetail" value="" />
 </form>   <input type="hidden" name="active" value="aa" />
 <br /><form action="/adm/coursedocs" method="post" name="newsyl">   <span class="LC_nobreak">
 $uploadtag   <input name="newfolder" type="button"
 <input type="hidden" name="importdetail"    onclick="javascript:makenewfolder(this.form,'$folderseq');"
 value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" />   value="$lt{'newf'}" />$help{'Adding_Folders'}
 <span class="LC_nobreak">   </span>
 <input name="newsyl" type="submit" value="$lt{'syll'}" />    </form>
  $help{'Syllabus'}  NFFORM
 </span>  
 </form>   my $newsylform=(<<NSYLFORM);
 <br /><form action="/adm/coursedocs" method="post" name="newnav">   <form action="/adm/coursedocs" method="post" name="newsyl">
 $uploadtag   <input type="hidden" name="active" value="cc" />
 <input type="hidden" name="importdetail"    $uploadtag
 value="$lt{'navc'}=/adm/navmaps" />   <input type="hidden" name="importdetail" 
 <span class="LC_nobreak">   value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" />
 <input name="newnav" type="submit" value="$lt{'navc'}" />   <span class="LC_nobreak">
 $help{'Navigate_Content'}   <input name="newsyl" type="submit" value="$lt{'syll'}" /> 
 </span>   $help{'Syllabus'}
 </form>   </span>
 <br /><form action="/adm/coursedocs" method="post" name="newsmppg">   </form>
 $uploadtag  NSYLFORM
 <input type="hidden" name="importdetail" value="" />  
 <span class="LC_nobreak">   my $newgroupfileform=(<<NGFFORM);
 <input name="newsmppg" type="button" value="$lt{'sipa'}"   <form action="/adm/coursedocs" method="post" name="newgroupfiles">
 onClick="javascript:makesmppage();" /> $help{'Simple Page'}   <input type="hidden" name="active" value="cc" />
 </span>   $uploadtag
 </form>   <input type="hidden" name="importdetail"
 <br /><form action="/adm/coursedocs" method="post" name="newsmpproblem">   value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />
 $uploadtag   <span class="LC_nobreak">
 <input type="hidden" name="importdetail" value="" />   <input name="newgroupfiles" type="submit" value="$lt{'grpo'}" />
 <span class="LC_nobreak">   $help{'Group Portfolio'}
 <input name="newsmpproblem" type="button" value="$lt{'sipr'}"   </span>
 onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}   </form>
 </span>  NGFFORM
 </form>  
 <br /><form action="/adm/coursedocs" method="post" name="newdropbox">   $specialdocumentsform="<br />$newpageform<br />$newsylform<br />$newgroupfileform";
 $uploadtag              }
 <input type="hidden" name="importdetail" value="" />   $specialdocumentsform.="<br />$newnavform<br />$newsmppageform
 <span class="LC_nobreak">             <br />$newsmpproblemform<br />$newdropboxform
 <input name="newdropbox" type="button" value="$lt{'drbx'}"          <br />$newexuploadform<br />$newbulform
 onClick="javascript:makedropbox();" />          <br />$newaboutmeform<br />$newaboutsomeoneform
 </span>                   <br />$newrosterform";
 </form>   if($env{'form.pagepath'}) {
 <br /><form action="/adm/coursedocs" method="post" name="newexamupload">   $specialdocumentsform="<br />$newsmpproblemform<br />$newexuploadform";
 $uploadtag  }
 <input type="hidden" name="importdetail" value="" />  
 <span class="LC_nobreak">  my %orderhash = (
 <input name="newexamupload" type="button" value="$lt{'scuf'}"                  'aa' => ['Upload Document',$fileuploadform.'<br />'.$newfolderform],
 onClick="javascript:makeexamupload();" />                  'bb' => ['Published Documents',$simpleeditdefaultform],
 $help{'Score_Upload_Form'}                  'cc' => ['Special Documents',$specialdocumentsform],
 </span>   'dd' => ['Tools',$extresourcesform.'<br />'.$imspform.'<br />'.$recoverform.'<br />'.&generate_admin_options($containertag,$uploadtag,\%help,\%env)],
 </form>                  'zz' => ['Hide all Options'],
 <br /><form action="/adm/coursedocs" method="post" name="newbul">                  );
 $uploadtag  my $tid='1';
 <input type="hidden" name="importdetail" value="" />  my $varcd = 'Main Course Documents';
 <span class="LC_nobreak">  $r->print(&generate_edit_table($tid,$varcd,\%orderhash));
 <input name="newbulletin" type="button" value="$lt{'bull'}"   $hadchanges=0;
 onClick="javascript:makebulboard();" />          my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
 $help{'Bulletin Board'}         if ($error) {
 </span>             $r->print('<p><span class="LC_error">'.$error.'</span></p>');
 </form>         }
 <br /><form action="/adm/coursedocs" method="post" name="newaboutme">         if ($hadchanges) {
 $uploadtag             &mark_hash_old();
 <input type="hidden" name="importdetail"   
 value="$plainname=/adm/$udom/$uname/aboutme" />  
 <span class="LC_nobreak">  
 <input name="newaboutme" type="submit" value="$lt{'mypi'}" />  
 $help{'My Personal Info'}  
 </span>  
 </form>  
 <br /><form action="/adm/coursedocs" method="post" name="newaboutsomeone">  
 $uploadtag  
 <input type="hidden" name="importdetail" value="" />  
 <span class="LC_nobreak">  
 <input name="newaboutsomeone" type="button" value="$lt{'abou'}"   
 onClick="javascript:makeabout();" />  
 </span>  
 </form>  
 <br /><form action="/adm/coursedocs" method="post" name="newgroupfiles">  
 $uploadtag  
 <input type="hidden" name="importdetail"  
 value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />  
 <span class="LC_nobreak">  
 <input name="newgroupfiles" type="submit" value="$lt{'grpo'}" />  
 $help{'Group Files'}  
 </span>  
 </form>  
 <br /><form action="/adm/coursedocs" method="post" name="newroster">  
 $uploadtag  
 <input type="hidden" name="importdetail"   
 value="$lt{'rost'}=/adm/viewclasslist" />  
 <span class="LC_nobreak">  
 <input name="newroster" type="submit" value="$lt{'rost'}" />  
 $help{'Course Roster'}  
 </span>  
 </form>  
 ENDFORM  
        }         }
   
          &changewarning($r,'');
    $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
                        &mt('Editing the Table of Contents for your '.$type)));
   $r->print('</div>');
        if ($env{'form.pagepath'}) {         if ($env{'form.pagepath'}) {
            $r->print(<<ENDBLOCK);  
 <form action="/adm/coursedocs" method="post" name="newsmpproblem">  
 $uploadtag  
 <input type="hidden" name="importdetail" value="" />  
 <span class="LC_nobreak">  
 <input name="newsmpproblem" type="button" value="$lt{'sipr'}"  
 onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}  
 </span>  
 </form>  
 <br /><form action="/adm/coursedocs" method="post" name="newexamupload">  
 $uploadtag  
 <input type="hidden" name="importdetail" value="" />  
 <span class="LC_nobreak">  
 <input name="newexamupload" type="button" value="$lt{'scuf'}"  
 onClick="javascript:makeexamupload();" />  
 $help{'Score_Upload_Form'}  
 </span>  
 </form>  
 ENDBLOCK  
        }         }
        $r->print('</td></tr>'."\n".  
 '</table>');  
        $r->print('</td></tr>');  
     }  
 # ----------------------------------------------------- Supplemental documents  # ----------------------------------------------------- Supplemental documents
     if (!$forcestandard) {         my $active = 'style="display: none;"';
        $r->print('<tr><td class="LC_docs_document">');         if($activeClass == 1){
 # '<h2>'.&mt('Supplemental Course Documents').            $active = 'style="display: block;"';
 #  ($allowed?' '.$help{'Supplemental'}:'').'</h2>');         }
          $r->print('<div class="LC_ContentBox" id="supplCourseDocuments" '.$active.'>');
        my $folder=$env{'form.folder'};         my $folder=$env{'form.folder'};
        unless ($folder=~/^supplemental/) {         unless ($folder=~/^supplemental/) {
    $folder='supplemental';     $folder='supplemental';
Line 3067  ENDBLOCK Line 3209  ENDBLOCK
    (($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) {     (($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) {
           $env{'form.folderpath'} = 'supplemental&'.            $env{'form.folderpath'} = 'supplemental&'.
                                     &escape(&mt('Supplemental '.$type.' Documents'));                                      &escape(&mt('Supplemental '.$type.' Documents'));
          }else{
     $env{'form.folderpath'} = $savefolderpath;
        }         }
        my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);         $env{'form.pagepath'} = '';
        if ($error) {  
    $r->print('<p><span class="LC_error">'.$error.'</span></p>');  
        }  
        if ($allowed) {         if ($allowed) {
    my $folderseq=     my $folderseq=
        '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.         '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
        '.sequence';         '.sequence';
   
    my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');     my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
    $r->print(<<ENDSUPFORM);  
 <table class="LC_docs_adddocs"><tr>   my $supupdocform=(<<SUPDOCFORM);
 <th>$lt{'upls'}</th>   <form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
 <th>$lt{'spec'}</th>   <input type="hidden" name="active" value="ee" />
 </tr>   $fileupload
 <tr><td>   <br />
 <form action="/adm/coursedocs" method="post" enctype="multipart/form-data">   <br />
 <input type="file" name="uploaddoc" size="40" />   <span class="LC_nobreak">
 <br />   $checkbox
 <br />   </span>
 <span class="LC_nobreak">   <br /><br />
 <label>$lt{'parse'}?   $lt{'comment'}:<br />
 <input type="checkbox" name="parserflag" />   <textarea cols="50" rows="4" name="comment">
 </label>   </textarea>
 </span>   <br />
 <br /><br />   <input type="hidden" name="folderpath" value="$path" />
 $lt{'comment'}:<br />   <input type="hidden" name="cmd" value="upload_supplemental" />
 <textarea cols=50 rows=4 name='comment'>   <span class="LC_nobreak">
 </textarea>   <input type="submit" value="$lt{'upld'}" />
 <br />   $help{'Uploading_From_Harddrive'}
 <input type="hidden" name="folderpath" value="$path" />   </span>
 <input type="hidden" name="cmd" value="upload_supplemental" />   </form>
 <span class="LC_nobreak">  SUPDOCFORM
 <input type="submit" value="$lt{'upld'}" />  
  $help{'Uploading_From_Harddrive'}   my $supnewfolderform=(<<SNFFORM);
 </span>   <form action="/adm/coursedocs" method="post" name="supnewfolder">
 </form>   <input type="hidden" name="active" value="ee" />
 </td>   <input type="hidden" name="folderpath" value="$path" />
 <td>   <input type="hidden" name="importdetail" value="" />
 <form action="/adm/coursedocs" method="post" name="supnewfolder">   <span class="LC_nobreak">
 <input type="hidden" name="folderpath" value="$path" />   <input name="newfolder" type="button"
 <input type="hidden" name="importdetail" value="" />   onclick="javascript:makenewfolder(this.form,'$folderseq');"
 <span class="LC_nobreak">   value="$lt{'newf'}" /> $help{'Adding_Folders'}
 <input name="newfolder" type="button"   </span>
 onClick="javascript:makenewfolder(this.form,'$folderseq');"   </form>
 value="$lt{'newf'}" /> $help{'Adding_Folders'}  SNFFORM
 </span>  
 </form>  
 <br /><form action="/adm/coursedocs" method="post" name="supnewext">   my $supnewextform=(<<SNEFORM);
 <input type="hidden" name="folderpath" value="$path" />   <form action="/adm/coursedocs" method="post" name="supnewext">
 <input type="hidden" name="importdetail" value="" />   <input type="hidden" name="active" value="ff" />
 <span class="LC_nobreak">   <input type="hidden" name="folderpath" value="$path" />
 <input name="newext" type="button"    <input type="hidden" name="importdetail" value="" />
 onClick="javascript:makenewext('supnewext');"   <span class="LC_nobreak">
 value="$lt{'extr'}" /> $help{'Adding_External_Resource'}   <input name="newext" type="button" 
 </span>   onclick="javascript:makenewext('supnewext');"
 </form>   value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
 <br /><form action="/adm/coursedocs" method="post" name="supnewsyl">   </span>
 <input type="hidden" name="folderpath" value="$path" />   </form>
 <input type="hidden" name="importdetail"   SNEFORM
 value="Syllabus=/public/$coursedom/$coursenum/syllabus" />  
 <span class="LC_nobreak">   my $supnewsylform=(<<SNSFORM);
 <input name="newsyl" type="submit" value="$lt{'syll'}" />   <form action="/adm/coursedocs" method="post" name="supnewsyl">
 $help{'Syllabus'}   <input type="hidden" name="active" value="ff" />
 </span>   <input type="hidden" name="folderpath" value="$path" />
 </form>   <input type="hidden" name="importdetail" 
 <br /><form action="/adm/coursedocs" method="post" name="subnewaboutme">   value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
 <input type="hidden" name="folderpath" value="$path" />   <span class="LC_nobreak">
 <input type="hidden" name="importdetail"    <input name="newsyl" type="submit" value="$lt{'syll'}" />
 value="$plainname=/adm/$udom/$uname/aboutme" />   $help{'Syllabus'}
 <span class="LC_nobreak">   </span>
 <input name="newaboutme" type="submit" value="$lt{'mypi'}" />   </form>
 $help{'My Personal Info'}  SNSFORM
 </span>  
 </form>   my $supnewaboutmeform=(<<SNAMFORM);
 </td></tr>   <form action="/adm/coursedocs" method="post" name="subnewaboutme">
 </table></td></tr>   <input type="hidden" name="active" value="ff" />
 ENDSUPFORM   <input type="hidden" name="folderpath" value="$path" />
    <input type="hidden" name="importdetail" 
    value="$plainname=/adm/$udom/$uname/aboutme" />
    <span class="LC_nobreak">
    <input name="newaboutme" type="submit" value="$lt{'mypi'}" />
    $help{'My Personal Information Page'}
    </span>
    </form>
   SNAMFORM
   
   
   
   my %suporderhash = (
                   'ee' => ['Upload Document',$supupdocform.'<br />'.$supnewfolderform],
                   'ff' => ['Special Documents',$supnewextform.'<br />'.$supnewsylform.'<br />'.$supnewaboutmeform],
                   'zz' => ['Hide all Options'],
                   );
   
   my $tid='2';
   my $varscd = 'Supplemental Course Documents';
   
   $r->print(&generate_edit_table($tid,$varscd,\%suporderhash));
   my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
          if ($error) {
              $r->print('<p><span class="LC_error">'.$error.'</span></p>');
        }         }
     }  $r->print('</div>');
     $r->print('</table>');   }
   $r->print('</div>');
     if ($allowed) {      if ($allowed) {
  $r->print('   $r->print('
 <form method="post" name="extimport" action="/adm/coursedocs">  <form method="post" name="extimport" action="/adm/coursedocs">
Line 3170  ENDSUPFORM Line 3336  ENDSUPFORM
  }   }
  $r->print(&Apache::loncommon::end_page());   $r->print(&Apache::loncommon::end_page());
  return OK;   return OK;
 }   }
   
   sub generate_admin_options {
     my ($containertag,$uploadtag,$help_ref,$env_ref) = @_;
    my %lt=&Apache::lonlocal::texthash(
                                            'vc' => 'Verify Content',
                                            'cv' => 'Check/Set Resource Versions',
                                            'ls' => 'List Symbs',
                                            'sl' => 'Show Log'
                                             );
     my %help = %{$help_ref};
     my %env = %{$env_ref};
     my $dumpbut=&dumpbutton();
     my $exportbut=&exportbutton();
     return (<<ENDOPTIONFORM);
    <form action="/adm/coursedocs" method="post" name="courseverify">
              <input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}<br />
              <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}<br />
              $dumpbut
              $exportbut
             <input type="submit" name="listsymbs" value="$lt{'ls'}" />
             <input type="hidden" name="folder" value="$env{'form.folder'}" /><br />
             <input type="submit" name="docslog" value="$lt{'sl'}" />
    </form>
   ENDOPTIONFORM
   
   }
   
   
   sub generate_edit_table {
       my ($tid,$varcd,$orderhash_ref) = @_;
       my %orderhash = %{$orderhash_ref};
       my $form;
       my $activetab;
       my $active;
       if($env{'form.active'} ne ''){
           $activetab = $env{'form.active'};
       }
       $form = '<div class="LC_Box"><h4 class="LC_hcell">'.&mt($varcd).'</h4>';
       $form .= '<ul id="navigation'.$tid.'" class="LC_TabContent">';
       foreach my $name (sort(keys(%orderhash))){
           if($name eq 'zz'){
               if($activetab ne ''){
                  $active = 'class="right"';
               }else{
                  $active = 'class="right active"';
               }
               $form .= '<li onclick="javascript:hideAll(this, \'navigation'.$tid.'\' ,\'content'.$tid.'\');" '.$active.'>'.&mt(${$orderhash{$name}}[0]).'</li>';
           }else{
               if($activetab eq '' || $activetab ne $name){
                  $active = '';
               }elsif($activetab eq $name){
                  $active = 'class="active"';
               }
               $form .= '<li '.$active.' onclick="javascript:showPage(this, \''.$name.$tid.'\', \'navigation'.$tid.'\',\'content'.$tid.'\');">'.&mt(${$orderhash{$name}}[0]).'</li>';
           }
       }
       $form .= '</ul>';
       $form .= '<div id="content'.$tid.'" style="padding: 0 0; margin: 0 0;">';
       foreach my $field (keys(%orderhash)){
    if($field ne 'zz'){
           if($activetab eq '' || $activetab ne $field){
                   $active = 'style="display: none;"';
           }elsif($activetab eq $field){
                   $active = 'style="display:block;"';
           }
              $form .= '<div id="'.$field.$tid.'"'
                      .' class="LC_ContentBox" '.$active.'>'.${$orderhash{$field}}[1]
                      .'</div>';
           }
       }
       $form .= '</div></div>';
   
       return $form;
   }
   
 sub editing_js {  sub editing_js {
     my ($udom,$uname) = @_;      my ($udom,$uname) = @_;
Line 3182  sub editing_js { Line 3421  sub editing_js {
                                           p_mnp => 'Name of New Page',                                            p_mnp => 'Name of New Page',
                                           t_mnp => 'New Page',                                            t_mnp => 'New Page',
                                           p_mxu => 'Title for the Uploaded Score',                                            p_mxu => 'Title for the Uploaded Score',
                                           p_msp => 'Title for the Page',                                            p_msp => 'Name of Simple Course Page',
                                           p_msb => 'Title for the Problem',                                            p_msb => 'Title for the Problem',
                                           p_mdb => 'Title for the Drop Box',                                            p_mdb => 'Title for the Drop Box',
                                           p_mbb => 'Title for the Bulletin Board',                                            p_mbb => 'Title for the Discussion Board',
                                           p_mab => "Enter user:domain for User's 'About Me' Page",                                            p_mab => "Enter user:domain for User's Personal Information Page",
                                           p_mab2 => "About [_99]",                                            p_mab2 => 'Personal Information Page of ',
                                           p_mab_alrt1 => 'Not a valid user:domain',                                            p_mab_alrt1 => 'Not a valid user:domain',
                                           p_mab_alrt2 => 'Please enter both user and domain in the format user:domain',                                            p_mab_alrt2 => 'Please enter both user and domain in the format user:domain',
                                           p_chn => 'New Title',                                            p_chn => 'New Title',
Line 3235  function edittext(targetname,residx,titl Line 3474  function edittext(targetname,residx,titl
   
 function makeexamupload() {  function makeexamupload() {
    var title=prompt('$lt{"p_mxu"}');     var title=prompt('$lt{"p_mxu"}');
    if (title) {      if (title) {
     this.document.forms.newexamupload.importdetail.value=      this.document.forms.newexamupload.importdetail.value=
  escape(title)+'=/res/lib/templates/examupload.problem';   escape(title)+'=/res/lib/templates/examupload.problem';
     this.document.forms.newexamupload.submit();      this.document.forms.newexamupload.submit();
Line 3244  function makeexamupload() { Line 3483  function makeexamupload() {
   
 function makesmppage() {  function makesmppage() {
    var title=prompt('$lt{"p_msp"}');     var title=prompt('$lt{"p_msp"}');
    if (title) {      if (title) {
     this.document.forms.newsmppg.importdetail.value=      this.document.forms.newsmppg.importdetail.value=
  escape(title)+'=/adm/$udom/$uname/$now/smppg';   escape(title)+'=/adm/$udom/$uname/$now/smppg';
     this.document.forms.newsmppg.submit();      this.document.forms.newsmppg.submit();
Line 3253  function makesmppage() { Line 3492  function makesmppage() {
   
 function makesmpproblem() {  function makesmpproblem() {
    var title=prompt('$lt{"p_msb"}');     var title=prompt('$lt{"p_msb"}');
    if (title) {      if (title) {
     this.document.forms.newsmpproblem.importdetail.value=      this.document.forms.newsmpproblem.importdetail.value=
  escape(title)+'=/res/lib/templates/simpleproblem.problem';   escape(title)+'=/res/lib/templates/simpleproblem.problem';
     this.document.forms.newsmpproblem.submit();      this.document.forms.newsmpproblem.submit();
Line 3262  function makesmpproblem() { Line 3501  function makesmpproblem() {
   
 function makedropbox() {  function makedropbox() {
    var title=prompt('$lt{"p_mdb"}');     var title=prompt('$lt{"p_mdb"}');
    if (title) {      if (title) {
     this.document.forms.newdropbox.importdetail.value=      this.document.forms.newdropbox.importdetail.value=
         escape(title)+'=/res/lib/templates/DropBox.problem';          escape(title)+'=/res/lib/templates/DropBox.problem';
     this.document.forms.newdropbox.submit();      this.document.forms.newdropbox.submit();
Line 3287  function makeabout() { Line 3526  function makeabout() {
    if ((comp[0]) && (comp[1])) {     if ((comp[0]) && (comp[1])) {
        this.document.forms.newaboutsomeone.importdetail.value=         this.document.forms.newaboutsomeone.importdetail.value=
    '$lt{"p_mab2"}'+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';     '$lt{"p_mab2"}'+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
        this.document.forms.newaboutsomeone.submit();         this.document.forms.newaboutsomeone.submit();
    } else {     } else {
                alert("$lt{'p_mab_alrt1'}");         alert("$lt{'p_mab_alrt1'}");
            }  
        } else {  
            alert("$lt{'p_mab_alrt2'}");  
        }  
    }     }
   } else {
      alert("$lt{'p_mab_alrt2'}");
   }
   }
 }  }
   
 function makeims() {  function makeims() {
     var caller = document.forms.ims.folder.value;  var caller = document.forms.ims.folder.value;
     var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one";  var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one";
     newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes");  newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes");
     newWindow.location.href = newlocation;  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;
     var form=this.document.forms.extimport.useform.value;  var form=this.document.forms.extimport.useform.value;
     var residx=this.document.forms.extimport.residx.value;  var residx=this.document.forms.extimport.residx.value;
     eval('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+'='+residx+'";this.document.forms.'+form+'.submit();');  eval('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+'='+residx+'";this.document.forms.'+form+'.submit();');
 }  }
   
 function changename(folderpath,index,oldtitle,container,pagesymb) {  function changename(folderpath,index,oldtitle,container,pagesymb) {
     var title=prompt('$lt{"p_chn"}',oldtitle);  var title=prompt('$lt{"p_chn"}',oldtitle);
     if (title) {  if (title) {
  this.document.forms.renameform.markcopy.value=-1;  this.document.forms.renameform.markcopy.value=-1;
  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;
         if (container == 'sequence') {  if (container == 'sequence') {
     this.document.forms.renameform.folderpath.value=folderpath;      this.document.forms.renameform.folderpath.value=folderpath;
         }  }
         if (container == 'page') {  if (container == 'page') {
             this.document.forms.renameform.pagepath.value=folderpath;      this.document.forms.renameform.pagepath.value=folderpath;
             this.document.forms.renameform.pagesymb.value=pagesymb;      this.document.forms.renameform.pagesymb.value=pagesymb;
         }  }
         this.document.forms.renameform.submit();  this.document.forms.renameform.submit();
     }  }
 }  }
   
 function removeres(folderpath,index,oldtitle,container,pagesymb,skip_confirm) {  function removeres(folderpath,index,oldtitle,container,pagesymb,skip_confirm) {
     if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) {  if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) {
  this.document.forms.renameform.markcopy.value=-1;  this.document.forms.renameform.markcopy.value=-1;
  this.document.forms.renameform.cmd.value='del_'+index;  this.document.forms.renameform.cmd.value='del_'+index;
         if (container == 'sequence') {  if (container == 'sequence') {
             this.document.forms.renameform.folderpath.value=folderpath;      this.document.forms.renameform.folderpath.value=folderpath;
         }  }
         if (container == 'page') {  if (container == 'page') {
             this.document.forms.renameform.pagepath.value=folderpath;      this.document.forms.renameform.pagepath.value=folderpath;
             this.document.forms.renameform.pagesymb.value=pagesymb;      this.document.forms.renameform.pagesymb.value=pagesymb;
         }  }
         this.document.forms.renameform.submit();  this.document.forms.renameform.submit();
     }  }
 }  }
   
 function cutres(folderpath,index,oldtitle,container,pagesymb,folder,skip_confirm) {  function cutres(folderpath,index,oldtitle,container,pagesymb,folder,skip_confirm) {
     if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) {  if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) {
  this.document.forms.renameform.cmd.value='cut_'+index;  this.document.forms.renameform.cmd.value='cut_'+index;
  this.document.forms.renameform.markcopy.value=index;  this.document.forms.renameform.markcopy.value=index;
  this.document.forms.renameform.copyfolder.value=folder+'.'+container;  this.document.forms.renameform.copyfolder.value=folder+'.'+container;
         if (container == 'sequence') {  if (container == 'sequence') {
             this.document.forms.renameform.folderpath.value=folderpath;      this.document.forms.renameform.folderpath.value=folderpath;
         }  }
         if (container == 'page') {  if (container == 'page') {
             this.document.forms.renameform.pagepath.value=folderpath;      this.document.forms.renameform.pagepath.value=folderpath;
             this.document.forms.renameform.pagesymb.value=pagesymb;      this.document.forms.renameform.pagesymb.value=pagesymb;
         }  }
         this.document.forms.renameform.submit();  this.document.forms.renameform.submit();
     }  }
 }  }
   
 function markcopy(folderpath,index,oldtitle,container,pagesymb,folder) {  function markcopy(folderpath,index,oldtitle,container,pagesymb,folder) {
     this.document.forms.renameform.markcopy.value=index;  this.document.forms.renameform.markcopy.value=index;
     this.document.forms.renameform.copyfolder.value=folder+'.'+container;  this.document.forms.renameform.copyfolder.value=folder+'.'+container;
     if (container == 'sequence') {  if (container == 'sequence') {
  this.document.forms.renameform.folderpath.value=folderpath;  this.document.forms.renameform.folderpath.value=folderpath;
     }  }
     if (container == 'page') {  if (container == 'page') {
  this.document.forms.renameform.pagepath.value=folderpath;  this.document.forms.renameform.pagepath.value=folderpath;
  this.document.forms.renameform.pagesymb.value=pagesymb;  this.document.forms.renameform.pagesymb.value=pagesymb;
     }  }
     this.document.forms.renameform.submit();  this.document.forms.renameform.submit();
   }
   
   function unselectInactive(nav) {
   currentNav = document.getElementById(nav);
   currentLis = currentNav.getElementsByTagName('LI');
   for (i = 0; i < currentLis.length; i++) {
    if(currentLis[i].className == 'right active' || currentLis[i].className == 'right'){
    currentLis[i].className = 'right';
    }else{
    currentLis[i].className = 'i';
    }
   }
   }
   
   function hideAll(current, nav, data) {
   unselectInactive(nav);
   if(current.className == 'right'){
    current.className = 'right active'
    }else{
    current.className = 'active';
   }
   currentData = document.getElementById(data);
   currentDivs = currentData.getElementsByTagName('DIV');
   for (i = 0; i < currentDivs.length; i++) {
    if(currentDivs[i].className == 'LC_ContentBox'){
    currentDivs[i].style.display = 'none';
    }
   }
   }
   
   function openTabs(pageId) {
    tabnav = document.getElementById(pageId).getElementsByTagName('UL');
    if(tabnav.length > 0 ){
    currentNav = document.getElementById(tabnav[0].id);
    currentLis = currentNav.getElementsByTagName('LI');
    for(i = 0; i< currentLis.length; i++){
    if(currentLis[i].className == 'active') {
    funcString = currentLis[i].onclick.toString();
    tab = funcString.split('"');
    currentData = document.getElementById(tab[1]);
           currentData.style.display = 'block';
    }
    }
    }
   }
   
   function showPage(current, pageId, nav, data) {
    hideAll(current, nav, data);
    openTabs(pageId);
    unselectInactive(nav);
    current.className = 'active';
    currentData = document.getElementById(pageId);
    currentData.style.display = 'block';
    return false;
 }  }
   
 ENDNEWSCRIPT  ENDNEWSCRIPT
 }  }
 1;  1;
 __END__  __END__
   
   
   =head1 NAME
   
   Apache::londocs.pm
   
   =head1 SYNOPSIS
   
   This is part of the LearningOnline Network with CAPA project
   described at http://www.lon-capa.org.
   
   =head1 SUBROUTINES
   
   =over
   
   =item %help=()
   
   Available help topics
   
   =item mapread()
   
   Mapread read maps into LONCAPA::map:: global arrays
   @order and @resources, determines status
   sets @order - pointer to resources in right order
   sets @resources - array with the resources with correct idx
   
   =item authorhosts()
   
   Return hash with valid author names
   
   =item dumpbutton()
   
   Generate "dump" button
   
   =item clean()
   
   =item dumpcourse()
   
       Actually dump course
   
   
   =item exportbutton()
   
       Generate "export" button
   
   =item exportcourse()
   
   =item create_ims_store()
   
   =item build_package()
   
   =item get_dependencies()
   
   =item process_content()
   
   =item replicate_content()
   
   =item extract_media()
   
   =item store_template()
   
   =item group_import()
   
       Imports the given (name, url) resources into the course
       coursenum, coursedom, and folder must precede the list
   
   =item breadcrumbs()
   
   =item log_docs()
   
   =item docs_change_log()
   
   =item update_paste_buffer()
   
   =item print_paste_buffer()
   
   =item do_paste_from_buffer()
   
   =item update_parameter()
   
   =item handle_edit_cmd()
   
   =item editor()
   
   =item process_file_upload()
   
   =item process_secondary_uploads()
   
   =item is_supplemental_title()
   
   =item parse_supplemental_title()
   
   =item entryline()
   
   =item tiehash()
   
   =item untiehash()
   
   =item checkonthis()
   
   check on this
   
   =item verifycontent()
   
   Verify Content
   
   =item devalidateversioncache() & checkversions()
   
   Check Versions
   
   =item mark_hash_old()
   
   =item is_hash_old()
   
   =item changewarning()
   
   =item init_breadcrumbs()
   
   Breadcrumbs for special functions
   
   =back
   
   =cut

Removed from v.1.314.2.2  
changed lines
  Added in v.1.376


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