loncom/interface/londocs.pm - diff

Return to londocs.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/londocs.pm between versions 1.196 and 1.331

-version 1.196, 2005/07/25 02:35:29
+version 1.331, 2009/01/30 10:02:46
  Line 26
  # http://www.lon-capa.org/
  #
  package Apache::londocs;
  use strict;
- Line 33  use Apache::Constants qw(:common :http);
+ Line 35  use Apache::Constants qw(:common :http);
  use Apache::imsexport;
  use Apache::lonnet;
  use Apache::loncommon;
- use Apache::lonratedt;
+ use LONCAPA::map();
- use Apache::lonratsrv;
+ use Apache::lonratedt();
  use Apache::lonxml;
- use Apache::loncreatecourse;
+ use Apache::lonclonecourse;
  use Apache::lonnavmaps;
  use HTML::Entities;
  use GDBM_File;
  use Apache::lonlocal;
  use Cwd;
+ use LONCAPA qw(:DEFAULT :match);
  my $iconpath;
- Line 52  my %alreadyseen=();
+ Line 55  my %alreadyseen=();
  my $hadchanges;
- # Available help topics
  my %help=();
- # Mapread read maps into lonratedt::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 {
      my ($coursenum,$coursedom,$map)=@_;
      return
-       &Apache::lonratedt::mapread('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
+       &LONCAPA::map::mapread('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
-                                 $map);
+ 			     $map);
  }
  sub storemap {
      my ($coursenum,$coursedom,$map)=@_;
      my ($outtext,$errtext)=
-       &Apache::lonratedt::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
+       &LONCAPA::map::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
-                                 $map,1);
+ 			      $map,1);
      if ($errtext) { return ($errtext,2); }
      $hadchanges=1;
      return ($errtext,0);
  }
