--- loncom/interface/londocs.pm	2004/09/14 01:21:49	1.142
+++ loncom/interface/londocs.pm	2004/12/14 21:10:58	1.156
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.142 2004/09/14 01:21:49 raeburn Exp $
+# $Id: londocs.pm,v 1.156 2004/12/14 21:10:58 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,6 +40,7 @@ use Apache::lonnavmaps;
 use HTML::Entities;
 use GDBM_File;
 use Apache::lonlocal;
+use Cwd;
 
 my $iconpath;
 
@@ -254,6 +255,7 @@ sub exportcourse {
     my $navmap = Apache::lonnavmaps::navmap->new();
     my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef);
     my $curRes;
+    my $outcome;
 
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                             ['finishexport']);
@@ -277,29 +279,49 @@ sub exportcourse {
                 $discussions[0] = $ENV{'form.discussion'};
             }
         }
-        my $curRes;
-        my $count;
-        my %symbs;
-        my $display;
-        while ($curRes = $it->next()) {
-            if (ref($curRes)) {
-                $count ++;
-                $symbs{$count} = $curRes->symb();
-                if (grep/^$count$/,@exportitems) {
-                    $display.= 'Export content item '.$curRes->title()."<br />\n";
+        if (@exportitems == 0 && @discussions == 0) {
+            $outcome = '<br />As you did not select any content items or discussions for export, an IMS package has not been created.  Please <a href="javascript:history.go(-1)">go back</a> to select either content items or discussions for export';
+        } else {
+            my $now = time;
+            my $count = 0;
+            my %symbs;
+            my $manifestok = 0;
+            my $imsresources;
+            my $tempexport;
+            my $copyresult;
+            my $ims_manifest = &create_ims_store($now,\$manifestok,\$outcome,\$tempexport);
+            if ($manifestok) {
+                &build_package($now,$navmap,\@exportitems,\@discussions,\$outcome,\$tempexport,\$copyresult,$ims_manifest);
+                close($ims_manifest);
+
+#Create zip file in prtspool
+                my $imszipfile = '/prtspool/'.
+                $ENV{'user.name'}.'_'.$ENV{'user.domain'}.'_'.
+                   time.'_'.rand(1000000000).'.zip';
+# zip can cause an sh launch which can pass along all of %ENV
+# which can be too large for /bin/sh to handle
+                my %oldENV=%ENV;
+                undef(%ENV);
+                my $cwd = &Cwd::getcwd();
+                my $imszip = '/home/httpd/'.$imszipfile;
+                chdir $tempexport;
+                open(OUTPUT, "zip -r $imszip *  2> /dev/null |");
+                close(OUTPUT);
+                chdir $cwd;
+                %ENV=%oldENV;
+                undef(%oldENV);
+                $outcome .= 'Download the zip file from <a href="'.$imszipfile.'">IMS course archive</a><br />';
+                if ($copyresult) {
+                    $outcome .= 'The following errors occurred during export - '.$copyresult;
                 }
-                if (grep/^$count$/,@discussions) {
-                    $display.= 'Export discussion posts '.$curRes->title()."<br />\n";
-                }  
+            } 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 />';
             }
         }
 
         $r->print('<html><head><title>Export Course</title></head>'.
-            &Apache::loncommon::bodytag('Export course to IMS or SCORM content package'
-));
-
-        my $exportfile;
-        $r->print($display);
+            &Apache::loncommon::bodytag('Export course to IMS or SCORM content package'));
+        $r->print($outcome);
         $r->print('</body></html>');
     } else {
         my $display;
@@ -433,6 +455,255 @@ function containerCheck(item) {
     }
 }
 
+sub create_ims_store {
+    my ($now,$manifestok,$outcome,$tempexport) = @_;
+    $$tempexport = $Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/ims_exports';
+    my $ims_manifest;
+    if (!-e $$tempexport) {
+        mkdir($$tempexport,0700);
+    }
+    $$tempexport .= '/'.$now;
+    if (!-e $$tempexport) {
+        mkdir($$tempexport,0700);
+    }
+    $$tempexport .= '/'.$ENV{'user.domain'}.'_'.$ENV{'user.name'};
+    if (!-e $$tempexport) {
+        mkdir($$tempexport,0700);
+    }
+# open manifest file
+    my $manifest = '/imsmanifest.xml';
+    my $manifestfilename = $$tempexport.$manifest;
+    if ($ims_manifest = Apache::File->new('>'.$manifestfilename)) {
+        $$manifestok=1;
+        print $ims_manifest
+'<?xml version="1.0" encoding="UTF-8"?>'."\n".
+'<manifest xmlns="http://www.imsglobal.org/xsd/imscp_v1p1"'.
+' xmlns:imsmd="http://www.imsglobal.org/xsd/imsmd_v1p2"'.
+' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'.
+' 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".
+'  <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>'
+    } else {
+        $$outcome .= 'An error occurred opening the IMS manifest file.<br />'
+;
+    }
+    return $ims_manifest;
+}
+
+sub build_package {
+    my ($now,$navmap,$exportitems,$discussions,$outcome,$tempexport,$copyresult,$ims_manifest) = @_;
+# first iterator to look for dependencies
+    my $it = $navmap->getIterator(undef,undef,undef,1,undef,undef);
+    my $curRes;
+    my $count = 0;
+    my $depth = 0;
+    my $lastcontainer = 0;
+    my %parent = ();
+    my @dependencies = ();
+    my $cnum = $ENV{'request.'.$ENV{'request.course.id'}.'.num'};
+    my $cdom = $ENV{'request.'.$ENV{'request.course.id'}.'.domain'};
+    while ($curRes = $it->next()) {
+        if (ref($curRes)) {
+            $count ++;
+        }
+        if ($curRes == $it->BEGIN_MAP()) {
+            $depth++;
+            $parent{$depth} = $lastcontainer;
+        }
+        if ($curRes == $it->END_MAP()) {
+            $depth--;
+            $lastcontainer = $parent{$depth};
+        }
+        if (ref($curRes)) {
+            if ($curRes->is_sequence() || $curRes->is_page()) {
+                $lastcontainer = $count;
+            }
+            if (grep/^$count$/,@$exportitems) {
+                &get_dependencies($exportitems,\%parent,$depth,\@dependencies);
+            }
+        }
+    }
+# second iterator to build manifest and store resources
+    $it = $navmap->getIterator(undef,undef,undef,1,undef,undef);
+    $depth = 0;
+    my $prevdepth;
+    $count = 0;
+    my $imsresources;
+    my $pkgdepth;
+    if ($curRes == $it->BEGIN_MAP()) {
+        $prevdepth = $depth;
+        $depth++;
+    }
+    if ($curRes == $it->END_MAP()) {
+        $prevdepth = $depth;
+        $depth--;
+    }
+
+    if (ref($curRes)) {
+        if ((grep/^$count$/,@$exportitems) || (grep/^$count$/,@dependencies)) {
+            my $symb = $curRes->symb();
+            my $isvisible = 'true';
+            my $resourceref;
+            if ($curRes->randomout()) {
+                $isvisible = 'false';
+            }
+            unless ($curRes->is_sequence()) {
+                $resourceref = 'identifierref="RES-'.$ENV{'request.course.id'}.'-'.$count.'"';
+            }
+            if (($depth <= $prevdepth) && ($count > 1)) {
+                print $ims_manifest '  </item>'."\n";
+            }
+            $prevdepth = $depth;
+
+            my $itementry =
+              '<item identifier="ITEM-'.$ENV{'request.course.id'}.'-'.$count.
+              '" isvisible="'.$isvisible.'" '.$resourceref.'>'.
+              '<title>'.$curRes->title().'</title>';
+            print $ims_manifest "\n".$itementry;
+
+            unless ($curRes->is_sequence()) {
+                my $content_file;
+                my @hrefs = ();
+                &process_content($count,$curRes,$cdom,$cnum,$symb,$content_file,\@hrefs,$copyresult,$tempexport);
+                if ($content_file) {
+                    $imsresources .= "\n".
+                     '   <resource identifier="RES-'.$ENV{'request.course.id'}.'-'.$count.
+                     '" type="webcontent" href="'.$content_file.'">'."\n".
+                     '       <file href="'.$content_file.'" />'."\n";
+                    foreach (@hrefs) {
+                        $imsresources .=
+                     '        <file href="'.$_.'" />'."\n";
+                    }
+                    $imsresources .= '    </resource>'."\n";
+                }
+            }
+            $pkgdepth = $depth;
+        }
+    }
+    while ($pkgdepth > -1) {
+        print $ims_manifest "    </item>\n";
+        $pkgdepth --;
+    }
+    my $resource_text = qq|
+    </organization>
+  </organizations>
+  <resources>
+    $imsresources
+  </resources>
+</manifest>
+    |;
+    print $ims_manifest $resource_text;
+}
+
+sub get_dependencies {
+    my ($exportitems,$parent,$depth,$dependencies) = @_;
+    if ($depth > 1) {
+        unless (grep/^$$parent{$depth}$/,@$exportitems || grep/^$$parent{$depth}$/,@$dependencies) {
+            push @$dependencies, $$parent{$depth};
+            if ($depth > 2) {
+                &get_dependencies($exportitems,$parent,$depth-1,$dependencies);
+            }
+        }
+    }
+}
+
+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 %roleshash = &Appache::lonnet::get_my_roles();
+    if ($curRes->is_page()) {
+        $content_type = 'page';
+    } elsif ($symb =~ m-public/$cdom/$cnum/syllabus$-) {
+        $content_type = 'syllabus';
+    } elsif ($symb =~ m-\.sequence____\d+____ext-) {
+        $content_type = 'external';
+    } elsif ($symb =~ m-adm/navmaps$-) {
+        $content_type =  'navmap';
+    } elsif ($symb =~ m-adm/$cdom/$cnum/\d+/smppg$-) {
+        $content_type = 'simplepage';
+    } elsif ($symb =~ m-$-) {
+        $content_type = 'simpleproblem';
+    } elsif ($symb =~ m-adm/$cdom/$cnum/\d+/bulletinboard$-) {
+        $content_type = 'bulletinboard';
+    } elsif ($symb =~ m-adm/$cdom/$cnum/\d+/aboutme$-) {
+        $content_type = 'aboutme';
+    } elsif ($symb =~ m-uploaded/$cdom/$cnum-) {
+        &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,'uploaded');
+    } elsif ($symb =~ m-\.sequence____\d+____([^/])/([^/])-) {
+        my $coauth = $2.':'.$1.':ca';
+        my $canedit = 0;
+        if ($1 eq $ENV{'user.domain'} && $2 eq $ENV{'user.name'})  {
+            $canedit= 1;
+        } elsif (defined($roleshash{$coauth})) {
+            if ($roleshash{$coauth} =~ /(\d+):(\d+)/) {
+                if (($1 < time || $1 == 0) && ($2 == 0 || $2 >= time)) {
+                    $canedit = 1;
+                }
+            } elsif ($roleshash{$coauth} eq ':') {
+                $canedit = 1;
+            }
+        }
+        if ($canedit) {
+            &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,'resource');
+        } else {
+            &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,'noedit');
+        }
+    }
+    $$copyresult .= $message."\n";
+}
+
+sub replicate_content {
+    my ($cdom,$cnum,$tempexport,$symb,$count,$message,$caller) = @_;
+    my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
+    my $feedurl = &Apache::lonnet::clutter($url);
+
+    my $content;
+    my $filename;
+    my $repstatus;
+    if ($url =~ m-[^/]/(.+)$-) {
+        $filename = $1;
+        if (!-e $tempexport.'/resources') {
+            mkdir($tempexport.'/resources',0700);
+        }
+        if (!-e $tempexport.'/resources') {
+            mkdir($tempexport.'/resources/'.$count,0700);
+        }
+        my $destination = $$tempexport.'/resources/'.$count.'/'.$filename;
+        my $copiedfile;
+        if ($copiedfile = Apache::File->new('>'.$destination)) {
+            my $content;
+            if ($caller eq 'uploaded' || $caller eq 'resource') {
+                $content = &Apache::lonnet::getfile($url);
+                if ($content eq -1) {
+                    $$message = 'Could not copy file '.$filename;
+                } else {
+                    $repstatus = 'ok';
+                }
+            } elsif ($caller eq 'noedit') {
+                my $rtncode;
+                $repstatus = &getuploaded('GET',$url,$cdom,$cnum,$content,$rtncode);
+                unless ($repstatus eq 'ok') {
+                    $$message = 'Could not render '.$url.' server message - '.$rtncode;
+                }
+            }
+            if ($repstatus eq 'ok') {
+                print $copiedfile $content;
+            }
+            close($copiedfile);
+        } else {
+            $$message = 'Could not open destination file for '.$filename."\n";
+        }
+    } else {
+        $$message = 'Could not determine name of file for ';
+    }
+    return $repstatus;
+}
 
 # Imports the given (name, url) resources into the course
 # coursenum, coursedom, and folder must precede the list