- # ----------------------------------------- Return hash with valid author names
  sub authorhosts {
      my %outhash=();
      my $home=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 $realm=$2;
- 	    my ($start,$end)=split(/\./,$env{$_});
+ 	    my ($start,$end)=split(/\./,$env{$key});
  	    if (($start) && ($start>time)) { next; }
  	    if (($end) && (time>$end)) { next; }
- 	    my $ca; my $cd;
+ 	    my ($ca,$cd);
  	    if ($1 eq 'au') {
  		$ca=$env{'user.name'};
  		$cd=$env{'user.domain'};
  	    } else {
- 		($cd,$ca)=($realm=~/^\/(\w+)\/(\w+)$/);
+ 		($cd,$ca)=($realm=~/^\/($match_domain)\/($match_username)$/);
  	    }
  	    my $allowed=0;
  	    my $myhome=&Apache::lonnet::homeserver($ca,$cd);
- Line 115  sub authorhosts {
+ Line 112  sub authorhosts {
      }
      return ($home,$other,%outhash);
  }
- # ------------------------------------------------------ Generate "dump" button
  sub dumpbutton {
      my ($home,$other,%outhash)=&authorhosts();
+     my $type = &Apache::loncommon::course_type();
      if ($home+$other==0) { return ''; }
-     my $output='</td><td bgcolor="#DDDDCC">';
      if ($home) {
- 	return '</td><td bgcolor="#DDDDCC">'.
+ 	return '<input type="submit" name="dumpcourse" value="'.
- 	    '<input type="submit" name="dumpcourse" value="'.
+ 	    &mt('Dump '.$type.' DOCS to Construction Space').'" />'.
- 	    &mt('Dump Course DOCS to Construction Space').'" />'.
  	    &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs');
      } else {
- 	return'</td><td bgcolor="#DDDDCC">'.
+ 	return '<div>'.
-      &mt('Dump Course DOCS to Construction Space: available on other servers');
+      &mt('Dump '.$type.
+ 	 ' DOCS to Construction Space: available on other servers').
+ 	 '</div>';
      }
  }
- Line 137  sub clean {
+ Line 135  sub clean {
      $title=~s/[^\w\/\!\$\%\^\*\-\_\=\+\;\:\,\\\|\`\~]+/\_/gs;
      return $title;
  }
- # -------------------------------------------------------- Actually dump course
  sub dumpcourse {
-     my $r=shift;
+     my ($r) = @_;
-     my $html=&Apache::lonxml::xmlbegin();
+     my $type = &Apache::loncommon::course_type();
-     $r->print($html.'<head><title>Dump DOCS</title></head>'.
+     $r->print(&Apache::loncommon::start_page('Dump '.$type.' DOCS to Construction Space').
-         &Apache::loncommon::bodytag('Dump Course DOCS to Construction Space').
  	      '<form name="dumpdoc" method="post">');
+     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Dump '.$type.' DOCS to Construction Space'));
      my ($home,$other,%outhash)=&authorhosts();
      unless ($home) { return ''; }
      my $origcrsid=$env{'request.course.id'};
- Line 157  sub dumpcourse {
+ Line 156  sub dumpcourse {
  	my $title=$env{'form.authorfolder'};
  	$title=&clean($title);
  	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'}.'/';
  	$crs=~s/\_/\//g;
- 	foreach (keys %replacehash) {
+ 	foreach my $item (keys(%replacehash)) {
- 	    my $newfilename=$title.'/'.$replacehash{$_};
+ 	    my $newfilename=$title.'/'.$replacehash{$item};
+ 	    $newfilename=~s/\.(\w+)$//;
+ 	    my $ext=$1;
  	    $newfilename=&clean($newfilename);
+ 	    $newfilename.='.'.$ext;
  	    my @dirs=split(/\//,$newfilename);
  	    my $path='/home/'.$ca.'/public_html';
  	    my $makepath=$path;
- Line 177  sub dumpcourse {
+ Line 179  sub dumpcourse {
  		    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 ($_=~/\.(sequence|page|html|htm|xml|xhtml)$/) {
+ 		if ($item=~/\.(sequence|page|html|htm|xml|xhtml)$/) {
- 		    print $fh &Apache::loncreatecourse::rewritefile(
+ 		    print $fh &Apache::lonclonecourse::rewritefile(
-          &Apache::loncreatecourse::readfile($env{'request.course.id'},$_),
+          &Apache::lonclonecourse::readfile($env{'request.course.id'},$item),
  				     (%replacehash,$crs => '')
  								    );
  		} else {
  		    print $fh
-          &Apache::loncreatecourse::readfile($env{'request.course.id'},$_);
+          &Apache::lonclonecourse::readfile($env{'request.course.id'},$item);
  		       }
  		$fh->close();
  	    } else {
  		$fail=1;
  	    }
  	    if ($fail) {
- 		$r->print('<font color="red">fail</font>');
+ 		$r->print('<span class="LC_error">'.&mt('fail').'</span>');
  	    } else {
- 		$r->print('<font color="green">ok</font>');
+ 		$r->print('<span class="LC_success">'.&mt('ok').'</span>');
  	    }
  	}
      } else {
- Line 204  sub dumpcourse {
+ Line 206  sub dumpcourse {
  	    $r->print(
  		      '<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) {
  		    $r->print(
  		  '<input type="hidden" name="authorspace" value="'.$1.'" />');
- Line 219  sub dumpcourse {
+ Line 221  sub dumpcourse {
  	    $r->print('</select>');
  	}
  	my $title=$origcrsdata{'description'};
- 	$title=~s/\s+/\_/gs;
+ 	$title=~s/[\/\s]+/\_/gs;
  	$title=&clean($title);
- 	$r->print('<h3>'.&mt('Folder in Construction Space').'</h3><input type="text" size="50" name="authorfolder" value="'.$title.'" /><br />');
+ 	$r->print('<h3>'.&mt('Folder in Construction Space').'</h3>'
+                  .'<input type="text" size="50" name="authorfolder" value="'.$title.'" /><br />');
  	&tiehash();
- 	$r->print('<h3>'.&mt('Filenames in Construction Space').'</h3><table border="2"><tr><th>'.&mt('Internal Filename').'</th><th>'.&mt('Title').'</th><th>'.&mt('Save as ...').'</th></tr>');
+ 	$r->print('<h3>'.&mt('Filenames in Construction Space').'</h3>'
- 	foreach (&Apache::loncreatecourse::crsdirlist($origcrsid,'userfiles')) {
+                  .&Apache::loncommon::start_data_table()
- 	    $r->print('<tr><td>'.$_.'</td>');
+                  .&Apache::loncommon::start_data_table_header_row()
- 	    my ($ext)=($_=~/\.(\w+)$/);
+                  .'<th>'.&mt('Internal Filename').'</th>'
+                  .'<th>'.&mt('Title').'</th>'
+                  .'<th>'.&mt('Save as ...').'</th>'
+                  .&Apache::loncommon::end_data_table_header_row());
+ 	foreach my $file (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) {
+ 	    $r->print(&Apache::loncommon::start_data_table_row()
+                      .'<td>'.$file.'</td>');
+ 	    my ($ext)=($file=~/\.(\w+)$/);
  	    my $title=$hash{'title_'.$hash{
- 		'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$_}};
+ 		'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$file}};
- 	    $title=~s/&colon;/:/g;
  	    $r->print('<td>'.($title?$title:'&nbsp;').'</td>');
- 	    unless ($title) {
+ 	    if (!$title) {
- 		$title=$_;
+ 		$title=$file;
+ 	    } else {
+ 		$title=~s|/|_|g;
  	    }
  	    $title=~s/\.(\w+)$//;
  	    $title=&clean($title);
  	    $title.='.'.$ext;
- 	    $r->print("\n<td><input type='text' size='60' name='namefor_".$_."' value='".$title."' /></td></tr>\n");
+ 	    $r->print("\n<td><input type='text' size='60' name='namefor_".$file."' value='".$title."' /></td>"
+                      .&Apache::loncommon::end_data_table_row());
  	}
- 	$r->print("</table>\n");
+ 	$r->print(&Apache::loncommon::end_data_table());
  	&untiehash();
  	$r->print(
-   '<p><input type="submit" name="dumpcourse" value="'.&mt('Dump Course DOCS').'" /></p></form>');
+   '<p><input type="submit" name="dumpcourse" value="'.&mt("Dump $type DOCS").'" /></p></form>');
      }
  }
- # ------------------------------------------------------ Generate "export" button
  sub exportbutton {
-     return '';
+     my $type = &Apache::loncommon::course_type();
-     return '</td><td bgcolor="#DDDDCC">'.
+     return '<input type="submit" name="exportcourse" value="'.
-             '<input type="submit" name="exportcourse" value="'.
+             &mt('Export '.$type.' to IMS').'" />'.
-             &mt('Export Course to IMS').'" />'.
+     &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs');
-             &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs');
  }
  sub exportcourse {
      my $r=shift;
+     my $type = &Apache::loncommon::course_type();
      my %discussiontime = &Apache::lonnet::dump('discussiontimes',
                                                 $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();
+     if (!defined($navmap)) {
+         $r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package').
+                   '<h2>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 $curRes;
      my $outcome;
- Line 298  sub exportcourse {
+ Line 321  sub exportcourse {
                  open(OUTPUT, "zip -r $imszip *  2> /dev/null |");
                  close(OUTPUT);
                  chdir $cwd;
-                 $outcome .= 'Download the zip file from <a href="'.$imszipfile.'">IMS course archive</a><br />';
+                 $outcome .= &mt('Download the zip file from <a href="[_1]">IMS '.lc($type).' archive</a><br />',$imszipfile,);
                  if ($copyresult) {
-                     $outcome .= 'The following errors occurred during export - '.$copyresult;
+                     $outcome .= &mt('The following errors occurred during export - [_1]',$copyresult);
                  }
              } else {
-                 $outcome = '<br />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 />';
              }
          }
- 	my $html=&Apache::lonxml::xmlbegin();
+         $r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package'));
-         $r->print($html.'<head><title>Export Course</title></head>'.
+ 	$r->print(&Apache::lonhtmlcommon::breadcrumbs('Export '.lc($type).' to IMS content package'));
-             &Apache::loncommon::bodytag('Export course to IMS content package'));
          $r->print($outcome);
-         $r->print('</body></html>');
+         $r->print(&Apache::loncommon::end_page());
      } else {
          my $display;
          $display = '<form name="exportdoc" method="post">'."\n";
-         $display .= 'Choose which items you wish to export from your course.<br /><br />';
+         $display .= &mt('Choose which items you wish to export from your '.$type.'.<br /><br />');
          $display .= '<table border="0" cellspacing="0" cellpadding="3">'.
                      '<tr><td><fieldset><legend>&nbsp;<b>Content items</b></legend>'.
                      '<input type="button" value="check all" '.
- Line 358  sub exportcourse {
+ Line 380  sub exportcourse {
              if (ref($curRes)) {
                  my $symb = $curRes->symb();
                  my $ressymb = $symb;
-                 if ($ressymb =~ m|adm/(\w+)/(\w+)/(\d+)/bulletinboard$|) {
+                 if ($ressymb =~ m|adm/($match_domain)/($match_username)/(\d+)/bulletinboard$|) {
                      unless ($ressymb =~ m|adm/wrapper/adm|) {
                          $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard';
                      }
- Line 372  sub exportcourse {
+ Line 394  sub exportcourse {
                  }
                  $display .= ' />'."\n";
                  for (my $i=0; $i<$depth; $i++) {
-                     $display .= '<img src="/adm/lonIcons/whitespace1.gif" width="25" height="1" alt="" border="0" /><img src="/adm/lonIcons/whitespace1.gif" width="25" height="1" alt="" border="0" />'."\n";
+                     $display .= '<img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" /><img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" />'."\n";
                  }
                  if ($curRes->is_sequence()) {
                      $display .= '<img src="/adm/lonIcons/navmap.folder.open.gif">&nbsp;'."\n";
- Line 431  function containerCheck(item) {
+ Line 453  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 ++) {
                  $scripttag .= '    parents['.$container.']['.$i.'] = '.$contents[$i]."\n";
              }
- Line 448  function containerCheck(item) {
+ Line 470  function containerCheck(item) {
  </script>
          |;
- 	my $html=&Apache::lonxml::xmlbegin();
+ 	$r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package',
-         $r->print($html.'<head><title>Export Course</title>'.$scripttag.'</head>'.
+ 						 $scripttag));
-             &Apache::loncommon::bodytag('Export course to IMS content package'
+ 	$r->print(&Apache::lonhtmlcommon::breadcrumbs('Export '.lc($type).' to IMS content package'));
- ));
+ 	$r->print($display.'</table>'.
-         $r->print($display.'</table>'.
                    '<p><input type="hidden" name="finishexport" value="1">'.
                    '<input type="submit" name="exportcourse" value="'.
-                   &mt('Export Course DOCS').'" /></p></form></body></html>');
+                   &mt('Export '.$type.' DOCS').'" /></p></form>');
      }
  }
- Line 491  sub create_ims_store {
+ Line 511  sub create_ims_store {
  ' identifier="MANIFEST-'.$env{'request.course.id'}.'-'.$now.'"'.
  '  xsi:schemaLocation="http://www.imsglobal.org/xsd/imscp_v1p1imscp_v1p1.xsd'.
  '  http://www.imsglobal.org/xsd/imsmd_v1p2 imsmd_v1p2p2.xsd">'."\n".
+ '  <metadata>
+     <schema></schema>
+     <imsmd:lom>
+       <imsmd:general>
+         <imsmd:identifier>'.$env{'request.course.id'}.'</imsmd:identifier>
+         <imsmd:title>
+           <imsmd:langstring xml:lang="en">'.$env{'course.'.$env{'request.course.id'}.'.description'}.'</imsmd:langstring>
+         </imsmd:title>
+       </imsmd:general>
+     </imsmd:lom>
+   </metadata>'."\n".
  '  <organizations default="ORG-'.$env{'request.course.id'}.'-'.$now.'">'."\n".
  '    <organization identifier="ORG-'.$env{'request.course.id'}.'-'.$now.'"'.
  ' structure="hierarchical">'."\n".
- '      <title>'.$env{'request.'.$env{'request.course.id'}.'.description'}.'</title>'
+ '      <title>'.$env{'course.'.$env{'request.course.id'}.'.description'}.'</title>'
      } else {
          $$outcome .= 'An error occurred opening the IMS manifest file.<br />'
  ;
- Line 530  sub build_package {
+ Line 561  sub build_package {
              if ($curRes->is_sequence() || $curRes->is_page()) {
                  $lastcontainer = $count;
              }
-             if (grep/^$count$/,@$exportitems) {
+             if (grep(/^$count$/,@$exportitems)) {
                  &get_dependencies($exportitems,\%parent,$depth,\@dependencies);
              }
          }
- Line 542  sub build_package {
+ Line 573  sub build_package {
      $count = 0;
      my $imsresources;
      my $pkgdepth;
-     my $included = 0;
      while ($curRes = $it->next()) {
          if ($curRes == $it->BEGIN_MAP()) {
              $prevdepth = $depth;
- Line 555  sub build_package {
+ Line 585  sub build_package {
          if (ref($curRes)) {
              $count ++;
-             if ((grep/^$count$/,@$exportitems) || (grep/^$count$/,@dependencies)) {
+             if ((grep(/^$count$/,@$exportitems)) || (grep(/^$count$/,@dependencies))) {
                  my $symb = $curRes->symb();
                  my $isvisible = 'true';
                  my $resourceref;
- Line 565  sub build_package {
+ Line 595  sub build_package {
                  unless ($curRes->is_sequence()) {
                      $resourceref = 'identifierref="RES-'.$env{'request.course.id'}.'-'.$count.'"';
                  }
-                 if (($depth <= $prevdepth) && ($count > 1) && ($included)) {
+                 my $step = $prevdepth - $depth;
-                     print $ims_manifest "\n".'  </item>'."\n";
+                 if (($step >= 0) && ($count > 1)) {
+                     while ($step >= 0) {
+                         print $ims_manifest "\n".'  </item>'."\n";
+                         $step --;
+                     }
                  }
-                 $included = 1;
                  $prevdepth = $depth;
                  my $itementry =
- Line 586  sub build_package {
+ Line 619  sub build_package {
                       '   <resource identifier="RES-'.$env{'request.course.id'}.'-'.$count.
                       '" type="webcontent" href="'.$content_file.'">'."\n".
                       '       <file href="'.$content_file.'" />'."\n";
-                         foreach (@hrefs) {
+                         foreach my $item (@hrefs) {
                              $imsresources .=
-                      '        <file href="'.$_.'" />'."\n";
+                      '        <file href="'.$item.'" />'."\n";
                          }
-                         if (grep/^$count$/,@$discussions) {
+                         if (grep(/^$count$/,@$discussions)) {
                              my $ressymb = $symb;
                              my $mode;
-                             if ($ressymb =~ m|adm/(\w+)/(\w+)/(\d+)/bulletinboard$|) {
+                             if ($ressymb =~ m|adm/($match_domain)/($match_username)/(\d+)/bulletinboard$|) {
                                  unless ($ressymb =~ m|adm/wrapper/adm|) {
                                      $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard';
                                  }
- Line 610  sub build_package {
+ Line 643  sub build_package {
                      }
                  }
                  $pkgdepth = $depth;
-             } else {
-                 $included = 0;
              }
          }
      }
- Line 633  sub build_package {
+ Line 664  sub build_package {
  sub get_dependencies {
      my ($exportitems,$parent,$depth,$dependencies) = @_;
      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) {
                  &get_dependencies($exportitems,$parent,$depth-1,$dependencies);
              }
- Line 646  sub process_content {
+ Line 677  sub process_content {
      my ($count,$curRes,$cdom,$cnum,$symb,$content_file,$href,$copyresult,$tempexport) = @_;
      my $content_type;
      my $message;
- # find where user is author or co-author
      my @uploads = ();
      if ($curRes->is_sequence()) {
          $content_type = 'sequence';
- Line 681  sub process_content {
+ Line 711  sub process_content {
          }
      } elsif ($symb =~ m-lib/templates/examupload\.problem$-) {
          $content_type = 'examupload';
-     } elsif ($symb =~ m-adm/(\w+)/(\w+)/(\d+)/bulletinboard$-) {
+     } elsif ($symb =~ m-adm/($match_domain)/($match_username)/(\d+)/bulletinboard$-) {
          $content_type = 'bulletinboard';
          my $contents =  &Apache::imsexport::templatedpage($content_type,$3,$count,\@uploads,$1,$2);
          if ($contents) {
- Line 700  sub process_content {
+ Line 730  sub process_content {
          if ($2 eq $env{'user.domain'} && $3 eq $env{'user.name'})  {
              $canedit= 1;
          }
+ # only include problem code where current user is author
          if ($canedit) {
              $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'resource');
          } else {
- Line 748  sub replicate_content {
+ Line 779  sub replicate_content {
          if ($copiedfile = Apache::File->new('>'.$destination)) {
              my $content;
              if ($caller eq 'resource') {
-                 $content = &Apache::lonnet::getfile('/home/httpd/html/res/'.$url);
+                 my $respath =  $Apache::lonnet::perlvar{'lonDocRoot'}.'/res';
+                 my $filepath = &Apache::lonnet::filelocation($respath,$url);
+                 $content = &Apache::lonnet::getfile($filepath);
                  if ($content eq -1) {
                      $$message = 'Could not copy file '.$filename;
                  } else {
-                     &extract_media($content,$count,$tempexport,$href,'resource');
+                     &extract_media($url,$cdom,$cnum,\$content,$count,$tempexport,$href,$message,'resource');
                      $repstatus = 'ok';
                  }
              } elsif ($caller eq 'uploaded' || $caller eq 'templateupload') {
- Line 760  sub replicate_content {
+ Line 793  sub replicate_content {
                  $repstatus = &Apache::lonnet::getuploaded('GET',$url,$cdom,$cnum,\$content,$rtncode);
                  if ($repstatus eq 'ok') {
                      if ($url =~ /\.html?$/i) {
-                         &extract_media(\$content,$count,$tempexport,$href,'uploaded');
+                         &extract_media($url,$cdom,$cnum,\$content,$count,$tempexport,$href,$message,'uploaded');
                      }
                  } else {
-                     $$message = 'Could not render '.$url.' server message - '.$rtncode;
+                     $$message = 'Could not render '.$url.' server message - '.$rtncode."<br />\n";
                  }
              } 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.
- Line 775  sub replicate_content {
+ Line 808  sub replicate_content {
              }
              close($copiedfile);
          } else {
-             $$message = 'Could not open destination file for '.$filename."\n";
+             $$message = 'Could not open destination file for '.$filename."<br />\n";
          }
      } else {
-         $$message = 'Could not determine name of file for '.$symb."\n";
+         $$message = 'Could not determine name of file for '.$symb."<br />\n";
      }
      if ($repstatus eq 'ok') {
-         $content_name = $count.'/'.$filename;
+         $content_name = 'resources/'.$count.'/'.$filename;
      }
      return $content_name;
  }
  sub extract_media {
-     my ($content,$count,$tempexport,$href,$caller) = @_;
+     my ($url,$cdom,$cnum,$content,$count,$tempexport,$href,$message,$caller) = @_;
- # @$href will contain path to any embedded resources in the content.
+     my ($dirpath,$container);
- # For LON-CAPA problems this would be images. applets etc.
+     my %allfiles = ();
- # For uploaded HTML files this would be images etc.
+     my %codebase = ();
- # paths will be in the form $count/res/$file, and urls in the $content will be rewritten with the new paths.
+     if ($url =~ m-(.*/)([^/]+)$-) {
+         $dirpath = $1;
+         $container = $2;
+     } else {
+         $dirpath = $url;
+         $container = '';
+     }
+     &Apache::lonnet::extract_embedded_items(undef,\%allfiles,\%codebase,$content);
+     foreach my $embed_file (keys(%allfiles)) {
+         my $filename;
+         if ($embed_file =~ m#([^/]+)$#) {
+             $filename = $1;
+         } else {
+             $filename = $embed_file;
+         }
+         my $newname = 'res/'.$filename;
+         my ($rtncode,$embed_content,$repstatus);
+         my $embed_url;
+         if ($embed_file =~ m-^/-) {
+             $embed_url = $embed_file;           # points to absolute path
+         } else {
+             if ($embed_file =~ m-https?://-) {
+                 next;                           # points to url
+             } else {
+                 $embed_url = $dirpath.$embed_file;  # points to relative path
+             }
+         }
+         if ($caller eq 'resource') {
+             my $respath =  $Apache::lonnet::perlvar{'lonDocRoot'}.'/res';
+             my $embed_path = &Apache::lonnet::filelocation($respath,$embed_url);
+             $embed_content = &Apache::lonnet::getfile($embed_path);
+             unless ($embed_content eq -1) {
+                 $repstatus = 'ok';
+             }
+         } elsif ($caller eq 'uploaded') {
+             $repstatus = &Apache::lonnet::getuploaded('GET',$embed_url,$cdom,$cnum,\$embed_content,$rtncode);
+         }
+         if ($repstatus eq 'ok') {
+             my $destination = $tempexport.'/resources/'.$count.'/res';
+             if (!-e "$destination") {
+                 mkdir($destination,0755);
+             }
+             $destination .= '/'.$filename;
+             my $copiedfile;
+             if ($copiedfile = Apache::File->new('>'.$destination)) {
+                 print $copiedfile $embed_content;
+                 push(@{$href},'resources/'.$count.'/res/'.$filename);
+                 my $attrib_regexp = '';
+                 if (@{$allfiles{$embed_file}} > 1) {
+                     $attrib_regexp = join('|',@{$allfiles{$embed_file}});
+                 } else {
+                     $attrib_regexp = $allfiles{$embed_file}[0];
+                 }
+                 $$content =~ s#($attrib_regexp\s*=\s*['"]?)\Q$embed_file\E(['"]?)#$1$newname$2#gi;
+                 if ($caller eq 'resource' && $container =~ /\.(problem|library)$/) {
+                     $$content =~ s#\Q$embed_file\E#$newname#gi;
+                 }
+             }
+         } else {
+             $$message .= 'replication of embedded file - '.$embed_file.' in '.$url.' failed, reason -'.$rtncode."<br />\n";
+         }
+     }
      return;
  }
- Line 812  sub store_template {
+ Line 907  sub store_template {
                  close($storetemplate);
              }
              if ($content_type eq 'external') {
-                 return $count.'/'.$content_type.'.html';
+                 return 'resources/'.$count.'/'.$content_type.'.html';
              } else {
-                 return $count.'/'.$content_type.'.xml';
+                 return 'resources/'.$count.'/'.$content_type.'.xml';
              }
          }
      }
  }
- # Imports the given (name, url) resources into the course
- # coursenum, coursedom, and folder must precede the list
  sub group_import {
-     my $coursenum = shift;
+     my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_;
-     my $coursedom = shift;
-     my $folder = shift;
+     while (@files) {
-     my $container = shift;
+ 	my ($name, $url, $residx) = @{ shift(@files) };
-     my $caller = shift;
+         if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$})
-     while (@_) {
+ 	     && ($caller eq 'londocs')
- 	my $name = shift;
+ 	     && (!&Apache::lonnet::stat_file($url))) {
- 	my $url = shift;
-         if (($url =~ m#^/uploaded/$coursedom/$coursenum/(default_\d+\.)(page|sequence)$#) && ($caller eq 'londocs')) {
              my $errtext = '';
              my $fatal = 0;
              my $newmapstr = '<map>'."\n".
- Line 843  sub group_import {
+ Line 936  sub group_import {
              my $result=&Apache::lonnet::finishuserfileupload($coursenum,$coursedom,
                                                  'output',$1.$2);
              if ($result != m|^/uploaded/|) {
-                 $errtext.='Map not saved: A network error occured when trying to save the new map. ';
+                 $errtext.='Map not saved: A network error occurred when trying to save the new map. ';
                  $fatal = 2;
              }
              if ($fatal) {
- Line 851  sub group_import {
+ Line 944  sub group_import {
              }
          }
  	if ($url) {
- 	    my $idx = &Apache::lonratedt::getresidx($url);
+ 	    if (!$residx
- 	    $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=$idx;
+ 		|| defined($LONCAPA::map::zombies[$residx])) {
+ 		$residx = &LONCAPA::map::getresidx($url,$residx);
+ 		push(@LONCAPA::map::order, $residx);
+ 	    }
  	    my $ext = 'false';
- 	    if ($url=~/^http:\/\//) { $ext = 'true'; }
+ 	    if ($url=~m{^http://} || $url=~m{^https://}) { $ext = 'true'; }
- 	    $url =~ s/:/\&colon;/g;
+ 	    $url  = &LONCAPA::map::qtunescape($url);
- 	    $name =~ s/:/\&colon;/g;
+ 	    $name = &LONCAPA::map::qtunescape($name);
- 	    $Apache::lonratedt::resources[$idx] =
+ 	    $LONCAPA::map::resources[$residx] =
- 		join ':', ($name, $url, $ext, 'normal', 'res');
+ 		join(':', ($name, $url, $ext, 'normal', 'res'));
  	}
      }
      return &storemap($coursenum, $coursedom, $folder.'.'.$container);
  }
  sub breadcrumbs {
-     my ($where)=@_;
+     my ($where,$allowed,$type)=@_;
      &Apache::lonhtmlcommon::clear_breadcrumbs();
      my (@folders);
      if ($env{'form.pagepath'}) {
- Line 875  sub breadcrumbs {
+ Line 971  sub breadcrumbs {
      }
      my $folderpath;
      my $cpinfo='';
-     if ($env{'form.markedcopy_url'}) {
+     my $plain='';
- 	&Apache::lonnet::logthis('Found '.$env{'form.markedcopy_url'});
+     my $randompick=-1;
-        $cpinfo='&markedcopy_url='.
+     my $isencrypted=0;
-                &Apache::lonnet::escape($env{'form.markedcopy_url'}).
+     my $ishidden=0;
-                '&markedcopy_title='.
+     my $is_random_order=0;
-                &Apache::lonnet::escape($env{'form.markedcopy_title'});
-     }
      while (@folders) {
  	my $folder=shift(@folders);
- 	my $foldername=shift(@folders);
+     	my $foldername=shift(@folders);
  	if ($folderpath) {$folderpath.='&';}
  	$folderpath.=$folder.'&'.$foldername;
  	my $url='/adm/coursedocs?folderpath='.
- 	    &Apache::lonnet::escape($folderpath);
+ 	    &escape($folderpath);
+ 	    my $name=&unescape($foldername);
+ # randompick number, hidden, encrypted, random order, is appended with ":"s to the foldername
+  	    $name=~s/\:(\d*)\:(\w*)\:(\w*):(\d*)$//;
+ 	    if ($1 ne '') {
+                $randompick=$1;
+             } else {
+                $randompick=-1;
+             }
+             if ($2) { $ishidden=1; }
+             if ($3) { $isencrypted=1; }
+ 	    if ($4 ne '') { $is_random_order = 1; }
+             if ($folder eq 'supplemental') {
+                 if ($allowed) {
+                     $name = &mt('Supplemental '.$type.' Documents');
+                 } else {
+                     $name = &mt($type.' Documents');
+                 }
+             }
  	    &Apache::lonhtmlcommon::add_breadcrumb(
  		      {'href'=>$url.$cpinfo,
- 		       'title'=>&Apache::lonnet::unescape($foldername),
+ 		       'title'=>$name,
  		       'text'=>'<font size="+1">'.
- 			   &Apache::lonnet::unescape($foldername).'</font>'
+ 			   $name.'</font>',
+ 		       'no_mt'=>1,
  		       });
+ 	$plain.=$name.' &gt; ';
+     }
+     $plain=~s/\&gt\;\s*$//;
+     return (&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp',
+ 					       'LC_docs_path'),$randompick,$ishidden,$isencrypted,$plain,$is_random_order);
+ }
+ sub log_docs {
+     return &Apache::lonnet::instructor_log('docslog',@_);
+ }
+ {
+     my @oldresources=();
+     my @oldorder=();
+     my $parmidx;
+     my %parmaction=();
+     my %parmvalue=();
+     my $changedflag;
+     sub snapshotbefore {
+         @oldresources=@LONCAPA::map::resources;
+         @oldorder=@LONCAPA::map::order;
+         $parmidx=undef;
+         %parmaction=();
+         %parmvalue=();
+         $changedflag=0;
+     }
+     sub remember_parms {
+         my ($idx,$parameter,$action,$value)=@_;
+         $parmidx=$idx;
+         $parmaction{$parameter}=$action;
+         $parmvalue{$parameter}=$value;
+         $changedflag=1;
+     }
+     sub log_differences {
+         my ($plain)=@_;
+         my %storehash=('folder' => $plain,
+                        'currentfolder' => $env{'form.folder'});
+         if ($parmidx) {
+            $storehash{'parameter_res'}=$oldresources[$parmidx];
+            foreach my $parm (keys(%parmaction)) {
+               $storehash{'parameter_action_'.$parm}=$parmaction{$parm};
+               $storehash{'parameter_value_'.$parm}=$parmvalue{$parm};
+            }
+         }
+         my $maxidx=$#oldresources;
+         if ($#LONCAPA::map::resources>$#oldresources) {
+            $maxidx=$#LONCAPA::map::resources;
+         }
+         for (my $idx=0; $idx<=$maxidx; $idx++) {
+            if ($LONCAPA::map::resources[$idx] ne $oldresources[$idx]) {
+               $storehash{'before_resources_'.$idx}=$oldresources[$idx];
+               $storehash{'after_resources_'.$idx}=$LONCAPA::map::resources[$idx];
+               $changedflag=1;
+            }
+            if ($LONCAPA::map::order[$idx] ne $oldorder[$idx]) {
+               $storehash{'before_order_res_'.$idx}=$oldresources[$oldorder[$idx]];
+               $storehash{'after_order_res_'.$idx}=$LONCAPA::map::resources[$LONCAPA::map::order[$idx]];
+               $changedflag=1;
+            }
+         }
+ 	$storehash{'maxidx'}=$maxidx;
+         if ($changedflag) { &log_docs(\%storehash); }
      }
-     return &Apache::lonhtmlcommon::breadcrumbs(undef,undef,undef,undef,undef,
-,'nohelp');
  }
- sub editor {
-     my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output)=@_;
-     my $errtext='';
-     my $fatal=0;
-     my $container='sequence';
+ sub docs_change_log {
-     if ($env{'form.pagepath'}) {
+     my ($r)=@_;
-         $container='page';
+     my $folder=$env{'form.folder'};
-     }
+     $r->print(&Apache::loncommon::start_page('Course Document Change Log'));
-     ($errtext,$fatal)=
+     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Course Document Change Log'));
-               &mapread($coursenum,$coursedom,$folder.'.'.$container);
+     my %docslog=&Apache::lonnet::dump('nohist_docslog',
-     if ($#Apache::lonratedt::order<1) {
+                                       $env{'course.'.$env{'request.course.id'}.'.domain'},
- 	my $idx=&Apache::lonratedt::getresidx();
+                                       $env{'course.'.$env{'request.course.id'}.'.num'});
- 	if ($idx<=0) { $idx=1; }
-        	$Apache::lonratedt::order[0]=$idx;
+     if ((keys(%docslog))[0]=~/^error\:/) { undef(%docslog); }
-         $Apache::lonratedt::resources[$idx]='';
+     $r->print('<form action="/adm/coursedocs" method="post" name="docslog">'.
+               '<input type="hidden" name="docslog" value="1" />');
+     my %saveable_parameters = ('show' => 'scalar',);
+     &Apache::loncommon::store_course_settings('docs_log',
+                                               \%saveable_parameters);
+     &Apache::loncommon::restore_course_settings('docs_log',
+                                                 \%saveable_parameters);
+     if (!$env{'form.show'}) { $env{'form.show'}=10; }
+     my %lt=('hiddenresource' => 'Resources hidden',
+ 	    'encrypturl'     => 'URL hidden',
+ 	    'randompick'     => 'Randomly pick',
+ 	    'randomorder'    => 'Randomly ordered',
+ 	    'set'            => 'set to',
+ 	    'del'            => 'deleted');
+     $r->print(&Apache::loncommon::display_filter().
+               '<input type="hidden" name="folder" value="'.$folder.'" />'.
+               '<input type="submit" value="'.&mt('Display').'" /></form>');
+     $r->print(&Apache::loncommon::start_data_table().&Apache::loncommon::start_data_table_header_row().
+               '<th>'.&mt('Time').'</th><th>'.&mt('User').'</th><th>'.&mt('Folder').'</th><th>'.&mt('Before').'</th><th>'.
+               &mt('After').'</th>'.
+               &Apache::loncommon::end_data_table_header_row());
+     my $shown=0;
+     foreach my $id (sort { $docslog{$b}{'exe_time'}<=>$docslog{$a}{'exe_time'} } (keys(%docslog))) {
+ 	if ($env{'form.displayfilter'} eq 'currentfolder') {
+ 	    if ($docslog{$id}{'logentry'}{'currentfolder'} ne $folder) { next; }
+ 	}
+         my @changes=keys(%{$docslog{$id}{'logentry'}});
+         if ($env{'form.displayfilter'} eq 'containing') {
+ 	    my $wholeentry=$docslog{$id}{'exe_uname'}.':'.$docslog{$id}{'exe_udom'}.':'.
+ 		&Apache::loncommon::plainname($docslog{$id}{'exe_uname'},$docslog{$id}{'exe_udom'});
+ 	    foreach my $key (@changes) {
+ 		$wholeentry.=':'.$docslog{$id}{'logentry'}{$key};
+ 	    }
+ 	    if ($wholeentry!~/\Q$env{'form.containingphrase'}\E/i) { next; }
+ 	}
+         my $count = 0;
+         my $time =
+             &Apache::lonlocal::locallocaltime($docslog{$id}{'exe_time'});
+         my $plainname =
+             &Apache::loncommon::plainname($docslog{$id}{'exe_uname'},
+                                           $docslog{$id}{'exe_udom'});
+         my $about_me_link =
+             &Apache::loncommon::aboutmewrapper($plainname,
+                                                $docslog{$id}{'exe_uname'},
+                                                $docslog{$id}{'exe_udom'});
+         my $send_msg_link='';
+         if ((($docslog{$id}{'exe_uname'} ne $env{'user.name'})
+              || ($docslog{$id}{'exe_udom'} ne $env{'user.domain'}))) {
+             $send_msg_link ='<br />'.
+                 &Apache::loncommon::messagewrapper(&mt('Send message'),
+                                                    $docslog{$id}{'exe_uname'},
+                                                    $docslog{$id}{'exe_udom'});
+         }
+         $r->print(&Apache::loncommon::start_data_table_row());
+         $r->print('<td>'.$time.'</td>
+                        <td>'.$about_me_link.
+                   '<br /><tt>'.$docslog{$id}{'exe_uname'}.
+                                   ':'.$docslog{$id}{'exe_udom'}.'</tt>'.
+                   $send_msg_link.'</td><td>'.
+                   $docslog{$id}{'logentry'}{'folder'}.'</td><td>');
+ # Before
+ 	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
+ 	    my $oldname=(split(/\:/,$docslog{$id}{'logentry'}{'before_resources_'.$idx}))[0];
+ 	    my $newname=(split(/\:/,$docslog{$id}{'logentry'}{'after_resources_'.$idx}))[0];
+ 	    if ($oldname ne $newname) {
+ 		$r->print(&LONCAPA::map::qtescape($oldname));
+ 	    }
+ 	}
+ 	$r->print('<ul>');
+ 	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
+             if ($docslog{$id}{'logentry'}{'before_order_res_'.$idx}) {
+ 		$r->print('<li>'.&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'before_order_res_'.$idx}))[0]).'</li>');
+ 	    }
+ 	}
+ 	$r->print('</ul>');
+ # After
+         $r->print('</td><td>');
+ 	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
+ 	    my $oldname=(split(/\:/,$docslog{$id}{'logentry'}{'before_resources_'.$idx}))[0];
+ 	    my $newname=(split(/\:/,$docslog{$id}{'logentry'}{'after_resources_'.$idx}))[0];
+ 	    if ($oldname ne '' && $oldname ne $newname) {
+ 		$r->print(&LONCAPA::map::qtescape($newname));
+ 	    }
+ 	}
+ 	$r->print('<ul>');
+ 	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
+             if ($docslog{$id}{'logentry'}{'after_order_res_'.$idx}) {
+ 		$r->print('<li>'.&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'after_order_res_'.$idx}))[0]).'</li>');
+ 	    }
+ 	}
+ 	$r->print('</ul>');
+ 	if ($docslog{$id}{'logentry'}{'parameter_res'}) {
+ 	    $r->print(&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'parameter_res'}))[0]).':<ul>');
+ 	    foreach my $parameter ('randompick','hiddenresource','encrypturl','randomorder') {
+ 		if ($docslog{$id}{'logentry'}{'parameter_action_'.$parameter}) {
+ 		    $r->print('<li>'.
+ 			      &mt($lt{$parameter}.' '.$lt{$docslog{$id}{'logentry'}{'parameter_action_'.$parameter}}.' [_1]',
+ 				  $docslog{$id}{'logentry'}{'parameter_value_'.$parameter})
+ 			      .'</li>');
+ 		}
+ 	    }
+ 	    $r->print('</ul>');
+ 	}
+ # End
+         $r->print('</td>'.&Apache::loncommon::end_data_table_row());
+         $shown++;
+         if (!($env{'form.show'} eq &mt('all')
+               || $shown<=$env{'form.show'})) { last; }
      }
-     if (defined($env{'form.markcopy'})) {
+     $r->print(&Apache::loncommon::end_data_table());
+ }
+ sub update_paste_buffer {
+     my ($coursenum,$coursedom) = @_;
+     return if (!defined($env{'form.markcopy'}));
+     return if (!defined($env{'form.copyfolder'}));
+     return if ($env{'form.markcopy'} < 0);
+     my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
+ 				    $env{'form.copyfolder'});
+     return if ($fatal);
  # Mark for copying
- 	my ($title,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$env{'form.markcopy'}]]);
+     my ($title,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$env{'form.markcopy'}]]);
- 	$env{'form.markedcopy_title'}=$title;
+     if (&is_supplemental_title($title)) {
- 	$env{'form.markedcopy_url'}=$url;
+         &Apache::lonnet::appenv({'docs.markedcopy_supplemental' => $title});
-     }
+ 	($title) = &parse_supplemental_title($title);
-     $r->print(&breadcrumbs($folder));
+     } elsif ($env{'docs.markedcopy_supplemental'}) {
-     if ($fatal) {
+         &Apache::lonnet::delenv('docs\\.markedcopy_supplemental');
- 	   $r->print('<p><font color="red">'.$errtext.'</font></p>');
+     }
+     $url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
+     &Apache::lonnet::appenv({'docs.markedcopy_title' => $title,
+ 			    'docs.markedcopy_url'   => $url});
+     delete($env{'form.markcopy'});
+ }
+ sub print_paste_buffer {
+     my ($r,$container) = @_;
+     return if (!defined($env{'docs.markedcopy_url'}));
+     $r->print(<<ENDPASTE);
+ <form name="pasteform" action="/adm/coursedocs" method="post"><p>
+ ENDPASTE
+     $r->print('<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> ');
+     my $type;
+     if ($env{'docs.markedcopy_url'} =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?:&colon;|:))//} ) {
+ 	$type = &mt('External Resource');
+ 	$r->print($type.': '.
+ 		  &LONCAPA::map::qtescape($env{'docs.markedcopy_title'}).' ('.
+ 		  &LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')');
+     }  else {
+ 	my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1];
+ 	my $icon = &Apache::loncommon::icon($extension);
+ 	if ($extension eq 'sequence' &&
+ 	    $env{'docs.markedcopy_url'} =~ m{/default_\d+\.sequence$ }x) {
+ 	    $icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
+ 	    $icon .= '/folder_closed.gif';
+ 	}
+ 	$icon = '<img src="'.$icon.'" alt="" class="LC_icon" />';
+ 	$r->print($icon.$type.': '.  &parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'})));
+     }
+     if ($container eq 'page') {
+ 	$r->print('
+ 	<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />
+ 	<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />
+ ');
      } else {
+ 	$r->print('
+         <input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />
+ ');
+     }
+     $r->print('</p></form>');
+ }
+ sub do_paste_from_buffer {
+     my ($coursenum,$coursedom,$folder) = @_;
+     if (!$env{'form.pastemarked'}) {
+         return;
+     }
+ # paste resource to end of list
+     my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'});
+     my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title'});
+ # Maps need to be copied first
+     if (($url=~/\.(page|sequence)$/) && ($url=~/^\/uploaded\//)) {
+ 	$title=&mt('Copy of').' '.$title;
+ 	my $newid=$$.int(rand(100)).time;
+ 	my ($oldid,$ext) = ($url=~/^(.+)\.(\w+)$/);
+         if ($oldid =~ m{^(/uploaded/\Q$coursedom\E/\Q$coursenum\E/)(\D+)(\d+)$}) {
+             my $path = $1;
+             my $prefix = $2;
+             my $ancestor = $3;
+             if (length($ancestor) > 10) {
+                 $ancestor = substr($ancestor,-10,10);
+             }
+             $oldid = $path.$prefix.$ancestor;
+         }
+         my $counter = 0;
+         my $newurl=$oldid.$newid.'.'.$ext;
+         my $is_unique = &uniqueness_check($newurl);
+         while (!$is_unique && $counter < 100) {
+             $counter ++;
+             $newid ++;
+             $newurl = $oldid.$newid;
+             $is_unique = &uniqueness_check($newurl);
+         }
+         if (!$is_unique) {
+             if ($url=~/\.page$/) {
+                 return &mt('Paste failed: an error occurred creating a unique URL for the composite page');
+             } else {
+                 return &mt('Paste failed: an error occurred creating a unique URL for the folder');
+             }
+         }
+ 	my $storefn=$newurl;
+ 	$storefn=~s{^/\w+/$match_domain/$match_username/}{};
+ 	my $paste_map_result =
+             &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;
+     }
+ # published maps can only exists once, so remove it from paste buffer when done
+     if (($url=~/\.(page|sequence)$/) && ($url=~m {^/res/})) {
+ 	&Apache::lonnet::delenv('docs\\.markedcopy');
+     }
+     if ($url=~ m{/smppg$}) {
+ 	my $db_name = &Apache::lonsimplepage::get_db_name($url);
+ 	if ($db_name =~ /^smppage_/) {
+ 	    #simple pages, need to copy the db contents to a new one.
+ 	    my %contents=&Apache::lonnet::dump($db_name,$coursedom,$coursenum);
+ 	    my $now = time();
+ 	    $db_name =~ s{_\d*$ }{_$now}x;
+ 	    my $result=&Apache::lonnet::put($db_name,\%contents,
+ 					    $coursedom,$coursenum);
+ 	    $url =~ s{/(\d*)/smppg$ }{/$now/smppg}x;
+ 	    $title=&mt('Copy of').' '.$title;
+ 	}
+     }
+     $title = &LONCAPA::map::qtunescape($title);
+     my $ext='false';
+     if ($url=~m{^http(|s)://}) { $ext='true'; }
+     $url       = &LONCAPA::map::qtunescape($url);
+ # Now insert the URL at the bottom
+     my $newidx = &LONCAPA::map::getresidx($url);
+     if ($env{'docs.markedcopy_supplemental'}) {
+         if ($folder =~ /^supplemental/) {
+             $title = $env{'docs.markedcopy_supplemental'};
+         } else {
+             (undef,undef,$title) =
+                 &parse_supplemental_title($env{'docs.markedcopy_supplemental'});
+         }
+     } else {
+         if ($folder=~/^supplemental/) {
+            $title=time.'___&&&___'.$env{'user.name'}.'___&&&___'.
+                   $env{'user.domain'}.'___&&&___'.$title;
+         }
+     }
+     $LONCAPA::map::resources[$newidx]= 	$title.':'.$url.':'.$ext.':normal:res';
+     push(@LONCAPA::map::order, $newidx);
+     return 'ok';
+ # Store the result
+ }
+ sub uniqueness_check {
+     my ($newurl) = @_;
+     my $unique = 1;
+     foreach my $res (@LONCAPA::map::order) {
+         my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
+         $url=&LONCAPA::map::qtescape($url);
+         if ($newurl eq $url) {
+             $unique = 0;
+             last;
+         }
+     }
+     return $unique;
+ }
+ my %parameter_type = ( 'randompick'     => 'int_pos',
+ 		       'hiddenresource' => 'string_yesno',
+ 		       'encrypturl'     => 'string_yesno',
+ 		       'randomorder'    => 'string_yesno',);
+ my $valid_parameters_re = join('|',keys(%parameter_type));
+ # set parameters
+ sub update_parameter {
+     return 0 if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/);
+     my $which = $env{'form.changeparms'};
+     my $idx = $env{'form.setparms'};
+     if ($env{'form.'.$which.'_'.$idx}) {
+ 	my $value = ($which eq 'randompick') ? $env{'form.'.$which.'_'.$idx}
+ 	                                     : 'yes';
+ 	&LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $value,
+ 				      $parameter_type{$which});
+ 	&remember_parms($idx,$which,'set',$value);
+     } else {
+ 	&LONCAPA::map::delparameter($idx,'parameter_'.$which);
+ 	&remember_parms($idx,$which,'del');
+     }
+     return 1;
+ }
+ sub handle_edit_cmd {
+     my ($coursenum,$coursedom) =@_;
+     my ($cmd,$idx)=split('_',$env{'form.cmd'});
+     my $ratstr = $LONCAPA::map::resources[$LONCAPA::map::order[$idx]];
+     my ($title, $url, @rrest) = split(':', $ratstr);
+     if ($cmd eq 'del') {
+ 	if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
+ 	    ($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library|task)$/)) {
+ 	    &Apache::lonnet::removeuploadedurl($url);
+ 	} else {
+ 	    &LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
+ 	}
+ 	splice(@LONCAPA::map::order, $idx, 1);
+     } elsif ($cmd eq 'cut') {
+ 	&LONCAPA::map::makezombie($LONCAPA::map::order[$idx]);
+ 	splice(@LONCAPA::map::order, $idx, 1);
+     } elsif ($cmd eq 'up'
+ 	     && ($idx) && (defined($LONCAPA::map::order[$idx-1]))) {
+ 	@LONCAPA::map::order[$idx-1,$idx] = @LONCAPA::map::order[$idx,$idx-1];
+     } elsif ($cmd eq 'down'
+ 	     && defined($LONCAPA::map::order[$idx+1])) {
+ 	@LONCAPA::map::order[$idx+1,$idx] = @LONCAPA::map::order[$idx,$idx+1];
+     } elsif ($cmd eq 'rename') {
+ 	my $comment = &LONCAPA::map::qtunescape($env{'form.title'});
+ 	if ($comment=~/\S/) {
+ 	    $LONCAPA::map::resources[$LONCAPA::map::order[$idx]]=
+ 		$comment.':'.join(':', $url, @rrest);
+ 	}
+ # Devalidate title cache
+ 	my $renamed_url=&LONCAPA::map::qtescape($url);
+ 	&Apache::lonnet::devalidate_title_cache($renamed_url);
+     } else {
+ 	return 0;
+     }
+     return 1;
+ }
+ sub editor {
+     my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$type)=@_;
+     my $container= ($env{'form.pagepath'}) ? 'page'
+ 		                           : 'sequence';
+     my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
+ 				    $folder.'.'.$container);
+     return $errtext if ($fatal);
+     if ($#LONCAPA::map::order<1) {
+ 	my $idx=&LONCAPA::map::getresidx();
+ 	if ($idx<=0) { $idx=1; }
+        	$LONCAPA::map::order[0]=$idx;
+         $LONCAPA::map::resources[$idx]='';
+     }
+     my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order)=
+ 	&breadcrumbs($folder,$allowed,$type);
+     $r->print($breadcrumbtrail);
  # ------------------------------------------------------------ Process commands
  # ---------------- if they are for this folder and user allowed to make changes
- 	if (($allowed) && ($env{'form.folder'} eq $folder)) {
+     if (($allowed) && ($env{'form.folder'} eq $folder)) {
  # set parameters and change order
- 	    if (defined($env{'form.setparms'})) {
+ 	&snapshotbefore();
- 		my $idx=$env{'form.setparms'};
- # set parameters
+ 	if (&update_parameter()) {
- 		if ($env{'form.randpick_'.$idx}) {
+ 	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
- 		    &Apache::lonratedt::storeparameter($idx,'parameter_randompick',$env{'form.randpick_'.$idx},'int_pos');
+ 	    return $errtext if ($fatal);
- 		} else {
+ 	}
- 		    &Apache::lonratedt::delparameter($idx,'parameter_randompick');
- 		}
- 		if ($env{'form.hidprs_'.$idx}) {
- 		    &Apache::lonratedt::storeparameter($idx,'parameter_hiddenresource','yes','string_yesno');
- 		} else {
- 		    &Apache::lonratedt::delparameter($idx,'parameter_hiddenresource');
- 		}
- 		if ($env{'form.encprs_'.$idx}) {
- 		    &Apache::lonratedt::storeparameter($idx,'parameter_encrypturl','yes','string_yesno');
- 		} else {
- 		    &Apache::lonratedt::delparameter($idx,'parameter_encrypturl');
- 		}
- 		if ($env{'form.newpos'}) {
+ 	if ($env{'form.newpos'} && $env{'form.currentpos'}) {
  # change order
+ 	    my $res = splice(@LONCAPA::map::order,$env{'form.currentpos'}-1,1);
+ 	    splice(@LONCAPA::map::order,$env{'form.newpos'}-1,0,$res);
- 		    my $newpos=$env{'form.newpos'}-1;
+ 	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
- 		    my $currentpos=$env{'form.currentpos'}-1;
+ 	    return $errtext if ($fatal);
- 		    my $i;
+ 	}
- 		    my @neworder=();
- 		    if ($newpos>$currentpos) {
+ 	if ($env{'form.pastemarked'}) {
- # moving stuff up
+             my $paste_res =
- 			for ($i=0;$i<$currentpos;$i++) {
+                 &do_paste_from_buffer($coursenum,$coursedom,$folder);
- 			    $neworder[$i]=$Apache::lonratedt::order[$i];
+             if ($paste_res eq 'ok') {
- 			}
+                 ($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container);
- 			for ($i=$currentpos;$i<$newpos;$i++) {
+                 return $errtext if ($fatal);
- 			    $neworder[$i]=$Apache::lonratedt::order[$i+1];
+             } elsif ($paste_res ne '') {
- 			}
+                 $r->print('<p><span class="LC_error">'.$paste_res.'</span></p>');
-                         $neworder[$newpos]=$Apache::lonratedt::order[$currentpos];
+             }
- 			for ($i=$newpos+1;$i<=$#Apache::lonratedt::order;$i++) {
+ 	}
- 			    $neworder[$i]=$Apache::lonratedt::order[$i];
- 			}
- 		    } else {
- # moving stuff down
- 			for ($i=0;$i<$newpos;$i++) {
- 			    $neworder[$i]=$Apache::lonratedt::order[$i];
- 			}
- 			$neworder[$newpos]=$Apache::lonratedt::order[$currentpos];
- 			for ($i=$newpos+1;$i<$currentpos+1;$i++) {
- 			    $neworder[$i]=$Apache::lonratedt::order[$i-1];
- 			}
- 			for ($i=$currentpos+1;$i<=$#Apache::lonratedt::order;$i++) {
- 			    $neworder[$i]=$Apache::lonratedt::order[$i];
- 			}
- 		    }
- 		    @Apache::lonratedt::order=@neworder;
- 		}
- # store the changed version
- 		($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
+ 	$r->print($upload_output);
- 		if ($fatal) {
- 		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
+ 	if (&handle_edit_cmd()) {
- 		    return;
+ 	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
+ 	    return $errtext if ($fatal);
+ 	}
+ # Group import/search
+ 	if ($env{'form.importdetail'}) {
+ 	    my @imports;
+ 	    foreach my $item (split(/\&/,$env{'form.importdetail'})) {
+ 		if (defined($item)) {
+ 		    my ($name,$url,$residx)=
+ 			map {&unescape($_)} split(/\=/,$item);
+ 		    push(@imports, [$name, $url, $residx]);
  		}
  	    }
- 	    if ($env{'form.pastemarked'}) {
+ 	    ($errtext,$fatal)=&group_import($coursenum, $coursedom, $folder,
- # paste resource to end of list
+ 					    $container,'londocs',@imports);
-                 my $url=$env{'form.markedcopy_url'};
+ 	    return $errtext if ($fatal);
- 		my $title=$env{'form.markedcopy_title'};
+ 	}
- # Maps need to be copied first
+ # Loading a complete map
- 		if (($url=~/\.(page|sequence)$/) || ($url=~/^\/uploaded\//)) {
+ 	if ($env{'form.loadmap'}) {
- 		    $title=&mt('Copy of').' '.$title;
+ 	    if ($env{'form.importmap'}=~/\w/) {
-                     my $newid=$$.time;
+ 		foreach my $res (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) {
- 		    $url=~/^(.+)\.(\w+)$/;
+ 		    my ($title,$url,$ext,$type)=split(/\:/,$res);
- 		    my $newurl=$1.$newid.'.'.$2;
+ 		    my $idx=&LONCAPA::map::getresidx($url);
- 		    my $storefn=$newurl;
+ 		    $LONCAPA::map::resources[$idx]=$res;
-                     $storefn=~s/^\/\w+\/\w+\/\w+\///;
+ 		    $LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx;
- 		    &Apache::loncreatecourse::writefile
- 			($env{'request.course.id'},$storefn,
- 			 &Apache::lonnet::getfile($url));
- 		    $url=$newurl;
- 		}
- 		$title=~s/\</\&lt\;/g;
- 		$title=~s/\>/\&gt\;/g;
- 		$title=~s/\:/\&colon;/g;
- 		my $ext='false';
- 		if ($url=~/^http\:\/\//) { $ext='true'; }
- 		$url=~s/\:/\&colon;/g;
- # Now insert the URL at the bottom
-                 my $newidx=&Apache::lonratedt::getresidx($url);
- 		$Apache::lonratedt::resources[$newidx]=
- 		    $title.':'.$url.':'.$ext.':normal:res';
- 		$Apache::lonratedt::order[1+$#Apache::lonratedt::order]=$newidx;
- # Store the result
- 		($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
- 		if ($fatal) {
- 		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
- 		    return;
  		}
- 	    }
-             $r->print($upload_output);
- 	    if ($env{'form.cmd'}) {
-                 my ($cmd,$idx)=split(/\_/,$env{'form.cmd'});
-                 if ($cmd eq 'del') {
- 		    my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]);
- 		    if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
- 			($url!~/\.(page|sequence|problem|exam|quiz|assess|survey|form|library)$/)) {
- 			&Apache::lonnet::removeuploadedurl($url);
- 		    } else {
- 			&Apache::lonratedt::makezombie($Apache::lonratedt::order[$idx]);
- 		    }
- 		    for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) {
-                         $Apache::lonratedt::order[$i]=
-                           $Apache::lonratedt::order[$i+1];
-                     }
-                     $#Apache::lonratedt::order--;
-                 } elsif ($cmd eq 'cut') {
- 		    my (undef,$url)=split(':',$Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]]);
- 		    &Apache::lonratedt::makezombie($Apache::lonratedt::order[$idx]);
- 		    for (my $i=$idx;$i<$#Apache::lonratedt::order;$i++) {
-                         $Apache::lonratedt::order[$i]=
-                           $Apache::lonratedt::order[$i+1];
-                     }
-                     $#Apache::lonratedt::order--;
-                 } elsif ($cmd eq 'up') {
- 		  if (($idx) && (defined($Apache::lonratedt::order[$idx-1]))) {
-                     my $i=$Apache::lonratedt::order[$idx-1];
-                     $Apache::lonratedt::order[$idx-1]=
- 			$Apache::lonratedt::order[$idx];
-                     $Apache::lonratedt::order[$idx]=$i;
- 		   }
-                 } elsif ($cmd eq 'down') {
- 		   if (defined($Apache::lonratedt::order[$idx+1])) {
-                     my $i=$Apache::lonratedt::order[$idx+1];
-                     $Apache::lonratedt::order[$idx+1]=
- 			$Apache::lonratedt::order[$idx];
-                     $Apache::lonratedt::order[$idx]=$i;
- 		   }
-                 } elsif ($cmd eq 'rename') {
-                     my $ratstr = $Apache::lonratedt::resources[$Apache::lonratedt::order[$idx]];
-                     my ($rtitle,@rrest)=split(/\:/,
-                        $Apache::lonratedt::resources[
- 				       $Apache::lonratedt::order[$idx]]);
-                     my $comment=
-                      &HTML::Entities::decode($env{'form.title'});
-                     $comment=~s/\</\&lt\;/g;
-                     $comment=~s/\>/\&gt\;/g;
-                     $comment=~s/\:/\&colon;/g;
- 		    if ($comment=~/\S/) {
- 			$Apache::lonratedt::resources[
- 				       $Apache::lonratedt::order[$idx]]=
- 				            $comment.':'.join(':',@rrest);
- 		    }
-                 }
- # Store the changed version
  		($errtext,$fatal)=&storemap($coursenum,$coursedom,
  					    $folder.'.'.$container);
- 		if ($fatal) {
+ 		return $errtext if ($fatal);
- 		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
+ 	    } else {
- 		    return;
+ 		$r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>');
- 		}
-             }
- # Group import/search
- 	    if ($env{'form.importdetail'}) {
- 		my @imports;
- 		foreach (split(/\&/,$env{'form.importdetail'})) {
- 		    if (defined($_)) {
- 			my ($name,$url)=split(/\=/,$_);
- 			$name=&Apache::lonnet::unescape($name);
- 			$url=&Apache::lonnet::unescape($url);
- 			push @imports, $name, $url;
- 		    }
- 		}
- # Store the changed version
- 		($errtext,$fatal)=group_import($coursenum, $coursedom, $folder,
- 					       $container,'londocs',@imports);
- 		if ($fatal) {
- 		    $r->print('<p><font color="red">'.$errtext.'</font></p>');
- 		    return;
- 		}
-             }
- # Loading a complete map
- 	   if (($env{'form.importmap'}) && ($env{'form.loadmap'})) {
- 	       foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$env{'form.importmap'}))) {
- 		   my ($title,$url,$ext,$type)=split(/\:/,$_);
-                    my $idx=&Apache::lonratedt::getresidx($url);
-                    $Apache::lonratedt::resources[$idx]=$_;
-                    $Apache::lonratedt::order
- 		       [$#Apache::lonratedt::order+1]=$idx;
- 	       }
- # Store the changed version
- 	       ($errtext,$fatal)=&storemap($coursenum,$coursedom,
- 					   $folder.'.'.$container);
- 	       if ($fatal) {
- 		   $r->print('<p><font color="red">'.$errtext.'</font></p>');
- 		   return;
- 	       }
-            }
-        }
- # ---------------------------------------------------------------- End commands
- # ---------------------------------------------------------------- Print screen
-         my $idx=0;
- 	my $shown=0;
-         $r->print('<table>');
-         foreach (@Apache::lonratedt::order) {
-            my ($name,$url)=split(/\:/,$Apache::lonratedt::resources[$_]);
-            unless ($name) {  $name=(split(/\//,$url))[-1]; }
-            unless ($name) { $idx++; next; }
-            $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_,$coursenum));
-            $idx++;
- 	   $shown++;
-         }
- 	unless ($shown) {
- 	    $r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>');
- 	}
-         $r->print("\n</table>\n");
- 	if ($env{'form.markedcopy_url'}) {
- 	    $r->print(<<ENDPASTE);
- <p><form name="pasteform" action="/adm/coursedocs" method="post">
- <input type="hidden" name="markedcopy_url" value="$env{'form.markedcopy_url'}" />
- <input type="hidden" name="markedcopy_title" value="$env{'form.markedcopy_title'}" />
- ENDPASTE
-             $r->print(
- 	   '<input type="submit" name="pastemarked" value="'.&mt('Paste').
- 		      '" /> '.&Apache::loncommon::filedescription(
- 		(split(/\./,$env{'form.markedcopy_url'}))[-1]).': '.
- 		      $env{'form.markedcopy_title'});
-             if ($container eq 'page') {
- 		$r->print(<<PAGEINFO);
- <input type="hidden" name="pagepath" value="$env{'form.pagepath'}" />
- <input type="hidden" name="pagesymb" value="$env{'form.pagesymb'}" />
- PAGEINFO
-             } else {
- 		$r->print(<<FOLDERINFO);
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
- FOLDERINFO
  	    }
- 	    $r->print('</form></p>');
  	}
+ 	&log_differences($plain);
+     }
+ # ---------------------------------------------------------------- End commands
+ # ---------------------------------------------------------------- Print screen
+     my $idx=0;
+     my $shown=0;
+     if (($ishidden) || ($isencrypted) || ($randompick>=0) || ($is_random_order)) {
+ 	$r->print('<p>'.&mt('Parameters').':<ul>'.
+ 		  ($randompick>=0?'<li>'.&mt('randomly pick [_1] resources',$randompick).'</li>':'').
+ 		  ($ishidden?'<li>'.&mt('contents hidden').'</li>':'').
+ 		  ($isencrypted?'<li>'.&mt('URLs hidden').'</li>':'').
+ 		  '</ul></p>');
+     }
+     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>');
+     }
+     if ($is_random_order) {
+ 	$r->print('<p>'.&mt('Caution: this folder is set to randomly order its contents. Adding or removing resources from this folder will change the order of resources shown.').'</p>');
+     }
+     $r->print('<table class="LC_docs_editor">');
+     foreach my $res (@LONCAPA::map::order) {
+ 	my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
+ 	$name=&LONCAPA::map::qtescape($name);
+ 	$url=&LONCAPA::map::qtescape($url);
+ 	unless ($name) {  $name=(split(/\//,$url))[-1]; }
+ 	unless ($name) { $idx++; next; }
+ 	$r->print(&entryline($idx,$name,$url,$folder,$allowed,$res,
+ 			     $coursenum));
+ 	$idx++;
+ 	$shown++;
+     }
+     unless ($shown) {
+ 	$r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>');
      }
+     $r->print("\n</table>\n");
+     if ($allowed) {
+         &print_paste_buffer($r,$container);
+     }
+     return;
  }
  sub process_file_upload {
- Line 1195  sub process_file_upload {
+ Line 1606  sub process_file_upload {
          }
          ($errtext,$fatal)=
                &mapread($coursenum,$coursedom,$folder.'.'.$container);
-         if ($#Apache::lonratedt::order<1) {
+         if ($#LONCAPA::map::order<1) {
-             $Apache::lonratedt::order[0]=1;
+             $LONCAPA::map::order[0]=1;
-             $Apache::lonratedt::resources[1]='';
+             $LONCAPA::map::resources[1]='';
          }
          if ($fatal) {
              return 'failed';
- Line 1213  sub process_file_upload {
+ Line 1624  sub process_file_upload {
          }
  # this is for a course, not a user, so set coursedoc flag
  # probably the only place in the system where this should be "1"
-         my $newidx=&Apache::lonratedt::getresidx();
+         my $newidx=&LONCAPA::map::getresidx();
          $destination .= $newidx;
          my $url=&Apache::lonnet::userfileupload('uploaddoc',1,$destination,
  						$parseaction,$allfiles,
  						$codebase);
          my $ext='false';
-         if ($url=~/^http\:\/\//) { $ext='true'; }
+         if ($url=~m{^http://}) { $ext='true'; }
-         $url=~s/\:/\&colon;/g;
+ 	$url     = &LONCAPA::map::qtunescape($url);
          my $comment=$env{'form.comment'};
-         $comment=~s/\</\&lt\;/g;
+ 	$comment = &LONCAPA::map::qtunescape($comment);
-         $comment=~s/\>/\&gt\;/g;
-         $comment=~s/\:/\&colon;/g;
          if ($folder=~/^supplemental/) {
                $comment=time.'___&&&___'.$env{'user.name'}.'___&&&___'.
                    $env{'user.domain'}.'___&&&___'.$comment;
          }
-         $Apache::lonratedt::resources[$newidx]=
+         $LONCAPA::map::resources[$newidx]=
-                   $comment.':'.$url.':'.$ext.':normal:res';
+ 	    $comment.':'.$url.':'.$ext.':normal:res';
-         $Apache::lonratedt::order[$#Apache::lonratedt::order+1]= $newidx;
+         $LONCAPA::map::order[$#LONCAPA::map::order+1]= $newidx;
          ($errtext,$fatal)=&storemap($coursenum,$coursedom,
  				    $folder.'.'.$container);
          if ($fatal) {
-             $$upload_output .= '<p><font color="red">'.$errtext.'</font></p>';
+             $$upload_output .= '<p><span class="LC_error">'.$errtext.'</span></p>';
              return 'failed';
          } else {
              if ($parseaction eq 'parse') {
                  my $total_embedded = keys(%{$allfiles});
                  if ($total_embedded > 0) {
                      my $num = 0;
-                     $$upload_output .= 'This file contains embedded multimedia objects, which need to be uploaded to LON-CAPA.<br />
+ 		    my $state = '
-    <form name="upload_embedded" action="/adm/coursedocs"
+    <input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />
-                   method="post" enctype="multipart/form-data">
+    <input type="hidden" name="cmd" value="upload_embedded" />
-    <input type="hidden" name="folderpath" value="'.$env{'form.folderpath'}.'" />   <input type="hidden" name="cmd" value="upload_embedded" />
     <input type="hidden" name="newidx" value="'.$newidx.'" />
-    <input type="hidden" name="primaryurl" value="'.&Apache::lonnet::escape($url).'" />
+    <input type="hidden" name="primaryurl" value="'.&escape($url).'" />
     <input type="hidden" name="phasetwo" value="'.$total_embedded.'" />';
-                     $$upload_output .= '<b>Upload embedded files</b>:<br />
+ 		    $phase_status = 'phasetwo';
-    <table>';
-                     foreach my $embed_file (keys(%{$allfiles})) {
+                     $$upload_output .=
-                         $$upload_output .= '<tr><td>'.$embed_file.
+ 			'This file contains embedded multimedia objects, which need to be uploaded to LON-CAPA.<br />'.
-           '<input name="embedded_item_'.$num.'" type="file" />
+ 			&Apache::loncommon::ask_for_embedded_content(
-            <input name="embedded_orig_'.$num.'" type="hidden" value="'.&Apache::lonnet::escape($embed_file).'" />';
+                             '/adm/coursedocs',$state,$allfiles,$codebase);
-                         my $attrib;
-                         if (@{$$allfiles{$embed_file}} > 1) {
-                             $attrib = join(':',@{$$allfiles{$embed_file}});
-                         } else {
-                             $attrib = $$allfiles{$embed_file}[0];
-                         }
-                         $$upload_output .=
-            '<input name="embedded_attrib_'.$num.'" type="hidden" value="'.$attrib.'" />';
-                         if (exists($$codebase{$embed_file})) {
-                             $$upload_output .=
-           '<input name="codebase_'.$num.'" type="hidden" value="'.&Apache::lonnet::escape($$codebase{$embed_file}).'" />';
-                         }
-                         $$upload_output .= '</td></tr>';
-                         $num ++;
-                     }
-                     $phase_status = 'phasetwo';
-                     $$upload_output .= '</table><br />
-    <input type ="submit" value="Complete upload" />
-    </form>';
                  } else {
                      $$upload_output .= 'No embedded items identified<br />';
                  }
- Line 1294  sub process_secondary_uploads {
+ Line 1683  sub process_secondary_uploads {
      if (($folder eq 'default') || ($folder eq 'supplemental')) {
          $destination .= 'default/';
      } elsif ($folder =~ /^(default|supplemental)_(\d+)$/) {
-         $destination .=  $1.'/';
+         $destination .=  $2.'/';
      }
      $destination .= $newidx;
      my ($url,$filename);
      $url=&Apache::lonnet::userfileupload($formname.$num,1,$destination);
-     ($filename) = ($url =~ m-^/uploaded/$coursedom/$coursenum/$destination/(.+)$-);
+     ($filename) = ($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/\Q$destination\E/(.+)$});
      return $filename;
  }
+ sub is_supplemental_title {
+     my ($title) = @_;
+     return scalar($title =~ m/^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/);
+ }
+ sub parse_supplemental_title {
+     my ($title) = @_;
+     my ($foldertitle,$renametitle);
+     if ($title =~ /&amp;&amp;&amp;/) {
+ 	$title = &HTML::Entites::decode($title);
+     }
+  if ($title =~ m/^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/) {
+ 	$renametitle=$4;
+ 	my ($time,$uname,$udom) = ($1,$2,$3);
+ 	$foldertitle=&Apache::lontexconvert::msgtexconverted($4);
+ 	my $name =  &Apache::loncommon::plainname($uname,$udom);
+ 	$name = &HTML::Entities::encode($name,'"<>&\'');
+ 	$title='<i>'.&Apache::lonlocal::locallocaltime($time).'</i> '.
+ 	    $name.': <br />'.$foldertitle;
+     }
+     if (wantarray) {
+ 	return ($title,$foldertitle,$renametitle);
+     }
+     return $title;
+ }
  # --------------------------------------------------------------- An entry line
  sub entryline {
      my ($index,$title,$url,$folder,$allowed,$residx,$coursenum)=@_;
-     $title=~s/\&colon\;/\:/g;
-     $title=&HTML::Entities::encode(&HTML::Entities::decode(
+     my ($foldertitle,$pagetitle,$renametitle);
-      &Apache::lonnet::unescape($title)),'"<>&\'');
+     if (&is_supplemental_title($title)) {
-     my $renametitle=$title;
+ 	($title,$foldertitle,$renametitle) = &parse_supplemental_title($title);
-     my $foldertitle=$title;
+ 	$pagetitle = $foldertitle;
-     my $pagetitle=$title;
+     } else {
-     my $orderidx=$Apache::lonratedt::order[$index];
+ 	$title=&HTML::Entities::encode($title,'"<>&\'');
-     if ($title=~ /^(\d+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(\w+)___&amp;&amp;&amp;___(.*)$/	) {
+ 	$renametitle=$title;
- 	$foldertitle=&Apache::lontexconvert::msgtexconverted($4);
+ 	$foldertitle=$title;
- 	$renametitle=$4;
+ 	$pagetitle=$title;
- 	$title='<i>'.&Apache::lonlocal::locallocaltime($1).'</i> '.
- 	    &Apache::loncommon::plainname($2,$3).': <br />'.
- 	    $foldertitle;
      }
+     my $orderidx=$LONCAPA::map::order[$index];
+     $renametitle=~s/\\/\\\\/g;
      $renametitle=~s/\&quot\;/\\\"/g;
+     $renametitle=~s/ /%20/g;
      my $line='<tr>';
+     my ($form_start,$form_end);
  # Edit commands
-     my $container;
+     my ($container, $type, $esc_path, $path, $symb);
-     my $folderpath;
      if ($env{'form.folderpath'}) {
+ 	$type = 'folder';
          $container = 'sequence';
- 	$folderpath=&Apache::lonnet::escape($env{'form.folderpath'});
+ 	$esc_path=&escape($env{'form.folderpath'});
+ 	$path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
  	# $htmlfoldername=&HTML::Entities::encode($env{'form.foldername'},'<>&"');
      }
-     my ($pagepath,$pagesymb);
      if ($env{'form.pagepath'}) {
-         $container = 'page';
+         $type = $container = 'page';
-         $pagepath=&Apache::lonnet::escape($env{'form.pagepath'});
+         $esc_path=&escape($path = $env{'form.pagepath'});
-         $pagesymb=&Apache::lonnet::escape($env{'form.pagesymb'});
+ 	$path = &HTML::Entities::encode($env{'form.pagepath'},'<>&"');
+         $symb=&escape($env{'form.pagesymb'});
      }
      my $cpinfo='';
-     if ($env{'form.markedcopy_url'}) {
-        $cpinfo='&markedcopy_url='.
-                &Apache::lonnet::escape($env{'form.markedcopy_url'}).
-                '&markedcopy_title='.
-                &Apache::lonnet::escape($env{'form.markedcopy_title'});
-     }
      if ($allowed) {
  	my $incindex=$index+1;
  	my $selectbox='';
  	if (($folder!~/^supplemental/) &&
- 	    ($#Apache::lonratedt::order>0) &&
+ 	    ($#LONCAPA::map::order>0) &&
  	    ((split(/\:/,
- 	     $Apache::lonratedt::resources[$Apache::lonratedt::order[0]]))[1]
+ 	     $LONCAPA::map::resources[$LONCAPA::map::order[0]]))[1]
  	     ne '') &&
  	    ((split(/\:/,
- 	     $Apache::lonratedt::resources[$Apache::lonratedt::order[1]]))[1]
+ 	     $LONCAPA::map::resources[$LONCAPA::map::order[1]]))[1]
  	     ne '')) {
  	    $selectbox=
  		'<input type="hidden" name="currentpos" value="'.$incindex.'" />'.
  		'<select name="newpos" onChange="this.form.submit()">';
- 	    for (my $i=1;$i<=$#Apache::lonratedt::order+1;$i++) {
+ 	    for (my $i=1;$i<=$#LONCAPA::map::order+1;$i++) {
  		if ($i==$incindex) {
  		    $selectbox.='<option value="" selected="1">('.$i.')</option>';
  		} else {
- Line 1374  sub entryline {
+ Line 1789  sub entryline {
                  'ct' => 'Cut',
  		'rn' => 'Rename',
  		'cp' => 'Copy');
-         if ($env{'form.pagepath'}) {
+ 	my $nocopy=0;
-             $line.=(<<END);
+         my $nocut=0;
- <form name="entry_$index" action="/adm/coursedocs" method="post">
+         if ($url=~/\.(page|sequence)$/) {
- <input type="hidden" name="pagepath" value="$env{'form.pagepath'}" />
+ 	    if ($url =~ m{/res/}) {
- <input type="hidden" name="pagesymb" value="$env{'form.pagesymb'}" />
+ 		# no copy for published maps
- <input type="hidden" name="markedcopy_url" value="$env{'form.markedcopy_url'}" />
+ 		$nocopy = 1;
- <input type="hidden" name="markedcopy_title" value="$env{'form.markedcopy_title'}" />
+ 	    } else {
- <input type="hidden" name="setparms" value="$orderidx" />
+ 		foreach my $item (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url),1)) {
- <td><table border='0' cellspacing='2' cellpadding='0'>
+ 		    my ($title,$url,$ext,$type)=split(/\:/,$item);
- <tr><td bgcolor="#DDDDDD">
+ 		    if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) {
- <a href='/adm/coursedocs?cmd=up_$index&pagepath=$pagepath&pagesymb=$pagesymb$cpinfo'>
+ 			$nocopy=1;
- <img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr>
+ 			last;
- <tr><td bgcolor="#DDDDDD">
+ 		    }
- <a href='/adm/coursedocs?cmd=down_$index&pagepath=$pagepath&pagesymb=$pagesymb$cpinfo'>
+ 		}
- <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr>
+ 	    }
- </table></td>
+ 	}
- <td>$selectbox
+         if ($url=~/^\/res\/lib\/templates\//) {
- </td><td bgcolor="#DDDDDD">
+            $nocopy=1;
- <a href='javascript:removeres("$pagepath","$index","$renametitle","page","$pagesymb");'>
+            $nocut=1;
- <font size="-2" color="#990000">$lt{'rm'}</font></a>
+         }
- <a href='javascript:cutres("$pagepath","$index","$renametitle","page","$pagesymb");'>
+         my $copylink='&nbsp;';
- <font size="-2" color="#550044">$lt{'ct'}</font></a>
+         my $cutlink='&nbsp;';
- <a href='javascript:changename("$pagepath","$index","$renametitle","page","$pagesymb");'>
- <font size="-2" color="#009900">$lt{'rn'}</font></a>
+ 	my $skip_confirm = 0;
- <a href='javascript:markcopy("$pagepath","$index","$renametitle","page","$pagesymb");'>
+ 	if ( $folder =~ /^supplemental/
- <font size="-2" color="#000099">$lt{'cp'}</font></a></td>
+ 	     || ($url =~ m{( /smppg$
+ 			    |/syllabus$
+ 			    |/aboutme$
+ 			    |/navmaps$
+ 			    |/bulletinboard$
+ 			    |\.html$
+ 			    |^/adm/wrapper/ext)}x)) {
+ 	    $skip_confirm = 1;
+ 	}
+ 	if (!$nocopy) {
+ 	    $copylink=(<<ENDCOPY);
+ <a href='javascript:markcopy("$esc_path","$index","$renametitle","$container","$symb","$folder");' class="LC_docs_copy">$lt{'cp'}</a>
+ ENDCOPY
+         }
+ 	if (!$nocut) {
+ 	    $cutlink=(<<ENDCUT);
+ <a href='javascript:cutres("$esc_path","$index","$renametitle","$container","$symb","$folder",$skip_confirm);' class="LC_docs_cut">$lt{'ct'}</a>
+ ENDCUT
+         }
+ 	$form_start = (<<END);
+    <form  action="/adm/coursedocs" method="post">
+    <input type="hidden" name="${type}path" value="$path" />
+    <input type="hidden" name="${type}symb" value="$symb" />
+    <input type="hidden" name="setparms" value="$orderidx" />
+    <input type="hidden" name="changeparms" value="0" />
  END
-         } else {
+         $form_end = '</form>';
-             $line.=(<<END);
+ 	$line.=(<<END);
- <form name="entry_$index" action="/adm/coursedocs" method="post">
+ <td>
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+    <table class="LC_docs_entry_move">
- <input type="hidden" name="markedcopy_url" value="$env{'form.markedcopy_url'}" />
+       <tr>
- <input type="hidden" name="markedcopy_title" value="$env{'form.markedcopy_title'}" />
+          <td>
- <input type="hidden" name="setparms" value="$orderidx" />
+             <a href='/adm/coursedocs?cmd=up_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb$cpinfo'><img src="${iconpath}move_up.gif" alt='$lt{'up'}' class="LC_icon" /></a>
- <td><table border='0' cellspacing='2' cellpadding='0'>
+          </td>
- <tr><td bgcolor="#DDDDDD">
+       </tr>
- <a href='/adm/coursedocs?cmd=up_$index&folderpath=$folderpath$cpinfo'>
+       <tr>
- <img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr>
+         <td>
- <tr><td bgcolor="#DDDDDD">
+            <a href='/adm/coursedocs?cmd=down_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb$cpinfo'><img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" /></a>
- <a href='/adm/coursedocs?cmd=down_$index&folderpath=$folderpath$cpinfo'>
+         </td>
- <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr>
+       </tr>
- </table></td>
+     </table>
- <td>$selectbox
+ </td>
- </td><td bgcolor="#DDDDDD">
+ <td>
- <a href='javascript:removeres("$folderpath","$index","$renametitle","sequence");'>
+    $form_start
- <font size="-2" color="#990000">$lt{'rm'}</font></a>
+    $selectbox
- <a href='javascript:cutres("$folderpath","$index","$renametitle","sequence");'>
+    $form_end
- <font size="-2" color="#550044">$lt{'ct'}</font></a>
+ </td>
- <a href='javascript:changename("$folderpath","$index","$renametitle","sequence");'>
+ <td class="LC_docs_entry_commands">
- <font size="-2" color="#009900">$lt{'rn'}</font></a>
+    <a href='javascript:removeres("$esc_path","$index","$renametitle","$container","$symb",$skip_confirm);' class="LC_docs_remove">$lt{'rm'}</a>
- <a href='javascript:markcopy("$folderpath","$index","$renametitle","sequence");'>
+ $cutlink
- <font size="-2" color="#000099">$lt{'cp'}</font></a></td>
+    <a href='javascript:changename("$esc_path","$index","$renametitle","$container","$symb");' class="LC_docs_rename">$lt{'rn'}</a>
+ $copylink
+ </td>
  END
-         }
      }
  # Figure out what kind of a resource this is
      my ($extension)=($url=~/\.(\w+)$/);
- Line 1441  END
+ Line 1883  END
      if ($uploaded) {
  	if ($extension eq 'sequence') {
  	    $icon=$iconpath.'/folder_closed.gif';
- 	    $url=~/$coursenum\/([\/\w]+)\.sequence$/;
+ 	    $url=~/\Q$coursenum\E\/([\/\w]+)\.sequence$/;
  	    $url='/adm/coursedocs?';
  	    $folderarg=$1;
  	    $isfolder=1;
          } elsif ($extension eq 'page') {
              $icon=$iconpath.'/page.gif';
-             $url=~/$coursenum\/([\/\w]+)\.page$/;
+             $url=~/\Q$coursenum\E\/([\/\w]+)\.page$/;
              $pagearg=$1;
              $url='/adm/coursedocs?';
              $ispage=1;
- Line 1455  END
+ Line 1897  END
  	    &Apache::lonnet::allowuploaded('/adm/coursedoc',$url);
  	}
      }
-     $url=~s/^http\&colon\;\/\//\/adm\/wrapper\/ext\//;
+     my $orig_url = $url;
+     my $external = ($url=~s{^http(|s)(&colon;|:)//}{/adm/wrapper/ext/});
      if ((!$isfolder) && ($residx) && ($folder!~/supplemental/) && (!$ispage)) {
  	my $symb=&Apache::lonnet::symbclean(
            &Apache::lonnet::declutter('uploaded/'.
- Line 1478  END
+ Line 1922  END
  	    }
  	} elsif ($url=~m|^/ext/|) {
  	    $url='/adm/wrapper'.$url;
+ 	    $external = 1;
  	}
- 	$url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb);
+         if (&Apache::lonnet::symbverify($symb,$url)) {
+ 	    $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
+         } else {
+             $url='';
+         }
  	if ($container eq 'page') {
  	    my $symb=$env{'form.pagesymb'};
  	    $url=&Apache::lonnet::clutter((&Apache::lonnet::decode_symb($symb))[2]);
- 	    $url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb);
+ 	    $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
  	}
      }
-     my $parameterset='&nbsp;';
+     my ($parameterset,$rand_order_text) = ('&nbsp;', '&nbsp;');
-     if ($isfolder) {
+     if ($isfolder || $extension eq 'sequence') {
- 	my $foldername=&Apache::lonnet::escape($foldertitle);
+ 	my $foldername=&escape($foldertitle);
  	my $folderpath=$env{'form.folderpath'};
  	if ($folderpath) { $folderpath.='&' };
- 	$folderpath.=$folderarg.'&'.$foldername;
+ # Append randompick number, hidden, and encrypted with ":" to foldername,
- 	$url.='folderpath='.&Apache::lonnet::escape($folderpath).$cpinfo;
+ # so it gets transferred between levels
+ 	$folderpath.=$folderarg.'&'.$foldername.':'.(&LONCAPA::map::getparameter($orderidx,
+                                               'parameter_randompick'))[0]
+                                                .':'.((&LONCAPA::map::getparameter($orderidx,
+                                               'parameter_hiddenresource'))[0]=~/^yes$/i)
+                                                .':'.((&LONCAPA::map::getparameter($orderidx,
+                                               'parameter_encrypturl'))[0]=~/^yes$/i)
+                                                .':'.((&LONCAPA::map::getparameter($orderidx,
+                                               'parameter_randomorder'))[0]=~/^yes$/i);
+ 	$url.='folderpath='.&escape($folderpath).$cpinfo;
  	$parameterset='<label>'.&mt('Randomly Pick: ').
- 	    '<input type="text" size="4" onChange="this.form.submit()" name="randpick_'.$orderidx.'" value="'.
+ 	    '<input type="text" size="4" onChange="this.form.changeparms.value='."'randompick'".';this.form.submit()" name="randompick_'.$orderidx.'" value="'.
- 	    (&Apache::lonratedt::getparameter($orderidx,
+ 	    (&LONCAPA::map::getparameter($orderidx,
                                                'parameter_randompick'))[0].
                                                '" />'.
- '<font size="-2"><a href="javascript:void(0)">'.&mt('Store').'</a></font></label>';
+ '<a href="javascript:void(0)">'.&mt('Save').'</a></label>';
+     	my $ro_set=
+ 	    ((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i?' checked="checked"':'');
+ 	$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>';
      }
      if ($ispage) {
-         my $pagename=&Apache::lonnet::escape($pagetitle);
+         my $pagename=&escape($pagetitle);
          my $pagepath;
          my $folderpath=$env{'form.folderpath'};
          if ($folderpath) { $pagepath = $folderpath.'&' };
- Line 1517  END
+ Line 1978  END
  					       $residx,
  					       $path.$pagearg.'.page');
  	}
- 	$url.='pagepath='.&Apache::lonnet::escape($pagepath).
+ 	$url.='pagepath='.&escape($pagepath).
- 	    '&pagesymb='.&Apache::lonnet::escape($symb).$cpinfo;
+ 	    '&amp;pagesymb='.&escape($symb).$cpinfo;
+     }
+     if ($external) {
+ 	my $form = ($folder =~ /^default/)? 'newext' : 'supnewext';
+ 	$external = '&nbsp;<a class="LC_docs_ext_edit" href="javascript:edittext(\''.$form.'\',\''.$residx.'\',\''.&escape($title).'\',\''.&escape($orig_url).'\');" >'.&mt('Edit').'</a>';
+     } else {
+ 	undef($external);
      }
-     $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.
+     $line.='
- 	'" border="0"></a></td>'.
+   <td class="LC_docs_entry_icon">
-         "<td bgcolor='#FFFFBB'><a href='$url'>$title</a></td>";
+     '.($url?'<a href="'.$url.'">':'').'<img src="'.$icon.'" alt="" class="LC_icon" />'.($url?'</a>':'').'
+   </td>
+   <td class="LC_docs_entry_title">
+     '.($url?"<a href=\"$url\">":'').$title.($url?'</a>':' <span class="LC_docs_reinit_warn">'.&mt('(re-initialize course to access)').'</span>').$external."
+   </td>";
      if (($allowed) && ($folder!~/^supplemental/)) {
   	my %lt=&Apache::lonlocal::texthash(
   			      'hd' => 'Hidden',
   			      'ec' => 'URL hidden');
  	my $enctext=
- 	    ((&Apache::lonratedt::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="1"':'');
+ 	    ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="1"':'');
  	my $hidtext=
- 	    ((&Apache::lonratedt::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':'');
+ 	    ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':'');
  	$line.=(<<ENDPARMS);
- <td bgcolor="#BBBBFF"><font size='-2'>
+   <td class="LC_docs_entry_parameter">
- <nobr><label><input type="checkbox" name="hidprs_$orderidx" onClick="this.form.submit()" $hidtext /> $lt{'hd'}</label></nobr></td>
+     $form_start
- <td bgcolor="#BBBBFF"><font size='-2'>
+     <label><input type="checkbox" name="hiddenresource_$orderidx" onClick="this.form.changeparms.value='hiddenresource';this.form.submit()" $hidtext /> $lt{'hd'}</label>
- <nobr><label><input type="checkbox" name="encprs_$orderidx" onClick="this.form.submit()" $enctext /> $lt{'ec'}</label></nobr></td>
+     $form_end
- <td bgcolor="#BBBBFF"><font size="-2">$parameterset</font></td>
+   </td>
+   <td class="LC_docs_entry_parameter">
+     $form_start
+     <label><input type="checkbox" name="encrypturl_$orderidx" onClick="this.form.changeparms.value='encrypturl';this.form.submit()" $enctext /> $lt{'ec'}</label>
+     $form_end
+   </td>
+   <td class="LC_docs_entry_parameter">$form_start $rand_order_text $form_end</td>
+   <td class="LC_docs_entry_parameter">$form_start $parameterset $form_end</td>
  ENDPARMS
      }
-     $line.="</form></tr>";
+     $line.="</tr>";
      return $line;
  }
- # ---------------------------------------------------------------- tie the hash
+ =pod
+ =item tiehash()
+ tie the hash
+ =cut
  sub tiehash {
      my ($mode)=@_;
- Line 1566  sub tiehash {
+ Line 2050  sub tiehash {
  sub untiehash {
      if ($hashtied) { untie %hash; }
      $hashtied=0;
+     return OK;
  }
- # --------------------------------------------------------------- check on this
  sub checkonthis {
      my ($r,$url,$level,$title)=@_;
-     $url=&Apache::lonnet::unescape($url);
+     $url=&unescape($url);
      $alreadyseen{$url}=1;
      $r->rflush();
      if (($url) && ($url!~/^\/uploaded\//) && ($url!~/\*$/)) {
         $r->print("\n<br />");
+        if ($level==0) {
+            $r->print("<br />");
+        }
         for (my $i=0;$i<=$level*5;$i++) {
             $r->print('&nbsp;');
         }
- Line 1586  sub checkonthis {
+ Line 2075  sub checkonthis {
  	  my $result=&Apache::lonnet::repcopy(
                                &Apache::lonnet::filelocation('',$url));
            if ($result eq 'ok') {
-              $r->print('<font color="green">'.&mt('ok').'</font>');
+              $r->print('<span class="LC_success">'.&mt('ok').'</span>');
               $r->rflush();
               &Apache::lonnet::countacc($url);
               $url=~/\.(\w+)$/;
- Line 1596  sub checkonthis {
+ Line 2085  sub checkonthis {
                   for (my $i=0;$i<=$level*5;$i++) {
                       $r->print('&nbsp;');
                   }
-                  $r->print('- '.&mt('Rendering').': ');
+                  $r->print('- '.&mt('Rendering:').' ');
  		 my ($errorcount,$warningcount)=split(/:/,
  	       &Apache::lonnet::ssi_body($url,
  			       ('grade_target'=>'web',
- Line 1604  sub checkonthis {
+ Line 2093  sub checkonthis {
                   if (($errorcount) ||
                       ($warningcount)) {
  		     if ($errorcount) {
-                         $r->print('<img src="/adm/lonMisc/bomb.gif" /><font color="red"><b>'.
+                         $r->print('<img src="/adm/lonMisc/bomb.gif" /><span class="LC_error">'.
- 			  $errorcount.' '.
+                           &mt('[quant,_1,error]',$errorcount).'</span>');
- 				  &mt('error(s)').'</b></font> ');
                       }
  		     if ($warningcount) {
-                         $r->print('<font color="blue">'.
+                         $r->print('<span class="LC_warning">'.
- 			  $warningcount.' '.
+                           &mt('[quant,_1,warning]',$warningcount).'</span>');
- 				  &mt('warning(s)').'</font>');
                       }
                   } else {
-                      $r->print('<font color="green">'.&mt('ok').'</font>');
+                      $r->print('<span class="LC_success">'.&mt('ok').'</span>');
                   }
                   $r->rflush();
               }
  	     my $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') {
-              $r->print('<font color="red"><b>'.&mt('connection down').'</b></font>');
+              $r->print('<span class="LC_error">'.&mt('connection down').'</span>');
            } elsif ($result eq 'not_found') {
  	      unless ($url=~/\$/) {
- 		  $r->print('<font color="red"><b>'.&mt('not found').'</b></font>');
+ 		  $r->print('<span class="LC_error">'.&mt('not found').'</b></span>');
  	      } else {
- 		  $r->print('<font color="yellow"><b>'.&mt('unable to verify variable URL').'</b></font>');
+ 		  $r->print('<span class="LC_unknown">'.&mt('unable to verify variable URL').'</span>');
  	      }
            } else {
-              $r->print('<font color="red"><b>'.&mt('access denied').'</b></font>');
+              $r->print('<span class="LC_error">'.&mt('access denied').'</span>');
            }
-       }
+        }
-    }
+     }
+ }
+ =pod
+ =item list_symbs()
+ List Symbs
+ =cut
+ sub list_symbs {
+     my ($r) = @_;
+     my $type = &Apache::loncommon::course_type();
+     $r->print(&Apache::loncommon::start_page('Symb List'));
+     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Symb List'));
+     my $navmap = Apache::lonnavmaps::navmap->new();
+     if (!defined($navmap)) {
+         $r->print('<h2>'.&mt('Retrieval of List Failed').'</h2>'.
+                   '<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('<a href="/adm/coursedocs">'.&mt('Return to DOCS').'</a>');
  }
- #
- # -------------------------------------------------------------- Verify Content
- #
  sub verifycontent {
-    my $r=shift;
+     my ($r) = @_;
+     my $type = &Apache::loncommon::course_type();
     my $loaderror=&Apache::lonnet::overloaderror($r);
     if ($loaderror) { return $loaderror; }
-    my $html=&Apache::lonxml::xmlbegin();
+    $r->print(&Apache::loncommon::start_page('Verify '.$type.' Documents'));
-    $r->print($html.'<head><title>Verify Content</title></head>'.
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$type.' Documents'));
-               &Apache::loncommon::bodytag('Verify Course Documents'));
     $hashtied=0;
     undef %alreadyseen;
     %alreadyseen=();
     &tiehash();
-    foreach (keys %hash) {
+    foreach my $key (keys(%hash)) {
-        if ($hash{$_}=~/\.(page|sequence)$/) {
+        if ($hash{$key}=~/\.(page|sequence)$/) {
- 	   if (($_=~/^src_/) && ($alreadyseen{&Apache::lonnet::unescape($hash{$_})})) {
+ 	   if (($key=~/^src_/) && ($alreadyseen{&unescape($hash{$key})})) {
- 	       $r->print('<hr /><font color="red">'.
+ 	       $r->print('<hr /><span class="LC_error">'.
- 			 &mt('The following sequence or page is included more than once in your course: ').
+ 			 &mt('The following sequence or page is included more than once in your '.$type.': ').
- 			 &Apache::lonnet::unescape($hash{$_}).'</font><br />'.
+ 			 &unescape($hash{$key}).'</span><br />'.
  			 &mt('Note that grading records for problems included in this sequence or folder will overlap.<hr />'));
  	   }
         }
-        if (($_=~/^src\_(.+)$/) && (!$alreadyseen{&Apache::lonnet::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();
- Line 1674  sub verifycontent {
+ Line 2191  sub verifycontent {
  }
- # -------------------------------------------------------------- Check Versions
  sub devalidateversioncache {
      my $src=shift;
      &Apache::lonnet::devalidate_cache_new('courseresversion',$env{'request.course.id'}.'_'.
- Line 1683  sub devalidateversioncache {
+ Line 2198  sub devalidateversioncache {
  }
  sub checkversions {
-     my $r=shift;
+     my ($r) = @_;
-     my $html=&Apache::lonxml::xmlbegin();
+     my $type = &Apache::loncommon::course_type();
-     $r->print($html.'<head><title>Check Versions</title></head>'.
+     $r->print(&Apache::loncommon::start_page("Check $type Document Versions"));
-               &Apache::loncommon::bodytag('Check Course Document Versions'));
+     $r->print(&Apache::lonhtmlcommon::breadcrumbs("Check $type Document Versions"));
      my $header='';
      my $startsel='';
      my $monthsel='';
- Line 1705  sub checkversions {
+ Line 2220  sub checkversions {
      my %newsetversions=();
      if ($env{'form.setmostrecent'}) {
  	$haschanged=1;
- 	foreach (keys %hash) {
+ 	foreach my $key (keys(%hash)) {
- 	    if ($_=~/^ids\_(\/res\/.+)$/) {
+ 	    if ($key=~/^ids\_(\/res\/.+)$/) {
  		$newsetversions{$1}='mostrecent';
                  &devalidateversioncache($1);
  	    }
  	}
      } elsif ($env{'form.setcurrent'}) {
  	$haschanged=1;
- 	foreach (keys %hash) {
+ 	foreach my $key (keys(%hash)) {
- 	    if ($_=~/^ids\_(\/res\/.+)$/) {
+ 	    if ($key=~/^ids\_(\/res\/.+)$/) {
  		my $getvers=&Apache::lonnet::getversion($1);
  		if ($getvers>0) {
  		    $newsetversions{$1}=$getvers;
- Line 1724  sub checkversions {
+ Line 2239  sub checkversions {
  	}
      } elsif ($env{'form.setversions'}) {
  	$haschanged=1;
- 	foreach (keys %env) {
+ 	foreach my $key (keys(%env)) {
- 	    if ($_=~/^form\.set_version_(.+)$/) {
+ 	    if ($key=~/^form\.set_version_(.+)$/) {
  		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);
  		}
  	    }
- Line 1738  sub checkversions {
+ Line 2253  sub checkversions {
          if (&Apache::lonnet::put('resourceversions',\%newsetversions,
  			  $env{'course.'.$env{'request.course.id'}.'.domain'},
  			  $env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') {
- 	    $r->print('<h1>'.&mt('Your Version Settings have been Stored').'</h1>');
+ 	    $r->print('<h1>'.&mt('Your Version Settings have been Saved').'</h1>');
  	} else {
- 	    $r->print('<h1><font color="red">'.&mt('An Error Occured while Attempting to Store your Version Settings').'</font></h1>');
+ 	    $r->print('<h1><span class="LC_error">'.&mt('An Error Occured while Attempting to Save your Version Settings').'</span></h1>');
  	}
  	&mark_hash_old();
      }
      &changewarning($r,'');
      if ($env{'form.timerange'} eq 'all') {
  # show all documents
- 	$header=&mt('All Documents in Course');
+ 	$header=&mt('All Documents in '.$type);
  	$allsel=1;
- 	foreach (keys %hash) {
+ 	foreach my $key (keys(%hash)) {
- 	    if ($_=~/^ids\_(\/res\/.+)$/) {
+ 	    if ($key=~/^ids\_(\/res\/.+)$/) {
  		my $src=$1;
  		$changes{$src}=1;
  	    }
- Line 1760  sub checkversions {
+ Line 2275  sub checkversions {
  	%changes=&Apache::lonnet::dump
  	 ('versionupdate',$env{'course.'.$env{'request.course.id'}.'.domain'},
                       $env{'course.'.$env{'request.course.id'}.'.num'});
- 	my $firstkey=(keys %changes)[0];
+ 	my $firstkey=(keys(%changes))[0];
  	unless ($firstkey=~/^error\:/) {
  	    unless ($env{'form.timerange'}) {
  		$env{'form.timerange'}=604800;
- Line 1792  sub checkversions {
+ Line 2307  sub checkversions {
  			  $env{'course.'.$env{'request.course.id'}.'.domain'},
  			  $env{'course.'.$env{'request.course.id'}.'.num'});
      my %lt=&Apache::lonlocal::texthash
- 	      ('st' => 'Version changes since start of Course',
+ 	      ('st' => 'Version changes since start of '.$type,
  	       'lm' => 'Version changes since last Month',
  	       'lw' => 'Version changes since last Week',
  	       'sy' => 'Version changes since Yesterday',
- Line 1801  sub checkversions {
+ Line 2316  sub checkversions {
  	       'fi' => 'File',
  	       'md' => 'Modification Date',
                 'mr' => 'Most recently published Version',
- 	       've' => 'Version used in Course',
+ 	       've' => 'Version used in '.$type,
-                'vu' => 'Set Version to be used in Course',
+                'vu' => 'Set Version to be used in '.$type,
- 'sv' => 'Set Versions to be used in Course according to Selections below',
+ 'sv' => 'Set Versions to be used in '.$type.' according to Selections below',
  'sm' => 'Keep all Resources up-to-date with most recent Versions (default)',
  'sc' => 'Set all Resource Versions to current Version (Fix Versions)',
  	       'di' => 'Differences');
- Line 1824  sub checkversions {
+ Line 2339  sub checkversions {
  <input type="submit" name="setversions" value="$lt{'sv'}" />
  <table border="0">
  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) {
  		$currentversion=&mt('Could not be determined.');
  	    }
- 	    my $linkurl=&Apache::lonnet::clutter($_);
+ 	    my $linkurl=&Apache::lonnet::clutter($key);
  	    $r->print(
  		      '<tr><td colspan="5"><br /><br /><font size="+1"><b>'.
  		      &Apache::lonnet::gettitle($linkurl).
- Line 1847  ENDHEADERS
+ Line 2362  ENDHEADERS
                                                       'lastrevisiondate')
                                                          ).
                        '</td>'.
-                       '<td title="'.$lt{'mr'}.'"><nobr>Most Recent: '.
+                       '<td title="'.$lt{'mr'}.'"><span class="LC_nobreak">Most Recent: '.
                        '<font size="+1">'.$currentversion.'</font>'.
-                       '</nobr></td>'.
+                       '</span></td>'.
-                       '<td title="'.$lt{'ve'}.'"><nobr>In Course: '.
+                       '<td title="'.$lt{'ve'}.'"><span class="LC_nobreak">In '.$type.': '.
                        '<font size="+1">');
  # Used in course
  	    my $usedversion=$hash{'version_'.$linkurl};
- Line 1859  ENDHEADERS
+ Line 2374  ENDHEADERS
  	    } else {
  		$r->print($currentversion);
  	    }
- 	    $r->print('</font></nobr></td><td title="'.$lt{'vu'}.'">'.
+ 	    $r->print('</font></span></td><td title="'.$lt{'vu'}.'">'.
-                       '<nobr>Use: ');
+                       '<span class="LC_nobreak">Use: ');
  # Set version
  	    $r->print(&Apache::loncommon::select_form($setversions{$linkurl},
  						      'set_version_'.$linkurl,
- Line 1869  ENDHEADERS
+ Line 2384  ENDHEADERS
  						       '' => '',
  						       'mostrecent' => 'most recent',
  						       map {$_,$_} (1..$currentversion))));
- 	    $r->print('</nobr></td></tr><tr><td></td>');
+ 	    $r->print('</span></td></tr><tr><td></td>');
  	    my $lastold=1;
  	    for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) {
  		my $url=$root.'.'.$prevvers.'.'.$extension;
- Line 1893  ENDHEADERS
+ Line 2408  ENDHEADERS
              my $cols_output = 1;
              for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) {
  		my $url=$root.'.'.$prevvers.'.'.$extension;
- 		$r->print('<nobr><a href="'.&Apache::lonnet::clutter($url).
+ 		$r->print('<span class="LC_nobreak"><a href="'.&Apache::lonnet::clutter($url).
  			  '">'.&mt('Version').' '.$prevvers.'</a> ('.
  			  &Apache::lonlocal::locallocaltime(
                                  &Apache::lonnet::metadata($url,
- Line 1906  ENDHEADERS
+ Line 2421  ENDHEADERS
  			      '&versionone='.$prevvers.
  			      '">'.&mt('Diffs').'</a>');
  		}
- 		$r->print('</nobr><br />');
+ 		$r->print('</span><br />');
                  if (++$entries_count % $entries_per_col == 0) {
                      $r->print('</font></td>');
                      if ($cols_output != 4) {
- Line 1954  sub changewarning {
+ Line 2469  sub changewarning {
      my ($r,$postexec,$message,$url)=@_;
      if (!&is_hash_old()) { return; }
      my $pathvar='folderpath';
-     my $path=&Apache::lonnet::escape($env{'form.folderpath'});
+     my $path=&escape($env{'form.folderpath'});
      if (!defined($url)) {
  	if (defined($env{'form.pagepath'})) {
  	    $pathvar='pagepath';
- 	    $path=&Apache::lonnet::escape($env{'form.pagepath'});
+ 	    $path=&escape($env{'form.pagepath'});
- 	    $path.='&amp;pagesymb='.&Apache::lonnet::escape($env{'form.pagesymb'});
+ 	    $path.='&amp;pagesymb='.&escape($env{'form.pagesymb'});
  	}
  	$url='/adm/coursedocs?'.$pathvar.'='.$path;
      }
+     my $course_type = &Apache::loncommon::course_type();
      if (!defined($message)) {
  	$message='Changes will become active for your current session after [_1], or the next time you log in.';
      }
      $r->print("\n\n".
- '<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'."\n".
+ '<script type="text/javascript">function reinit(tf) { tf.submit();'.$postexec.' }</script>'."\n".
  '<form name="reinitform" method="post" action="/adm/roles" target="loncapaclient">'.
  '<input type="hidden" name="orgurl" value="'.$url.
- '" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'.
+ '" /><input type="hidden" name="selectrole" value="1" /><h3><span class="LC_warning">'.
  &mt($message,' <input type="hidden" name="'.
      $env{'request.role'}.'" value="1" /><input type="button" value="'.
-     &mt('re-initializing course').'" onClick="reinit(this.form)" />').
+     &mt('re-initializing '.$course_type).'" onClick="reinit(this.form)" />').
- $help{'Caching'}.'</font></h3></form>'."\n\n");
+ $help{'Caching'}.'</span></h3></form>'."\n\n");
  }
- # ================================================================ Main Handler
+ sub init_breadcrumbs {
+     my ($form,$text)=@_;
+     &Apache::lonhtmlcommon::clear_breadcrumbs();
+     &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs",
+ 					    text=>"Edit ".&Apache::loncommon::course_type(),
+ 					    faq=>273,
+ 					    bug=>'Instructor Interface',
+                                             help => 'Docs_Adding_Course_Doc'});
+     &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs?".$form.'=1',
+ 					    text=>$text,
+ 					    faq=>273,
+ 					    bug=>'Instructor Interface'});
+ }
  sub handler {
      my $r = shift;
      &Apache::loncommon::content_type($r,'text/html');
      $r->send_http_header;
      return OK if $r->header_only;
+     my $type = &Apache::loncommon::course_type();
  # --------------------------------------------- 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
      $help{'Syllabus'} = &Apache::loncommon::help_open_topic(
  		    'Docs_About_Syllabus,Docs_Editing_Templated_Pages');
- Line 2004  sub handler {
+ Line 2539  sub handler {
  		    'Docs_About_Bulletin_Board,Docs_Editing_Templated_Pages');
      $help{'My Personal Info'} = &Apache::loncommon::help_open_topic(
  		  'Docs_About_My_Personal_Info,Docs_Editing_Templated_Pages');
+     $help{'Group Files'} = &Apache::loncommon::help_open_topic('Docs_About_Group_Files');
      $help{'Caching'} = &Apache::loncommon::help_open_topic('Caching');
-   if ($env{'form.verify'}) {
+ # does this user have privileges to modify docs
+     my $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'});
+   if ($allowed && $env{'form.verify'}) {
+       &init_breadcrumbs('verify','Verify Content');
        &verifycontent($r);
-   } elsif ($env{'form.versions'}) {
+   } elsif ($allowed && $env{'form.listsymbs'}) {
+       &init_breadcrumbs('listsymbs','List Symbs');
+       &list_symbs($r);
+   } elsif ($allowed && $env{'form.docslog'}) {
+       &init_breadcrumbs('docslog','Show Log');
+       &docs_change_log($r);
+   } elsif ($allowed && $env{'form.versions'}) {
+       &init_breadcrumbs('versions','Check/Set Resource Versions');
        &checkversions($r);
-   } elsif ($env{'form.dumpcourse'}) {
+   } elsif ($allowed && $env{'form.dumpcourse'}) {
+       &init_breadcrumbs('dumpcourse','Dump '.&Apache::loncommon::course_type().' DOCS to Construction Space');
        &dumpcourse($r);
-   } elsif ($env{'form.exportcourse'}) {
+   } elsif ($allowed && $env{'form.exportcourse'}) {
+       &init_breadcrumbs('exportcourse','Export '.&Apache::loncommon::course_type().' to IMS');
        &exportcourse($r);
    } else {
  # is this a standard course?
- Line 2021  sub handler {
+ Line 2569  sub handler {
      my $forcestandard = 0;
      my $forcesupplement;
      my $script='';
-     my $allowed;
-     my $events='';
      my $showdoc=0;
      my $containertag;
      my $uploadtag;
      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-     ['folderpath','pagepath','pagesymb','markedcopy_url','markedcopy_title']);
+ 					    ['folderpath','pagepath',
+ 					     'pagesymb']);
+ # No folderpath, no pagepath, see if we have something stored
+     if ((!$env{'form.folderpath'}) && (!$env{'form.pagepath'})) {
+         &Apache::loncommon::restore_course_settings('docs_folderpath',
+                                               {'folderpath' => 'scalar'});
+     }
+     if (!$env{'form.folderpath'}) {
+         &Apache::loncommon::restore_course_settings('docs_folderpath',
+                                               {'pagepath' => 'scalar'});
+     }
+     if ($env{'form.pagepath'}) {
+        $env{'form.folderpath'}='';
+     }
+     if ($env{'form.folderpath'} =~ /^supplemental_\d+/) {
+         $env{'form.folderpath'} = 'supplemental&'.
+                                   &escape(&mt('Supplemental '.$type.' Documents')).'&'.
+                                   $env{'form.folderpath'};
+     }
+     &Apache::loncommon::store_course_settings('docs_folderpath',
+                                                 {'pagepath' => 'scalar',
+                                                  'folderpath' => 'scalar'});
      if ($env{'form.folderpath'}) {
  	my (@folderpath)=split('&',$env{'form.folderpath'});
- 	$env{'form.foldername'}=&Apache::lonnet::unescape(pop(@folderpath));
+ 	$env{'form.foldername'}=&unescape(pop(@folderpath));
  	$env{'form.folder'}=pop(@folderpath);
      }
      if ($env{'form.pagepath'}) {
          my (@pagepath)=split('&',$env{'form.pagepath'});
-         $env{'form.pagename'}=&Apache::lonnet::unescape(pop(@pagepath));
+         $env{'form.pagename'}=&unescape(pop(@pagepath));
          $env{'form.folder'}=pop(@pagepath);
          $containertag = '<input type="hidden" name="pagepath" value="" />'.
  	    '<input type="hidden" name="pagesymb" value="" />';
-         $uploadtag = '<input type="hidden" name="pagepath" value="'.$env{'form.pagepath'}.'" />'.
+         $uploadtag = '<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />'.
- 	    '<input type="hidden" name="pagesymb" value="'.$env{'form.pagesymb'}.'" />';
+ 	    '<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />';
      }
      if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
         $showdoc='/'.$1;
      }
      unless ($showdoc) { # got called from remote
-        if (($env{'form.folder'}=~/^default_/) ||
+        if (($env{'form.folder'}=~/^(?:group|default)_/) ||
-           ($env{'form.folder'} =~ m#^\d+/(pages|sequences)/#)) {
+           ($env{'form.folder'} =~ m:^\d+/(pages|sequences)/:)) {
             $forcestandard = 1;
         }
         $forcesupplement=($env{'form.folder'}=~/^supplemental_/);
- # does this user have privileges to post, etc?
-        $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'});
         if ($allowed) {
           &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']);
           $script=&Apache::lonratedt::editscript('simple');
         }
      } else { # got called in sequence from course
         $allowed=0;
-        $script='</script>'.&Apache::lonmenu::registerurl(1,undef).'<script>';
-        $events='onLoad="'.&Apache::lonmenu::loadevents.
-            '" onUnload="'.&Apache::lonmenu::unloadevents.'"';
      }
  # get course data
      my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'};
      my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'};
  # get personal data
      my $uname=$env{'user.name'};
      my $udom=$env{'user.domain'};
-     my $plainname=&Apache::lonnet::escape(
+     my $plainname=&escape(&Apache::loncommon::plainname($uname,$udom));
-                      &Apache::loncommon::plainname($uname,$udom));
  # graphics settings
      $iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL') . "/");
-     my $now=time;
+     if ($allowed) {
+ 	$script .= &editing_js($udom,$uname);
- # print screen
-        my $html=&Apache::lonxml::xmlbegin();
-     $r->print(<<ENDDOCUMENT);
- $html
- <head>
- <title>The LearningOnline Network with CAPA</title>
- <script>
- $script
- </script>
- ENDDOCUMENT
-    if ($allowed) {
-     $r->print(<<ENDNEWSCRIPT);
- <script>
- function makenewfolder(targetform,folderseq) {
-     var foldername=prompt('Name of New Folder','New Folder');
-     if (foldername) {
- 	targetform.importdetail.value=foldername+"="+folderseq;
-         targetform.submit();
-     }
- }
- function makenewpage(targetform,folderseq) {
-     var pagename=prompt('Name of New Page','New Page');
-     if (pagename) {
-         targetform.importdetail.value=pagename+"="+folderseq;
-         targetform.submit();
-     }
- }
- function makenewext(targetname) {
-     this.document.forms.extimport.useform.value=targetname;
-     window.open('/adm/rat/extpickframe.html');
- }
- function makeexamupload() {
-    var title=prompt('Listed Title for the Uploaded Score');
-    if (title) {
-     this.document.forms.newexamupload.importdetail.value=
- 	title+'=/res/lib/templates/examupload.problem';
-     this.document.forms.newexamupload.submit();
-    }
- }
- function makesmppage() {
-    var title=prompt('Listed Title for the Page');
-    if (title) {
-     this.document.forms.newsmppg.importdetail.value=
- 	title+'=/adm/$udom/$uname/$now/smppg';
-     this.document.forms.newsmppg.submit();
-    }
- }
- function makesmpproblem() {
-    var title=prompt('Listed Title for the Problem');
-    if (title) {
-     this.document.forms.newsmpproblem.importdetail.value=
- 	title+'=/res/lib/templates/simpleproblem.problem';
-     this.document.forms.newsmpproblem.submit();
-    }
- }
- function makebulboard() {
-    var title=prompt('Listed Title for the Bulletin Board');
-    if (title) {
-     this.document.forms.newbul.importdetail.value=
- 	title+'=/adm/$udom/$uname/$now/bulletinboard';
-     this.document.forms.newbul.submit();
-    }
- }
- function makeabout() {
-    var user=prompt("Enter user\@domain for User's 'About Me' Page");
-    if (user) {
-        var comp=new Array();
-        comp=user.split('\@');
-        if ((typeof(comp[0])!=undefined) && (typeof(comp[1])!=undefined)) {
- 	   if ((comp[0]) && (comp[1])) {
- 	       this.document.forms.newaboutsomeone.importdetail.value=
- 		   'About '+user+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
- 	       this.document.forms.newaboutsomeone.submit();
- 	   } else {
-                alert("Not a valid user\@domain");
-            }
-        } else {
-            alert("Please enter both user and domain in the format user\@domain");
-        }
-    }
- }
- function makeims() {
-     var caller = document.forms.ims.folder.value;
-     var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one";
-     newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes");
-     newWindow.location.href = newlocation;
- }
- function finishpick() {
-     var title=this.document.forms.extimport.title.value;
-     var url=this.document.forms.extimport.url.value;
-     var form=this.document.forms.extimport.useform.value;
-     eval
-      ('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+
-     '";this.document.forms.'+form+'.submit();');
- }
- function changename(folderpath,index,oldtitle,container,pagesymb) {
-     var title=prompt('New Title',oldtitle);
-     if (title) {
- 	this.document.forms.renameform.title.value=title;
- 	this.document.forms.renameform.cmd.value='rename_'+index;
-         if (container == 'sequence') {
- 	    this.document.forms.renameform.folderpath.value=folderpath;
-         }
-         if (container == 'page') {
-             this.document.forms.renameform.pagepath.value=folderpath;
-             this.document.forms.renameform.pagesymb.value=pagesymb;
-         }
-         this.document.forms.renameform.submit();
-     }
- }
- function removeres(folderpath,index,oldtitle,container,pagesymb) {
-     if (confirm('WARNING: Removing a resource makes associated grades and scores inaccessible!\\nRemove "'+oldtitle+'"?')) {
- 	this.document.forms.renameform.cmd.value='del_'+index;
-         if (container == 'sequence') {
-             this.document.forms.renameform.folderpath.value=folderpath;
-         }
-         if (container == 'page') {
-             this.document.forms.renameform.pagepath.value=folderpath;
-             this.document.forms.renameform.pagesymb.value=pagesymb;
-         }
-         this.document.forms.renameform.submit();
-     }
- }
- function cutres(folderpath,index,oldtitle,container,pagesymb) {
-     if (confirm('WARNING: Cutting a resource makes associated grades and scores inaccessible!\\nGrades remain inaccessible if resource is pasted into another folder.\\nCut "'+oldtitle+'"?')) {
- 	this.document.forms.renameform.cmd.value='cut_'+index;
- 	this.document.forms.renameform.markcopy.value=index;
-         if (container == 'sequence') {
-             this.document.forms.renameform.folderpath.value=folderpath;
-         }
-         if (container == 'page') {
-             this.document.forms.renameform.pagepath.value=folderpath;
-             this.document.forms.renameform.pagesymb.value=pagesymb;
-         }
-         this.document.forms.renameform.submit();
-     }
- }
- function markcopy(folderpath,index,oldtitle,container,pagesymb) {
-     this.document.forms.renameform.markcopy.value=index;
-     if (container == 'sequence') {
- 	this.document.forms.renameform.folderpath.value=folderpath;
-     }
-     if (container == 'page') {
- 	this.document.forms.renameform.pagepath.value=folderpath;
- 	this.document.forms.renameform.pagesymb.value=pagesymb;
      }
-     this.document.forms.renameform.submit();
- }
- </script>
- ENDNEWSCRIPT
-   }
  # -------------------------------------------------------------------- Body tag
-   $r->print('</head>'.
+     $script = '<script type="text/javascript">'."\n".$script."\n".'</script>';
-             &Apache::loncommon::bodytag('Course Documents','',$events,
+     my $brcrum = [{href=>"/adm/createuser",text=>"$type Documents"}];
- 					'','',$showdoc).
+     $r->print(&Apache::loncommon::start_page("$type Documents", $script,
- 	    &Apache::loncommon::help_open_menu('','','','',273,'RAT'));
+ 				    {'force_register' => $showdoc,
+                                      'bread_crumbs' => $brcrum}).
+ 	      &Apache::loncommon::help_open_menu('','',273,'RAT'));
    my %allfiles = ();
    my %codebase = ();
    my ($upload_result,$upload_output);
    if ($allowed) {
-       if (($env{'form.uploaddoc.filename'}) &&                                               ($env{'form.cmd'}=~/^upload_(\w+)/)) {
+       if (($env{'form.uploaddoc.filename'}) &&
+ 	  ($env{'form.cmd'}=~/^upload_(\w+)/)) {
  # Process file upload - phase one - upload and parse primary file.
+ 	  undef($hadchanges);
            $upload_result = &process_file_upload(\$upload_output,$coursenum,
  						$coursedom,\%allfiles,
  						\%codebase,$1);
+ 	  if ($hadchanges) {
+ 	      &mark_hash_old();
+ 	  }
            if ($upload_result eq 'phasetwo') {
                $r->print($upload_output);
            }
- Line 2272  ENDNEWSCRIPT
+ Line 2676  ENDNEWSCRIPT
            my %attribs = ();
            my $updateflag = 0;
            my $residx = $env{'form.newidx'};
-           my $primary_url = &Apache::lonnet::unescape($env{'form.primaryurl'});
+           my $primary_url = &unescape($env{'form.primaryurl'});
  # Process file upload - phase two - gather secondary files.
            for (my $i=0; $i<$env{'form.phasetwo'}; $i++) {
                if ($env{'form.embedded_item_'.$i.'.filename'}) {
                    my $javacodebase;
                    $newname{$i} = &process_secondary_uploads(\$upload_output,$coursedom,$coursenum,'embedded_item_',$i,$residx);
-                   $origname{$i} = &Apache::lonnet::unescape($env{'form.embedded_orig_'.$i});
+                   $origname{$i} = &unescape($env{'form.embedded_orig_'.$i});
                    if (exists($env{'form.embedded_codebase_'.$i})) {
-                       $javacodebase =  &Apache::lonnet::unescape($env{'form.embedded_codebase_'.$i});
+                       $javacodebase =  &unescape($env{'form.embedded_codebase_'.$i});
                        $origname{$i} =~ s#^\Q$javacodebase\E/##;
                    }
                    my @attributes = ();
                    if ($env{'form.embedded_attrib_'.$i} =~ /:/) {
-                       @attributes = split/:/,$env{'form.embedded_attrib_'.$i};
+                       @attributes = split(/:/,$env{'form.embedded_attrib_'.$i});
                    } else {
                        @attributes = ($env{'form.embedded_attrib_'.$i});
                    }
-                   foreach (@attributes) {
+                   foreach my $attr (@attributes) {
-                       push(@{$attribs{$i}},&Apache::lonnet::unescape($_));
+                       push(@{$attribs{$i}},&unescape($attr));
                    }
                    if ($javacodebase) {
                        $codebase{$i} = $javacodebase;
- Line 2308  ENDNEWSCRIPT
+ Line 2712  ENDNEWSCRIPT
                my $updateflag = 0;
                my $getstatus = &Apache::lonnet::getuploaded('GET',$primary_url,$coursedom,$coursenum,\$content,\$rtncode);
                if ($getstatus eq 'ok') {
-                   foreach my $item (keys %newname) {
+                   foreach my $item (keys(%newname)) {
                        if ($newname{$item} ne $origname{$item}) {
                            my $attrib_regexp = '';
                            if (@{$attribs{$item}} > 1) {
- Line 2321  ENDNEWSCRIPT
+ Line 2725  ENDNEWSCRIPT
                            $content =~ s#($attrib_regexp\s*=\s*['"]?)\Q$origname{$item}\E(['"]?)#$1$newname{$item}$2#gi;
                        }
                        if (exists($codebase{$item})) {
-                           $content =~ s/(codebase\s*=\s*["']?)\Q$codebase{$item}\E(["']?)/$1.$2/i;
+                           $content =~ s/(codebase\s*=\s*["']?)\Q$codebase{$item}\E(["']?)/$1.$2/i; #' stupid emacs
                        }
                    }
  # Save edited file.
- Line 2339  ENDNEWSCRIPT
+ Line 2743  ENDNEWSCRIPT
    unless ($showdoc ||  $upload_result eq 'phasetwo') {
  # -----------------------------------------------------------------------------
         my %lt=&Apache::lonlocal::texthash(
-                 'uplm' => 'Upload a new main course document',
+                 'uplm' => 'Upload a new main '.lc($type).' document',
-                 'upls' => 'Upload a new supplemental course document',
+                 'upls' => 'Upload a new supplemental '.lc($type).' document',
                  'impp' => 'Import a document',
-                 'pubd' => 'Published documents',
+                 'pubd' => 'Published Documents',
  		'copm' => 'All documents out of a published map into this folder',
-                 'spec' => 'Special documents',
                  'upld' => 'Upload Document',
                  'srch' => 'Search',
                  'impo' => 'Import',
+ 		'book' => 'Import Bookmarks',
                  'selm' => 'Select Map',
                  'load' => 'Load Map',
                  'reco' => 'Recover Deleted Resources',
- Line 2358  ENDNEWSCRIPT
+ Line 2762  ENDNEWSCRIPT
                  'navc' => 'Navigate Contents',
                  'sipa' => 'Simple Page',
                  'sipr' => 'Simple Problem',
+                 'drbx' => 'Drop Box',
                  'scuf' => 'Score Upload Form',
                  'bull' => 'Bulletin Board',
                  'mypi' => 'My Personal Info',
+                 'grpo' => 'Group Files',
+                 'rost' => 'Course Roster',
  		'abou' => 'About User',
                  'imsf' => 'Import IMS package',
                  'file' =>  'File',
                  'title' => 'Title',
                  'comment' => 'Comment',
-                 'parse' => 'If HTML file, upload embedded images/multimedia files'
+                 'parse' => 'Upload embedded images/multimedia files if HTML file!',
+ 		'nd' => 'New 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">
+ 	$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">
+ 	$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) {
-        my $dumpbut=&dumpbutton();
+ 	&update_paste_buffer($coursenum,$coursedom);
-        my $exportbut=&exportbutton();
         my %lt=&Apache::lonlocal::texthash(
  					 'vc' => 'Verify Content',
  					 'cv' => 'Check/Set Resource Versions',
+ 					 'ls' => 'List Symbs',
+                                          'sl' => 'Show Log'
  					  );
         my $folderpath=$env{'form.folderpath'};
- Line 2382  ENDNEWSCRIPT
+ Line 2865  ENDNEWSCRIPT
  	   if ($env{'form.folder'} eq '' ||
  	       $env{'form.folder'} eq 'supplemental') {
  	       $folderpath='default&'.
- 		   &Apache::lonnet::escape(&mt('Main Course Documents'));
+ 		   &escape(&mt('Main '.$type.' Documents'));
  	   }
         }
         unless ($env{'form.pagepath'}) {
             $containertag = '<input type="hidden" name="folderpath" value="" />';
-            $uploadtag = '<input type="hidden" name="folderpath" value="'.$folderpath.'" />';
+            $uploadtag = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($folderpath,'<>&"').'" />';
         }
+        ##############alter hashaufruf
-        $r->print(<<ENDCOURSEVERIFY);
+        $r->print(&generate_admin_options($containertag,$uploadtag,\%lt,\%help,\%env));
- <form name="renameform" method="post" action="/adm/coursedocs">
- <input type="hidden" name="title" />
- <input type="hidden" name="cmd" />
- <input type="hidden" name="markcopy" />
- $containertag
- </form>
- <form name="simpleedit" method="post" action="/adm/coursedocs">
- <input type=hidden name="importdetail" value="">
- $uploadtag
- </form>
- <form action="/adm/coursedocs" method="post" name="courseverify">
- <table bgcolor="#AAAAAA" width="100%" cellspacing="4" cellpadding="4">
- <tr><td bgcolor="#DDDDCC">
- <input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}
- </td><td bgcolor="#DDDDCC">
-     <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
- $dumpbut
- $exportbut
- </td></tr></table>
- </form>
- ENDCOURSEVERIFY
         $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
- 		     &mt('Editing the Table of Contents for your Course')));
+ 		     &mt('Editing the Table of Contents for your '.$type)));
      }
  # --------------------------------------------------------- Standard documents
-     $r->print('<table border=2 cellspacing=4 cellpadding=4>');
+     $r->print('<table class="LC_docs_documents">');
      if (($standard) && ($allowed) && (!$forcesupplement)) {
- 	$r->print('<tr><td bgcolor="#BBBBBB">');
+ 	$r->print('<tr><td class="LC_docs_document">');
  #  '<h2>'.&mt('Main Course Documents').
  #  ($allowed?' '.$help{'Main_Course_Documents'}:'').'</h2>');
         my $folder=$env{'form.folder'};
         if ($folder eq '' || $folder eq 'supplemental') {
             $folder='default';
- 	   $env{'form.folderpath'}='default&'.&Apache::lonnet::escape(&mt('Main Course Documents'));
+ 	   $env{'form.folderpath'}='default&'.&escape(&mt('Main '.$type.' Documents'));
+            $uploadtag = '<input type="hidden" name="folderpath" value="'.
+ 	       &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
         }
         my $postexec='';
         if ($folder eq 'default') {
- 	   $r->print('<script>this.window.name="loncapaclient";</script>');
+ 	   $r->print('<script type="text/javascript">this.window.name="loncapaclient";</script>');
         } else {
             #$postexec='self.close();';
         }
         $hadchanges=0;
-        &editor($r,$coursenum,$coursedom,$folder,$allowed,$upload_output);
+        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()
+ 	   &mark_hash_old();
         }
         &changewarning($r,$postexec);
         my $folderseq='/uploaded/'.$coursedom.'/'.$coursenum.'/default_'.time.
- Line 2447  ENDCOURSEVERIFY
+ Line 2916  ENDCOURSEVERIFY
  	    $container='page';
  	}
  	my $readfile='/uploaded/'.$coursedom.'/'.$coursenum.'/'.$folder.'.'.$container;
+ 	my $recoverform=(<<RFORM);
+ 	<form action="/adm/groupsort" method="post" name="recover">
+ 	<input type="button" name="recovermap" onClick="javascript:groupopen('$readfile',1,0)" value="$lt{'reco'}" />
+ 	</form>
+ RFORM
+ 	my $imspform=(<<IMSPFORM);
+ 	<form action="/adm/imsimportdocs" method="post" name="ims">
+ 	<input type="hidden" name="folder" value="$folder" />
+ 	<input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />
+ 	</form>
+ IMSPFORM
+ 	my $newnavform=(<<NNFORM);
+ 	<form action="/adm/coursedocs" method="post" name="newnav">
+ 	$uploadtag
+ 	<input type="hidden" name="importdetail"
+ 	value="$lt{'navc'}=/adm/navmaps" />
+ 	<span class="LC_nobreak">
+ 	<input name="newnav" type="submit" value="$lt{'navc'}" />
+ 	$help{'Navigate_Content'}
+ 	</span>
+ 	</form>
+ NNFORM
+ 	my $newsmppageform=(<<NSPFORM);
+ 	<form action="/adm/coursedocs" method="post" name="newsmppg">
+ 	$uploadtag
+ 	<input type="hidden" name="importdetail" value="" />
+ 	<span class="LC_nobreak">
+ 	<input name="newsmppg" type="button" value="$lt{'sipa'}"
+ 	onClick="javascript:makesmppage();" /> $help{'Simple Page'}
+ 	</span>
+ 	</form>
+ NSPFORM
+ 	my $newsmpproblemform=(<<NSPROBFORM);
+ 	<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>
+ NSPROBFORM
+ 	my $newdropboxform=(<<NDBFORM);
+ 	<form action="/adm/coursedocs" method="post" name="newdropbox">
+ 	$uploadtag
+ 	<input type="hidden" name="importdetail" value="" />
+ 	<span class="LC_nobreak">
+ 	<input name="newdropbox" type="button" value="$lt{'drbx'}"
+ 	onClick="javascript:makedropbox();" />
+ 	</span>
+ 	</form>
+ NDBFORM
+ 	my $newexuploadform=(<<NEXUFORM);
+ 	<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>
+ NEXUFORM
+ 	my $newbulform=(<<NBFORM);
+ 	<form action="/adm/coursedocs" method="post" name="newbul">
+ 	$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">
+ 	$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 Info'}
+ 	</span>
+ 	</form>
+ NAMFORM
+ 	my $newaboutsomeoneform=(<<NASOFORM);
+ 	<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>
+ NASOFORM
+ 	my $newrosterform=(<<NROSTFORM);
+ 	<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>
+ NROSTFORM
         $r->print(<<ENDFORM);
- <table cellspacing=4 cellpadding=4><tr>
- <th bgcolor="#DDDDDD">$lt{'uplm'}</th>
- <th bgcolor="#DDDDDD">$lt{'impp'}</th>
+ <table class="LC_docs_adddocs">
- <th bgcolor="#DDDDDD">$lt{'spec'}</th>
+ <!-- <tr>
- </tr>
+ <th>$lt{'uplm'}</th>
- <tr><td bgcolor="#DDDDDD">
+ <th>$lt{'impp'}</th>
- $lt{'file'}:<br />
+ <th>$lt{'spec'}</th>
- <form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
+ </tr> -->
- <input type="file" name="uploaddoc" size="40">
+ <tr>
- <br />
+ <td>
- $lt{'title'}:<br />
+ $fileuploadform
- <input type="text" size="50" name="comment">
- $uploadtag
- <input type="hidden" name="cmd" value="upload_default">
- <br />
- <nobr>
- <label>$lt{'parse'}?
- <input type="checkbox" name="parserflag" />
- </label>
- </nobr>
- <br />
- <br />
- <nobr>
- <input type="submit" value="$lt{'upld'}">
-  $help{'Uploading_From_Harddrive'}
- </nobr>
- </form>
  </td>
- <td bgcolor="#DDDDDD">
+ <td>
- <form action="/adm/coursedocs" method="post" name="simpleeditdefault">
+ $simpleeditdefaultform
- $lt{'pubd'}<br />
- $uploadtag
- <input type=button onClick="javascript:groupsearch()" value="$lt{'srch'}">
- <nobr>
- <input type=button onClick="javascript:groupimport();" value="$lt{'impo'}">
- $help{'Importing_LON-CAPA_Resource'}
- </nobr>
- <p>
- <hr />
- $lt{'copm'}<br />
- <input type="text" size="40" name="importmap"><br />
- <nobr><input type=button
- onClick="javascript:openbrowser('simpleeditdefault','importmap','sequence,page','')"
- value="$lt{'selm'}"> <input type="submit" name="loadmap" value="$lt{'load'}">
- $help{'Load_Map'}</nobr>
- </p>
- </form>
  <hr />
- <form action="/adm/groupsort" method="post" name="recover">
+ $recoverform
- <input type="button" name="recovermap" onClick="javascript:groupopen('$readfile',1)" value="$lt{'reco'}" />
- </form>
  ENDFORM
         unless ($env{'form.pagepath'}) {
  	   $r->print(<<ENDFORM);
  <hr />
- <form action="/adm/coursedocs" method="post" name="newext">
+ $extresourcesform
- $uploadtag
+ 	<br />
- <input type=hidden name="importdetail" value="">
+ $imspform
- <nobr>
- <input name="newext" type="button" onClick="javascript:makenewext('newext');"
- value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
- </nobr>
- </form>
- <form action="/adm/imsimportdocs" method="post" name="ims">
- <input type="hidden" name="folder" value="$folder" />
- <input name="imsimport" type="button" value="$lt{'imsf'}" onClick="javascript:makeims();" />
- </nobr>
- </form>
  ENDFORM
         }
-        $r->print('</td><td bgcolor="#DDDDDD">');
+        $r->print('</td><td>');
         unless ($env{'form.pagepath'}) {
-            $r->print(<<ENDFORM);
+ 	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
- <form action="/adm/coursedocs" method="post" name="newfolder">
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
- <input type=hidden name="importdetail" value="">
- <nobr>
+ 	my $newpageform=(<<NPFORM);
- <input name="newfolder" type="button"
+ 	<form action="/adm/coursedocs" method="post" name="newpage">
- onClick="javascript:makenewfolder(this.form,'$folderseq');"
+ 	<input type="hidden" name="folderpath" value="$path" />
- value="$lt{'newf'}" />$help{'Adding_Folders'}
+ 	<input type="hidden" name="importdetail" value="" />
- </nobr>
+ 	<span class="LC_nobreak">
- </form>
+ 	<input name="newpage" type="button"
- <form action="/adm/coursedocs" method="post" name="newpage">
+ 	onClick="javascript:makenewpage(this.form,'$pageseq');"
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+ 	value="$lt{'newp'}" />$help{'Adding_Pages'}
- <input type=hidden name="importdetail" value="">
+ 	</span>
- <nobr>
+ 	</form>
- <input name="newpage" type="button"
+ NPFORM
- onClick="javascript:makenewpage(this.form,'$pageseq');"
- value="$lt{'newp'}" />$help{'Adding_Pages'}
+ 	my $newfolderform=(<<NFFORM);
- </nobr>
+ 	<form action="/adm/coursedocs" method="post" name="newfolder">
- </form>
+ 	<input type="hidden" name="folderpath" value="$path" />
- <form action="/adm/coursedocs" method="post" name="newsyl">
+ 	<input type="hidden" name="importdetail" value="" />
- $uploadtag
+ 	<span class="LC_nobreak">
- <input type=hidden name="importdetail"
+ 	<input name="newfolder" type="button"
- value="Syllabus=/public/$coursedom/$coursenum/syllabus">
+ 	onClick="javascript:makenewfolder(this.form,'$folderseq');"
- <nobr>
+ 	value="$lt{'newf'}" />$help{'Adding_Folders'}
- <input name="newsyl" type="submit" value="$lt{'syll'}" />
+ 	</span>
-  $help{'Syllabus'}
+ 	</form>
- </nobr>
+ NFFORM
- </form>
- <form action="/adm/coursedocs" method="post" name="newnav">
+ 	my $newsylform=(<<NSYLFORM);
- $uploadtag
+ 	<form action="/adm/coursedocs" method="post" name="newsyl">
- <input type=hidden name="importdetail"
+ 	$uploadtag
- value="Navigate Content=/adm/navmaps">
+ 	<input type="hidden" name="importdetail"
- <nobr>
+ 	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'}" />
- </nobr>
+ 	$help{'Syllabus'}
- </form>
+ 	</span>
- <form action="/adm/coursedocs" method="post" name="newsmppg">
+ 	</form>
- $uploadtag
+ NSYLFORM
- <input type=hidden name="importdetail" value="">
- <nobr>
+ 	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'}
+ 	$uploadtag
- </nobr>
+ 	<input type="hidden" name="importdetail"
- </form>
+ 	value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />
- <form action="/adm/coursedocs" method="post" name="newsmpproblem">
+ 	<span class="LC_nobreak">
- $uploadtag
+ 	<input name="newgroupfiles" type="submit" value="$lt{'grpo'}" />
- <input type=hidden name="importdetail" value="">
+ 	$help{'Group Files'}
- <nobr>
+ 	</span>
- <input name="newsmpproblem" type="button" value="$lt{'sipr'}"
+ 	</form>
- onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
+ NGFFORM
- </nobr>
- </form>
- <form action="/adm/coursedocs" method="post" name="newexamupload">
+            my $specialdocumentsform=(<<ENDFORM);
- $uploadtag
+ <br />
- <input type=hidden name="importdetail" value="">
+ $newfolderform
- <nobr>
+ <br />
- <input name="newexamupload" type="button" value="$lt{'scuf'}"
+ $newpageform
- onClick="javascript:makeexamupload();" />
+ <br />
- $help{'Score_Upload_Form'}
+ $newsylform
- </nobr>
+ <br />
- </form>
+ $newnavform
- <form action="/adm/coursedocs" method="post" name="newbul">
+ <br />
- $uploadtag
+ $newsmppageform
- <input type=hidden name="importdetail" value="">
+ <br />
- <nobr>
+ $newsmpproblemform
- <input name="newbulletin" type="button" value="$lt{'bull'}"
+ <br />
- onClick="javascript:makebulboard();" />
+ $newdropboxform
- $help{'Bulletin Board'}
+ <br />
- </nobr>
+ $newexuploadform
- </form>
+ <br />
- <form action="/adm/coursedocs" method="post" name="newaboutme">
+ $newbulform
- $uploadtag
+ <br />
- <input type=hidden name="importdetail"
+ $newaboutmeform
- value="$plainname=/adm/$udom/$uname/aboutme">
+ <br />
- <nobr>
+ $newaboutsomeoneform
- <input name="newaboutme" type="submit" value="$lt{'mypi'}" />
+ <br />
- $help{'My Personal Info'}
+ $newgroupfileform
- </nobr>
+ <br />
- </form>
+ $newrosterform
- <form action="/adm/coursedocs" method="post" name="newaboutsomeone">
- $uploadtag
- <input type=hidden name="importdetail" value="">
- <nobr>
- <input name="newaboutsomeone" type="button" value="$lt{'abou'}"
- onClick="javascript:makeabout();" />
- </nobr>
- </form>
  ENDFORM
-        }
+ $r->print($specialdocumentsform);
+ my %orderhash = (
+                 'aa_eins' => 'New Document',
+                 'bb_zwei' => 'Published Documents',
+                 'cc_drei' => 'Special Documents',
+ 		'dd_vier' => 'More Options',
+                 'zz_hide' => 'Hide all Option',
+                 );
+ my %namehash = (
+                 'New Document' => $fileuploadform,
+                 'Published Documents' => $simpleeditdefaultform,
+                 'Special Documents' => $specialdocumentsform,
+ 		'More Options' => $extresourcesform.'<br />'.$imspform.'<br />'.$recoverform,
+                 'drei' => 'dr',
+                 );
+ my $varcd = 'Course Documents';
+ $r->print(&generate_edit_table($varcd,\%namehash,\%orderhash));
+       }
         if ($env{'form.pagepath'}) {
             $r->print(<<ENDBLOCK);
- <form action="/adm/coursedocs" method="post" name="newsmpproblem">
+ $newsmpproblemform
- $uploadtag
+ <br />
- <input type=hidden name="importdetail" value="">
+ $newexuploadform
- <nobr>
- <input name="newsmpproblem" type="button" value="$lt{'sipr'}"
- onClick="javascript:makesmpproblem();" />$help{'Simple Problem'}
- </nobr>
- </form>
- <form action="/adm/coursedocs" method="post" name="newexamupload">
- $uploadtag
- <input type=hidden name="importdetail" value="">
- <nobr>
- <input name="newexamupload" type="button" value="$lt{'scuf'}"
- onClick="javascript:makeexamupload();" />
- $help{'Score_Upload_Form'}
- </nobr>
- </form>
  ENDBLOCK
         }
         $r->print('</td></tr>'."\n".
  '</table>');
+ #$r->print(&generate_edit_table(\%namehash,\%orderhash));
         $r->print('</td></tr>');
      }
  # ----------------------------------------------------- Supplemental documents
      if (!$forcestandard) {
-        $r->print('<tr><td bgcolor="#BBBBBB">');
+        $r->print('<tr><td class="LC_docs_document">');
  # '<h2>'.&mt('Supplemental Course Documents').
  #  ($allowed?' '.$help{'Supplemental'}:'').'</h2>');
         my $folder=$env{'form.folder'};
- Line 2645  ENDBLOCK
+ Line 3189  ENDBLOCK
  	   $folder='supplemental';
         }
         if ($folder =~ /^supplemental$/ &&
- 	   $env{'form.folderpath'} =~ /^default\&/) {
+ 	   (($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) {
- 	   $env{'form.folderpath'}='supplemental&'.
+           $env{'form.folderpath'} = 'supplemental&'.
- 	       &Apache::lonnet::escape(&mt('Supplemental Course Documents'));
+                                     &escape(&mt('Supplemental '.$type.' Documents'));
+        }
+        my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
+        if ($error) {
+ 	   $r->print('<p><span class="LC_error">'.$error.'</span></p>');
         }
-        &editor($r,$coursenum,$coursedom,$folder,$allowed);
         if ($allowed) {
-        my $folderseq=
+ 	   my $folderseq=
-                   '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
+ 	       '/uploaded/'.$coursedom.'/'.$coursenum.'/supplemental_'.time.
-                      '.sequence';
+ 	       '.sequence';
-           $r->print(<<ENDSUPFORM);
+ 	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
- <table cellspacing=4 cellpadding=4><tr>
- <th bgcolor="#DDDDDD">$lt{'upls'}</th>
+ 	my $supupdocform=(<<SUPDOCFORM);
- <th bgcolor="#DDDDDD">$lt{'spec'}</th>
+ 	<form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
- </tr>
+ 	$fileupload
- <tr><td bgcolor="#DDDDDD">
+ 	<br />
- <form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
+ 	<br />
- <input type="file" name="uploaddoc" size="40">
+ 	<span class="LC_nobreak">
+ 	$checkbox
+ 	</span>
+ 	<br /><br />
+ 	$lt{'comment'}:<br />
+ 	<textarea cols=50 rows=4 name='comment'>
+ 	</textarea>
+ 	<br />
+ 	<input type="hidden" name="folderpath" value="$path" />
+ 	<input type="hidden" name="cmd" value="upload_supplemental" />
+ 	<span class="LC_nobreak">
+ 	<input type="submit" value="$lt{'upld'}" />
+ 	 $help{'Uploading_From_Harddrive'}
+ 	</span>
+ 	</form>
+ SUPDOCFORM
+ 	my $supnewfolderform=(<<SNFFORM);
+ 	<form action="/adm/coursedocs" method="post" name="supnewfolder">
+ 	<input type="hidden" name="folderpath" value="$path" />
+ 	<input type="hidden" name="importdetail" value="" />
+ 	<span class="LC_nobreak">
+ 	<input name="newfolder" type="button"
+ 	onClick="javascript:makenewfolder(this.form,'$folderseq');"
+ 	value="$lt{'newf'}" /> $help{'Adding_Folders'}
+ 	</span>
+ 	</form>
+ SNFFORM
+ 	my $supnewextform=(<<SNEFORM);
+ 	<form action="/adm/coursedocs" method="post" name="supnewext">
+ 	<input type="hidden" name="folderpath" value="$path" />
+ 	<input type="hidden" name="importdetail" value="" />
+ 	<span class="LC_nobreak">
+ 	<input name="newext" type="button"
+ 	onClick="javascript:makenewext('supnewext');"
+ 	value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
+ 	</span>
+ 	</form>
+ SNEFORM
+ 	my $supnewsylform=(<<SNSFORM);
+ 	<form action="/adm/coursedocs" method="post" name="supnewsyl">
+ 	<input type="hidden" name="folderpath" value="$path" />
+ 	<input type="hidden" name="importdetail"
+ 	value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
+ 	<span class="LC_nobreak">
+ 	<input name="newsyl" type="submit" value="$lt{'syll'}" />
+ 	$help{'Syllabus'}
+ 	</span>
+ 	</form>
+ SNSFORM
+ 	my $supnewaboutmeform=(<<SNAMFORM);
+ 	<form action="/adm/coursedocs" method="post" name="subnewaboutme">
+ 	<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 Info'}
+ 	</span>
+ 	</form>
+ SNAMFORM
+ 	   $r->print(<<ENDSUPFORM);
+ <ul class="LC_TabContent">
+ <li>$lt{'nd'}</li>
+ <li>$lt{'sd'}</li>
+ <li>$lt{'hao'}</li>
+ </ul>
+ <table class="LC_docs_adddocs">
+ <tr><td>
+ $supupdocform
+ </td>
+ <td>
+ $supnewfolderform
  <br />
+ $supnewextform
  <br />
- <nobr>
+ $supnewsylform
- <label>$lt{'parse'}?
- <input type="checkbox" name="parserflag" />
- </label>
- </nobr>
- <br /><br />
- $lt{'comment'}:<br />
- <textarea cols=50 rows=4 name='comment'>
- </textarea>
  <br />
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
+ $supnewaboutmeform
- <input type="hidden" name="cmd" value="upload_supplemental">
- <nobr>
- <input type="submit" value="$lt{'upld'}">
-  $help{'Uploading_From_Harddrive'}
- </nobr>
- </form>
- </td>
- <td bgcolor="#DDDDDD">
- <form action="/adm/coursedocs" method="post" name="supnewfolder">
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
- <input type=hidden name="importdetail" value="">
- <nobr>
- <input name="newfolder" type="button"
- onClick="javascript:makenewfolder(this.form,'$folderseq');"
- value="$lt{'newf'}" /> $help{'Adding_Folders'}
- </nobr>
- </form>
- <form action="/adm/coursedocs" method="post" name="supnewext">
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
- <input type=hidden name="importdetail" value="">
- <nobr>
- <input name="newext" type="button"
- onClick="javascript:makenewext('supnewext');"
- value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
- </nobr>
- </form>
- <form action="/adm/coursedocs" method="post" name="supnewsyl">
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
- <input type=hidden name="importdetail"
- value="Syllabus=/public/$coursedom/$coursenum/syllabus">
- <nobr>
- <input name="newsyl" type="submit" value="$lt{'syll'}" />
- $help{'Syllabus'}
- </nobr>
- </form>
- <form action="/adm/coursedocs" method="post" name="subnewaboutme">
- <input type="hidden" name="folderpath" value="$env{'form.folderpath'}" />
- <input type=hidden name="importdetail"
- value="$plainname=/adm/$udom/$uname/aboutme">
- <nobr>
- <input name="newaboutme" type="submit" value="$lt{'mypi'}" />
- $help{'My Personal Info'}
- </nobr>
- </form>
  </td></tr>
  </table></td></tr>
  ENDSUPFORM
         }
      }
+     $r->print('</table>');
      if ($allowed) {
- 	$r->print('<form method="POST" name="extimport" action="/adm/coursedocs"><input type="hidden" name="title" /><input type="hidden" name="url" /><input type="hidden" name="useform" /></form>');
+ 	$r->print('
+ <form method="post" name="extimport" action="/adm/coursedocs">
+   <input type="hidden" name="title" />
+   <input type="hidden" name="url" />
+   <input type="hidden" name="useform" />
+   <input type="hidden" name="residx" />
+ </form>');
      }
-     $r->print('</table>');
    } else {
        unless ($upload_result eq 'phasetwo') {
  # -------------------------------------------------------- This is showdoc mode
            $r->print("<h1>".&mt('Uploaded Document').' - '.
  		&Apache::lonnet::gettitle($r->uri).'</h1><p>'.
- &mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."</p><p><table>".
+ &mt('It is recommended that you use an up-to-date virus scanner before handling this file.')."</p><table>".
-           &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table></p>');
+           &entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table>');
        }
    }
   }
-  $r->print('</body></html>');
+  $r->print(&Apache::loncommon::end_page());
   return OK;
  }
+ sub generate_admin_options {
+   my ($containertag,$uploadtag,$lt_ref,$help_ref,$env_ref) = @_;
+   my %lt = %{$lt_ref};
+   my %help = %{$help_ref};
+   my %env = %{$env_ref};
+   my $dumpbut=&dumpbutton();
+   my $exportbut=&exportbutton();
+   return (<<ENDOPTIONFORM);
+  <form name="renameform" method="post" action="/adm/coursedocs">
+    <input type="hidden" name="title" />
+    <input type="hidden" name="cmd" />
+    <input type="hidden" name="markcopy" />
+    <input type="hidden" name="copyfolder" />
+    $containertag
+  </form>
+  <form name="simpleedit" method="post" action="/adm/coursedocs">
+    <input type="hidden" name="importdetail" value="" />
+    $uploadtag
+  </form>
+  <form action="/adm/coursedocs" method="post" name="courseverify">
+    <ul style="list-style-type:none">
+        <li>
+            <input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}
+        </li>
+        <li>
+            <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}
+        </li>
+        <li>
+            $dumpbut
+        </li>
+        <li>
+            $exportbut
+        </li>
+        <li>
+           <input type="submit" name="listsymbs" value="$lt{'ls'}" />
+         </li>
+         <li>
+           <input type="hidden" name="folder" value="$env{'form.folder'}" />
+           <input type="submit" name="docslog" value="$lt{'sl'}" />
+         </li>
+    </ul>
+  </form>
+  <div style="clear: both; height: 0px;">&nbsp;</div>
+ ENDOPTIONFORM
+ }
+ sub generate_edit_table {
+     my ($varcd,$namehash_ref,$orderhash_ref) = @_;
+     #my %optionhash = %{$optionhash_ref};         #id verlinkt mit inhalt
+     #my %tablehash = %{$tablehash_ref};
+     my %namehash = %{$namehash_ref};             #name verlinkt mit id
+     my %orderhash = %{$orderhash_ref};           #name mit kürzel verlinkt mit name
+     #my %tablehash = %{$tablehash_ref};
+     my $form;
+     #foreach my $id (keys(%tablehash)){
+     $form = '<div class="LC_ContentBoxSpecial"><h4 class="LC_hcell">'.&mt('Upload '.$varcd).'</h4>';
+     $form .= '<ul class="LC_TabContent">';
+     foreach my $name (sort(keys(%orderhash))){
+         if($name eq 'zz_hide'){
+             $form .= '<li onclick="javascript:hideAll();">'.&mt($orderhash{$name}).'</li>';
+         }else{
+             $form .= '<li onclick="javascript:showPage(this, \''.$orderhash{$name}.'\');">'.&mt($orderhash{$name}).'</li>';
+         }
+     }
+     $form .= '<div id="content" style="padding: 0 0; margin: 0 0;">';
+     foreach my $field (keys(%namehash)){
+         $form .= '<div id="'.$field.'" class="LC_ContentBox" style="display: none;">'.$namehash{$field}.'</div>';
+     }
+     $form .= '</div></div>';
+ #}
+     return $form;
+ }
+ sub editing_js {
+     my ($udom,$uname) = @_;
+     my $now = time();
+     my %lt = &Apache::lonlocal::texthash(
+                                           p_mnf => 'Name of New Folder',
+                                           t_mnf => 'New Folder',
+                                           p_mnp => 'Name of New Page',
+                                           t_mnp => 'New Page',
+                                           p_mxu => 'Title for the Uploaded Score',
+                                           p_msp => 'Title for the Page',
+                                           p_msb => 'Title for the Problem',
+                                           p_mdb => 'Title for the Drop Box',
+                                           p_mbb => 'Title for the Bulletin Board',
+                                           p_mab => "Enter user:domain for User's 'About Me' Page",
+                                           p_mab2 => "About [_99]",
+                                           p_mab_alrt1 => 'Not a valid user:domain',
+                                           p_mab_alrt2 => 'Please enter both user and domain in the format user:domain',
+                                           p_chn => 'New Title',
+                                           p_rmr1 => 'WARNING: Removing a resource makes associated grades and scores inaccessible!',
+                                           p_rmr2a => 'Remove[_99]',
+                                           p_rmr2b => '?[_99]',
+                                           p_ctr1a => 'WARNING: Cutting a resource makes associated grades and scores inaccessible!',
+                                           p_ctr1b => 'Grades remain inaccessible if resource is pasted into another folder.',
+                                           p_ctr2a => 'Cut[_98]',
+                                           p_ctr2b => '?[_98]'
+                                         );
+     return <<ENDNEWSCRIPT;
+ function makenewfolder(targetform,folderseq) {
+     var foldername=prompt('$lt{"p_mnf"}','$lt{"t_mnf"}');
+     if (foldername) {
+        targetform.importdetail.value=escape(foldername)+"="+folderseq;
+         targetform.submit();
+     }
+ }
+ function makenewpage(targetform,folderseq) {
+     var pagename=prompt('$lt{"p_mnp"}','$lt{"t_mnp"}');
+     if (pagename) {
+         targetform.importdetail.value=escape(pagename)+"="+folderseq;
+         targetform.submit();
+     }
+ }
+ function makenewext(targetname) {
+     this.document.forms.extimport.useform.value=targetname;
+     this.document.forms.extimport.title.value='';
+     this.document.forms.extimport.url.value='';
+     this.document.forms.extimport.residx.value='';
+     window.open('/adm/rat/extpickframe.html');
+ }
+ function edittext(targetname,residx,title,url) {
+     this.document.forms.extimport.useform.value=targetname;
+     this.document.forms.extimport.residx.value=residx;
+     this.document.forms.extimport.url.value=url;
+     this.document.forms.extimport.title.value=title;
+     window.open('/adm/rat/extpickframe.html');
+ }
+ function makeexamupload() {
+    var title=prompt('$lt{"p_mxu"}');
+    if (title) {
+     this.document.forms.newexamupload.importdetail.value=
+ 	escape(title)+'=/res/lib/templates/examupload.problem';
+     this.document.forms.newexamupload.submit();
+    }
+ }
+ function makesmppage() {
+    var title=prompt('$lt{"p_msp"}');
+    if (title) {
+     this.document.forms.newsmppg.importdetail.value=
+ 	escape(title)+'=/adm/$udom/$uname/$now/smppg';
+     this.document.forms.newsmppg.submit();
+    }
+ }
+ function makesmpproblem() {
+    var title=prompt('$lt{"p_msb"}');
+    if (title) {
+     this.document.forms.newsmpproblem.importdetail.value=
+ 	escape(title)+'=/res/lib/templates/simpleproblem.problem';
+     this.document.forms.newsmpproblem.submit();
+    }
+ }
+ function makedropbox() {
+    var title=prompt('$lt{"p_mdb"}');
+    if (title) {
+     this.document.forms.newdropbox.importdetail.value=
+         escape(title)+'=/res/lib/templates/DropBox.problem';
+     this.document.forms.newdropbox.submit();
+    }
+ }
+ function makebulboard() {
+    var title=prompt('$lt{"p_mbb"}');
+    if (title) {
+     this.document.forms.newbul.importdetail.value=
+ 	escape(title)+'=/adm/$udom/$uname/$now/bulletinboard';
+     this.document.forms.newbul.submit();
+    }
+ }
+ function makeabout() {
+    var user=prompt("$lt{'p_mab'}");
+    if (user) {
+        var comp=new Array();
+        comp=user.split(':');
+        if ((typeof(comp[0])!=undefined) && (typeof(comp[1])!=undefined)) {
+ 	   if ((comp[0]) && (comp[1])) {
+ 	       this.document.forms.newaboutsomeone.importdetail.value=
+ 		   '$lt{"p_mab2"}'+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
+ 	       this.document.forms.newaboutsomeone.submit();
+ 	   } else {
+                alert("$lt{'p_mab_alrt1'}");
+            }
+        } else {
+            alert("$lt{'p_mab_alrt2'}");
+        }
+    }
+ }
+ function makeims() {
+     var caller = document.forms.ims.folder.value;
+     var newlocation = "/adm/imsimportdocs?folder="+caller+"&phase=one";
+     newWindow = window.open("","IMSimport","HEIGHT=700,WIDTH=750,scrollbars=yes");
+     newWindow.location.href = newlocation;
+ }
+ function finishpick() {
+     var title=this.document.forms.extimport.title.value;
+     var url=this.document.forms.extimport.url.value;
+     var form=this.document.forms.extimport.useform.value;
+     var residx=this.document.forms.extimport.residx.value;
+     eval('this.document.forms.'+form+'.importdetail.value="'+title+'='+url+'='+residx+'";this.document.forms.'+form+'.submit();');
+ }
+ function changename(folderpath,index,oldtitle,container,pagesymb) {
+     var title=prompt('$lt{"p_chn"}',oldtitle);
+     if (title) {
+ 	this.document.forms.renameform.markcopy.value=-1;
+ 	this.document.forms.renameform.title.value=title;
+ 	this.document.forms.renameform.cmd.value='rename_'+index;
+         if (container == 'sequence') {
+ 	    this.document.forms.renameform.folderpath.value=folderpath;
+         }
+         if (container == 'page') {
+             this.document.forms.renameform.pagepath.value=folderpath;
+             this.document.forms.renameform.pagesymb.value=pagesymb;
+         }
+         this.document.forms.renameform.submit();
+     }
+ }
+ 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"}')) {
+ 	this.document.forms.renameform.markcopy.value=-1;
+ 	this.document.forms.renameform.cmd.value='del_'+index;
+         if (container == 'sequence') {
+             this.document.forms.renameform.folderpath.value=folderpath;
+         }
+         if (container == 'page') {
+             this.document.forms.renameform.pagepath.value=folderpath;
+             this.document.forms.renameform.pagesymb.value=pagesymb;
+         }
+         this.document.forms.renameform.submit();
+     }
+ }
+ 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"}')) {
+ 	this.document.forms.renameform.cmd.value='cut_'+index;
+ 	this.document.forms.renameform.markcopy.value=index;
+ 	this.document.forms.renameform.copyfolder.value=folder+'.'+container;
+         if (container == 'sequence') {
+             this.document.forms.renameform.folderpath.value=folderpath;
+         }
+         if (container == 'page') {
+             this.document.forms.renameform.pagepath.value=folderpath;
+             this.document.forms.renameform.pagesymb.value=pagesymb;
+         }
+         this.document.forms.renameform.submit();
+     }
+ }
+ function markcopy(folderpath,index,oldtitle,container,pagesymb,folder) {
+     this.document.forms.renameform.markcopy.value=index;
+     this.document.forms.renameform.copyfolder.value=folder+'.'+container;
+     if (container == 'sequence') {
+ 	this.document.forms.renameform.folderpath.value=folderpath;
+     }
+     if (container == 'page') {
+ 	this.document.forms.renameform.pagepath.value=folderpath;
+ 	this.document.forms.renameform.pagesymb.value=pagesymb;
+     }
+     this.document.forms.renameform.submit();
+ }
+ function hideAll() {
+ 	currentData = document.getElementById('content');
+ 	currentDivs = currentData.getElementsByTagName('div');
+ 	for (i = 0; i < currentDivs.length; i++) {
+ 	currentDivs[i].style.display = 'none';
+ 	}
+ }
+ function showPage(current, pageId) {
+ 	hideAll();
+ 	current.className = 'active';
+ 	currentData = document.getElementById(pageId);
+ 	currentData.style.display = 'block';
+ 	return false;
+ }
+ ENDNEWSCRIPT
+ }
 ;
  __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

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

Removed from v.1.196
changed lines
	Added in v.1.331