@@ -663,10 +934,11 @@ sub editor {
                     $comment=~s/\</\&lt\;/g;
                     $comment=~s/\>/\&gt\;/g;
                     $comment=~s/\:/\&colon;/g;
-                    $Apache::lonratedt::resources[
+		    if ($comment=~/\S/) {
+			$Apache::lonratedt::resources[
 				       $Apache::lonratedt::order[$idx]]=
-                             $comment.':'.join(':',@rrest);
-                    
+				            $comment.':'.join(':',@rrest);
+		    }
                 }
 # Store the changed version
 		($errtext,$fatal)=&storemap($coursenum,$coursedom,
@@ -717,15 +989,17 @@ sub editor {
 # ---------------------------------------------------------------- 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) { next; }
+           unless ($name) { $idx++; next; }
            $r->print(&entryline($idx,$name,$url,$folder,$allowed,$_,$coursenum));
            $idx++;
+	   $shown++;
         }
-	unless ($idx) {
+	unless ($shown) {
 	    $r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>');
 	}
         $r->print('</table>');
@@ -760,10 +1034,11 @@ sub entryline {
 	$folderpath=&Apache::lonnet::escape($ENV{'form.folderpath'});
 	# $htmlfoldername=&HTML::Entities::encode($ENV{'form.foldername'},'<>&"');
     }
-    my $pagepath;
+    my ($pagepath,$pagesymb);
     if ($ENV{'form.pagepath'}) {
         $container = 'page';
         $pagepath=&Apache::lonnet::escape($ENV{'form.pagepath'});
+        $pagesymb=&Apache::lonnet::escape($ENV{'form.pagesymb'});
     }
     if ($allowed) {
 	my $incindex=$index+1;
@@ -790,20 +1065,21 @@ sub entryline {
             $line.=(<<END);
 <form name="entry_$index" action="/adm/coursedocs" method="post">
 <input type="hidden" name="pagepath" value="$ENV{'form.pagepath'}" />
+<input type="hidden" name="pagesymb" value="$ENV{'form.pagesymb'}" />
 <input type="hidden" name="setparms" value="$orderidx" />
 <td><table border='0' cellspacing='2' cellpadding='0'>
 <tr><td bgcolor="#DDDDDD">
-<a href='/adm/coursedocs?cmd=up_$index&pagepath=$pagepath'>
+<a href='/adm/coursedocs?cmd=up_$index&pagepath=$pagepath&pagesymb=$pagesymb'>
 <img src="${iconpath}move_up.gif" alt='$lt{'up'}' border='0' /></a></td></tr>
 <tr><td bgcolor="#DDDDDD">
-<a href='/adm/coursedocs?cmd=down_$index&pagepath=$pagepath'>
+<a href='/adm/coursedocs?cmd=down_$index&pagepath=$pagepath&pagesymb=$pagesymb'>
 <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' border='0' /></a></td></tr>
 </table></td>
 <td>$selectbox
 </td><td bgcolor="#DDDDDD">
-<a href='javascript:removeres("$pagepath","$index","$renametitle","page");'>
+<a href='javascript:removeres("$pagepath","$index","$renametitle","page","$pagesymb");'>
 <font size="-2" color="#990000">$lt{'rm'}</font></a>
-<a href='javascript:changename("$pagepath","$index","$renametitle","page");'>
+<a href='javascript:changename("$pagepath","$index","$renametitle","page","$pagesymb");'>
 <font size="-2" color="#009900">$lt{'rn'}</font></a></td>
 END
         } else {
@@ -875,10 +1151,16 @@ END
 	    } elsif ($url!~/\.(sequence|page)$/) {
 		$url='/adm/coursedocs/showdoc'.$url;
 	    }
+	} elsif ($url=~m|^/ext/|) { 
+	    $url='/adm/wrapper'.$url;
 	}
-        unless ($container eq 'page') {
+	$url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb);
+	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);
-        }
+	}
     }
     my $parameterset='&nbsp;';
     if ($isfolder) {
@@ -887,9 +1169,12 @@ END
 	if ($folderpath) { $folderpath.='&' };
 	$folderpath.=$folderarg.'&'.$foldername;
 	$url.='folderpath='.&Apache::lonnet::escape($folderpath);
-	$parameterset=&mt('Randomly Pick: ').
+	$parameterset='<label>'.&mt('Randomly Pick: ').
 	    '<input type="text" size="4" name="randpick_'.$orderidx.'" value="'.
-	    (&Apache::lonratedt::getparameter($orderidx,'parameter_randompick'))[0].'" />';
+	    (&Apache::lonratedt::getparameter($orderidx,
+                                              'parameter_randompick'))[0].
+                                              '" />'.'</label>';
+       
     }
     if ($ispage) {
         my $pagename=&Apache::lonnet::escape($pagetitle);
@@ -897,7 +1182,17 @@ END
         my $folderpath=$ENV{'form.folderpath'};
         if ($folderpath) { $pagepath = $folderpath.'&' };
         $pagepath.=$pagearg.'&'.$pagename;
-        $url.='pagepath='.&Apache::lonnet::escape($pagepath);
+	my $symb=$ENV{'form.pagesymb'};
+	if (!$symb) {
+	    my $path='uploaded/'.
+		$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'.
+		$ENV{'course.'.$ENV{'request.course.id'}.'.num'}.'/';
+	    $symb=&Apache::lonnet::encode_symb($path.$folder.'.sequence',
+					       $residx,
+					       $path.$pagearg.'.page');
+	}
+	$url.='pagepath='.&Apache::lonnet::escape($pagepath).
+	    '&pagesymb='.&Apache::lonnet::escape($symb);
     }
     $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.
 	'" border="0"></a></td>'.
@@ -913,9 +1208,9 @@ END
 	    ((&Apache::lonratedt::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':'');
 	$line.=(<<ENDPARMS);
 <td bgcolor="#BBBBFF"><font size='-2'>
-<input type="checkbox" name="hidprs_$orderidx" $hidtext/> $lt{'hd'}</td>
-<!--<td bgcolor="#BBBBFF"><font size='-2'>
-<input type="checkbox" name="encprs_$orderidx" $enctext/> $lt{'ec'}</td>-->
+<nobr><label><input type="checkbox" name="hidprs_$orderidx" $hidtext/> $lt{'hd'}</label></nobr></td>
+<td bgcolor="#BBBBFF"><font size='-2'>
+<nobr><label><input type="checkbox" name="encprs_$orderidx" $enctext/> $lt{'ec'}</label></nobr></td>
 <td bgcolor="#BBBBFF"><font size="-2">$parameterset</font></td>
 <td bgcolor="#BBBBFF"><font size='-2'>
 <input type="submit" value="$lt{'sp'}" />
@@ -1328,11 +1623,18 @@ sub is_hash_old {
 sub changewarning {
     my ($r,$postexec)=@_;
     if (!&is_hash_old()) { return; }
+    my $pathvar='folderpath';
+    my $path=&Apache::lonnet::escape($ENV{'form.folderpath'});
+    if (defined($ENV{'form.pagepath'})) {
+	$pathvar='pagepath';
+	$path=&Apache::lonnet::escape($ENV{'form.pagepath'});
+	$path.='&amp;symb='.&Apache::lonnet::escape($ENV{'form.pagesymb'});
+    }
     $r->print(
 '<script>function reinit(tf) { tf.submit();'.$postexec.' }</script>'. 
 '<form method="post" action="/adm/roles" target="loncapaclient">'.
-'<input type="hidden" name="orgurl" value="/adm/coursedocs?folderpath='.
-&Apache::lonnet::escape($ENV{'form.folderpath'}).
+'<input type="hidden" name="orgurl" value="/adm/coursedocs?'.
+$pathvar.'='.$path.
 '" /><input type="hidden" name="selectrole" value="1" /><h3><font color="red">'.
 &mt('Changes will become active for your current session after').
 ' <input type="hidden" name="'.
@@ -1382,7 +1684,7 @@ sub handler {
 # is this a standard course?
 
     my $standard=($ENV{'request.course.uri'}=~/^\/uploaded\//);
-    my $forcestandard;
+    my $forcestandard = 0;
     my $forcesupplement;
     my $script='';
     my $allowed;
@@ -1391,7 +1693,7 @@ sub handler {
     my $containertag;
     my $uploadtag;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-					    ['folderpath','pagepath']);
+					    ['folderpath','pagepath','pagesymb']);
     if ($ENV{'form.folderpath'}) {
 	my (@folderpath)=split('&',$ENV{'form.folderpath'});
 	$ENV{'form.foldername'}=&Apache::lonnet::unescape(pop(@folderpath));
@@ -1401,14 +1703,19 @@ sub handler {
         my (@pagepath)=split('&',$ENV{'form.pagepath'});
         $ENV{'form.pagename'}=&Apache::lonnet::unescape(pop(@pagepath));
         $ENV{'form.folder'}=pop(@pagepath);
-        $containertag = '<input type="hidden" name="pagepath" value="" />';
-        $uploadtag = '<input type="hidden" name="pagepath" value="'.$ENV{'form.pagepath'}.'" />';
+        $containertag = '<input type="hidden" name="pagepath" value="" />'.
+	    '<input type="hidden" name="pagesymb" value="" />';
+        $uploadtag = '<input type="hidden" name="pagepath" value="'.$ENV{'form.pagepath'}.'" />'.
+	    '<input type="hidden" name="pagesymb" value="'.$ENV{'form.pagesymb'}.'" />';
     }
     if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
        $showdoc='/'.$1;
     }
     unless ($showdoc) { # got called from remote
-       $forcestandard=($ENV{'form.folder'}=~/^default_/);
+       if (($ENV{'form.folder'}=~/^default_/) || 
+          ($ENV{'form.folder'} =~ m#^\d+/(pages|sequences)/#)) {
+           $forcestandard = 1;
+       } 
        $forcesupplement=($ENV{'form.folder'}=~/^supplemental_/);
 
 # does this user have privileges to post, etc?
@@ -1542,7 +1849,7 @@ function finishpick() {
     '";this.document.forms.'+form+'.submit();');
 }
 
-function changename(folderpath,index,oldtitle,container) {
+function changename(folderpath,index,oldtitle,container,pagesymb) {
     var title=prompt('New Title',oldtitle);
     if (title) {
 	this.document.forms.renameform.title.value=title;
@@ -1552,12 +1859,13 @@ function changename(folderpath,index,old
         }
         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) {
+function removeres(folderpath,index,oldtitle,container,pagesymb) {
     if (confirm('Remove "'+oldtitle+'"?')) {
 	this.document.forms.renameform.cmd.value='del_'+index;
         if (container == 'sequence') {
@@ -1565,6 +1873,7 @@ function removeres(folderpath,index,oldt
         }
         if (container == 'page') {
             this.document.forms.renameform.pagepath.value=folderpath;
+            this.document.forms.renameform.pagesymb.value=pagesymb;
         }
         this.document.forms.renameform.submit();
     }