--- loncom/interface/londocs.pm	2004/12/10 19:22:29	1.151
+++ loncom/interface/londocs.pm	2005/02/17 08:29:42	1.167
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.151 2004/12/10 19:22:29 albertel Exp $
+# $Id: londocs.pm,v 1.167 2005/02/17 08:29:42 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -30,6 +30,7 @@ package Apache::londocs;
 
 use strict;
 use Apache::Constants qw(:common :http);
+use Apache::imsexport;
 use Apache::lonnet;
 use Apache::loncommon;
 use Apache::lonratedt;
@@ -131,11 +132,17 @@ sub dumpbutton {
     }
 }
 
+sub clean {
+    my ($title)=@_;
+    $title=~s/[^\w\/\!\$\%\^\*\-\_\=\+\;\:\,\\\|\`\~]+/\_/gs;
+    return $title;	
+}
 # -------------------------------------------------------- Actually dump course
 
 sub dumpcourse {
     my $r=shift;
-    $r->print('<html><head><title>Dump DOCS</title></head>'.
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print($html.'<head><title>Dump DOCS</title></head>'.
         &Apache::loncommon::bodytag('Dump Course DOCS to Construction Space').
 	      '<form name="dumpdoc" method="post">');
     my ($home,$other,%outhash)=&authorhosts();
@@ -148,7 +155,7 @@ sub dumpcourse {
 	my ($ca,$cd)=split(/\@/,$ENV{'form.authorspace'});
 	$r->print('<h3>'.&mt('Copying Files').'</h3>');
 	my $title=$ENV{'form.authorfolder'};
-	$title=~s/[^\w\/]+/\_/g;
+	$title=&clean($title);
 	my %replacehash=();
 	foreach (keys %ENV) {
 	    if ($_=~/^form\.namefor\_(.+)/) {
@@ -159,7 +166,7 @@ sub dumpcourse {
 	$crs=~s/\_/\//g;
 	foreach (keys %replacehash) {
 	    my $newfilename=$title.'/'.$replacehash{$_};
-	    $newfilename=~s/[^\w\/\.\/]+/\_/g;
+	    $newfilename=&clean($newfilename);
 	    my @dirs=split(/\//,$newfilename);
 	    my $path='/home/'.$ca.'/public_html';
 	    my $makepath=$path;
@@ -213,7 +220,7 @@ sub dumpcourse {
 	}
 	my $title=$origcrsdata{'description'};
 	$title=~s/\s+/\_/gs;
-	$title=~s/\W//gs;
+	$title=&clean($title);
 	$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>');
@@ -222,12 +229,13 @@ sub dumpcourse {
 	    my ($ext)=($_=~/\.(\w+)$/);
 	    my $title=$hash{'title_'.$hash{
 		'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$_}};
+	    $title=~s/&colon;/:/g;
 	    $r->print('<td>'.($title?$title:'&nbsp;').'</td>');
 	    unless ($title) {
 		$title=$_;
 	    }
 	    $title=~s/\.(\w+)$//;
-	    $title=~s/[^\w\/]+/\_/gs;
+	    $title=&clean($title);
 	    $title.='.'.$ext;
 	    $r->print("\n<td><input type='text' size='60' name='namefor_".$_."' value='".$title."' /></td></tr>\n");
 	}
@@ -241,6 +249,7 @@ sub dumpcourse {
 # ------------------------------------------------------ Generate "export" button
 
 sub exportbutton {
+    return '';
     return '</td><td bgcolor="#DDDDCC">'.
             '<input type="submit" name="exportcourse" value="'.
             &mt('Export Course to IMS').'" />'.
@@ -283,7 +292,6 @@ sub exportcourse {
             $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;
@@ -291,7 +299,7 @@ sub exportcourse {
             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);
+                &build_package($now,$navmap,\@exportitems,\@discussions,\$outcome,$tempexport,\$copyresult,$ims_manifest);
                 close($ims_manifest);
 
 #Create zip file in prtspool
@@ -318,9 +326,9 @@ sub exportcourse {
                 $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 $html=&Apache::lonxml::xmlbegin();
+        $r->print($html.'<head><title>Export Course</title></head>'.
+            &Apache::loncommon::bodytag('Export course to IMS content package'));
         $r->print($outcome);
         $r->print('</body></html>');
     } else {
@@ -369,6 +377,12 @@ sub exportcourse {
             }
             if (ref($curRes)) {
                 my $symb = $curRes->symb();
+                my $ressymb = $symb;
+                if ($ressymb =~ m|adm/(\w+)/(\w+)/(\d+)/bulletinboard$|) {
+                    unless ($ressymb =~ m|adm/wrapper/adm|) {
+                        $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard';
+                    }
+                }
                 my $color = $count%2;
                 $display .='<tr bgcolor='.$bgcolors[$color].'><td>'."\n".
                     '<input type="checkbox" name="archive" value="'.$count.'" ';
@@ -390,7 +404,7 @@ sub exportcourse {
                 my $currelem = $count+$boards+$startcount;
                 $children{$parent{$depth}} .= $currelem.':';
                 $display .= '&nbsp;'.$curRes->title().'</td>';
-                if ($discussiontime{$symb} > 0) {
+                if ($discussiontime{$ressymb} > 0) {
                     $boards ++;
                     $currelem = $count+$boards+$startcount;
                     $display .= '<td>&nbsp;</td><td align="right"><input type="checkbox" name="discussion" value="'.$count.'" />&nbsp;</td>'."\n";
@@ -403,13 +417,23 @@ sub exportcourse {
 <script>
 
 function checkAll(field) {
-    for (i = 0; i < field.length; i++)
-        field[i].checked = true ;
+    if (field.length > 0) {
+        for (i = 0; i < field.length; i++) {
+            field[i].checked = true ;
+        }
+    } else {
+        field.checked = true
+    }
 }
-
+                                                                                
 function uncheckAll(field) {
-    for (i = 0; i < field.length; i++)
-        field[i].checked = false ;
+    if (field.length > 0) {
+        for (i = 0; i < field.length; i++) {
+            field[i].checked = false ;
+        }
+    } else {
+        field.checked = false ;
+    }
 }
 
 function propagateCheck(item) {
@@ -444,8 +468,9 @@ function containerCheck(item) {
 
 </script>
         |;
-        $r->print('<html><head><title>Export Course</title>'.$scripttag.'</head>'.
-            &Apache::loncommon::bodytag('Export course to IMS or SCORM content package'
+	my $html=&Apache::lonxml::xmlbegin();
+        $r->print($html.'<head><title>Export Course</title>'.$scripttag.'</head>'.
+            &Apache::loncommon::bodytag('Export course to IMS content package'
 ));
 
         $r->print($display.'</table>'.
@@ -470,6 +495,9 @@ sub create_ims_store {
     if (!-e $$tempexport) {
         mkdir($$tempexport,0700);
     }
+    if (!-e "$$tempexport/resources") {
+        mkdir("$$tempexport/resources",0700);
+    }
 # open manifest file
     my $manifest = '/imsmanifest.xml';
     my $manifestfilename = $$tempexport.$manifest;
@@ -483,7 +511,7 @@ 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".
-'  <organizations default="ORG-."'.$ENV{'request,course.id'}.'-'.$now.'">'."\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>'
@@ -504,8 +532,8 @@ sub build_package {
     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'};
+    my $cnum = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+    my $cdom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
     while ($curRes = $it->next()) {
         if (ref($curRes)) {
             $count ++;
@@ -534,57 +562,80 @@ sub build_package {
     $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";
-            }
+    my $included = 0;
+    while ($curRes = $it->next()) {
+        if ($curRes == $it->BEGIN_MAP()) {
+            $prevdepth = $depth;
+            $depth++;
+        }
+        if ($curRes == $it->END_MAP()) {
             $prevdepth = $depth;
+            $depth--;
+        }
+
+        if (ref($curRes)) {
+            $count ++;
+            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) && ($included)) {
+                    print $ims_manifest "\n".'  </item>'."\n";
+                }
+                $included = 1;
+                $prevdepth = $depth;
 
-            my $itementry =
+                my $itementry =
               '<item identifier="ITEM-'.$ENV{'request.course.id'}.'-'.$count.
               '" isvisible="'.$isvisible.'" '.$resourceref.'>'.
               '<title>'.$curRes->title().'</title>';
-            print $ims_manifest "\n".$itementry;
+                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".
+                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 .=
+                        foreach (@hrefs) {
+                            $imsresources .=
                      '        <file href="'.$_.'" />'."\n";
+                        }
+                        if (grep/^$count$/,@$discussions) {
+                            my $ressymb = $symb;
+                            my $mode;
+                            if ($ressymb =~ m|adm/(\w+)/(\w+)/(\d+)/bulletinboard$|) {
+                                unless ($ressymb =~ m|adm/wrapper/adm|) {
+                                    $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard';
+                                }
+                                $mode = 'board';
+                            }
+                            my %extras = (
+                                          caller => 'imsexport',
+                                          tempexport => $tempexport.'/resources',
+                                          count => $count
+                                         );
+                            my $discresult = &Apache::lonfeedback::list_discussion($mode,undef,$ressymb,\%extras);
+                        }
+                        $imsresources .= '    </resource>'."\n";
                     }
-                    $imsresources .= '    </resource>'."\n";
                 }
+                $pkgdepth = $depth;
+            } else {
+                $included = 0;
             }
-            $pkgdepth = $depth;
         }
     }
-    while ($pkgdepth > -1) {
+    while ($pkgdepth > 0) {
         print $ims_manifest "    </item>\n";
         $pkgdepth --;
     }
@@ -602,7 +653,7 @@ sub build_package {
 sub get_dependencies {
     my ($exportitems,$parent,$depth,$dependencies) = @_;
     if ($depth > 1) {
-        unless (grep/^$$parent{$depth}$/,@$exportitems || grep/^$$parent{$depth}$/,@$dependencies) {
+        if ((!grep/^$$parent{$depth}$/,@$exportitems) && (!grep/^$$parent{$depth}$/,@$dependencies)) {
             push @$dependencies, $$parent{$depth};
             if ($depth > 2) {
                 &get_dependencies($exportitems,$parent,$depth-1,$dependencies);
@@ -616,81 +667,128 @@ sub process_content {
     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';
+    my @uploads = ();
+    if ($curRes->is_sequence()) {
+        $content_type = 'sequence';
+    } elsif ($curRes->is_page()) {
+        $content_type = 'page'; # need to handle individual items in pages.
     } elsif ($symb =~ m-public/$cdom/$cnum/syllabus$-) {
         $content_type = 'syllabus';
-    } elsif ($symb =~ m-\.sequence____\d+____ext-) {
+        my $contents = &Apache::imsexport::templatedpage($content_type);
+        if ($contents) {
+            $$content_file = &store_template($contents,$tempexport,$count,$content_type);
+        }
+    } elsif ($symb =~ m-\.sequence___\d+___ext-) {
         $content_type = 'external';
+        my $title = $curRes->title;
+        my $contents =  &Apache::imsexport::external($symb,$title);
+        if ($contents) {
+            $$content_file = &store_template($contents,$tempexport,$count,$content_type);
+        }
     } elsif ($symb =~ m-adm/navmaps$-) {
         $content_type =  'navmap';
-    } elsif ($symb =~ m-adm/$cdom/$cnum/\d+/smppg$-) {
+    } elsif ($symb =~ m-adm/[^/]+/[^/]+/(\d+)/smppg$-) {
         $content_type = 'simplepage';
-    } elsif ($symb =~ m-$-) {
+        my $contents = &Apache::imsexport::templatedpage($content_type,$1,$count,\@uploads);
+        if ($contents) {
+            $$content_file = &store_template($contents,$tempexport,$count,$content_type);
+        }
+    } elsif ($symb =~ m-lib/templates/simpleproblem\.problem$-) {
         $content_type = 'simpleproblem';
-    } elsif ($symb =~ m-adm/$cdom/$cnum/\d+/bulletinboard$-) {
+        my $contents =  &Apache::imsexport::simpleproblem($symb);
+        if ($contents) {
+            $$content_file = &store_template($contents,$tempexport,$count,$content_type);
+        }
+    } elsif ($symb =~ m-lib/templates/examupload\.problem-m) {
+        $content_type = 'examupload';
+    } elsif ($symb =~ m-adm/(\w+)/(\w+)/(\d+)/bulletinboard$-) {
         $content_type = 'bulletinboard';
-    } elsif ($symb =~ m-adm/$cdom/$cnum/\d+/aboutme$-) {
+        my $contents =  &Apache::imsexport::templatedpage($content_type,$3,$count,\@uploads,$1,$2);
+        if ($contents) {
+            $$content_file = &store_template($contents,$tempexport,$count,$content_type);
+        }
+    } elsif ($symb =~ m-adm/([^/]+)/([^/]+)/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 $contents =  &Apache::imsexport::templatedpage($content_type,undef,$count,\@uploads,$1,$2);
+        if ($contents) {
+            $$content_file = &store_template($contents,$tempexport,$count,$content_type);
+        }
+    } elsif ($symb =~ m-\.(sequence|page)___\d+___uploaded/$cdom/$cnum/-) {
+        $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'uploaded');
+    } elsif ($symb =~ m-\.(sequence|page)___\d+___([^/]+)/([^/]+)-) {
         my $canedit = 0;
-        if ($1 eq $ENV{'user.domain'} && $2 eq $ENV{'user.name'})  {
+        if ($2 eq $ENV{'user.domain'} && $3 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');
+            $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'resource');
         } else {
-            &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,'noedit');
+            $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'noedit');
         }
+    } elsif ($symb =~ m-uploaded/$cdom/$cnum-) {
+        $$content_file = &replicate_content($cdom,$cnum,$tempexport,$symb,$count,\$message,$href,'uploaded');
+    }
+    if (@uploads > 0) {
+        foreach my $item (@uploads) {
+            my $uploadmsg = '';
+            &replicate_content($cdom,$cnum,$tempexport,$item,$count,\$uploadmsg,$href,'templateupload');
+            if ($uploadmsg) {
+                $$copyresult .= $uploadmsg."\n";
+            }
+        }
+    }
+    if ($message) {
+        $$copyresult .= $message."\n";
     }
-    $$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 ($cdom,$cnum,$tempexport,$symb,$count,$message,$href,$caller) = @_;
+    my ($map,$ind,$url);
+    if ($caller eq 'templateupload') {
+        $url = $symb;
+        $url =~ s#//#/#g;
+    } else { 
+        ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
+    }
     my $content;
     my $filename;
     my $repstatus;
-    if ($url =~ m-[^/]/(.+)$-) {
+    my $content_name;
+    if ($url =~ m-/([^/]+)$-) {
         $filename = $1;
         if (!-e $tempexport.'/resources') {
             mkdir($tempexport.'/resources',0700);
         }
-        if (!-e $tempexport.'/resources') {
+        if (!-e $tempexport.'/resources/'.$count) {
             mkdir($tempexport.'/resources/'.$count,0700);
         }
-        my $destination = $$tempexport.'/resources/'.$count.'/'.$filename;
+        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 ($caller eq 'resource') {
+                $content = &Apache::lonnet::getfile('/home/httpd/html/res/'.$url);
                 if ($content eq -1) {
                     $$message = 'Could not copy file '.$filename;
                 } else {
+                    &extract_media($content,$count,$tempexport,$href,'resource');
                     $repstatus = 'ok';
                 }
-            } elsif ($caller eq 'noedit') {
+            } elsif ($caller eq 'uploaded' || $caller eq 'templateupload') {
                 my $rtncode;
-                $repstatus = &getuploaded('GET',$url,$cdom,$cnum,$content,$rtncode);
-                unless ($repstatus eq 'ok') {
+                $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');
+                    }
+                } else {
                     $$message = 'Could not render '.$url.' server message - '.$rtncode;
                 }
+            } 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. 
+                $repstatus = 'ok';
+                $content = 'Not the owner of this resource'; 
             }
             if ($repstatus eq 'ok') {
                 print $copiedfile $content;
@@ -700,9 +798,46 @@ sub replicate_content {
             $$message = 'Could not open destination file for '.$filename."\n";
         }
     } else {
-        $$message = 'Could not determine name of file for ';
+        $$message = 'Could not determine name of file for '.$symb."\n";
+    }
+    if ($repstatus eq 'ok') {
+        $content_name = $count.'/'.$filename;
+    }
+    return $content_name;
+}
+
+sub extract_media {
+    my ($content,$count,$tempexport,$href,$caller) = @_;
+# @$href will contain path to any embedded resources in the content.
+# For LON-CAPA problems this would be images. applets etc. 
+# For uploaded HTML files this would be images etc.
+# paths will be in the form $count/res/$file, and urls in the $content will be rewritten with the new paths. 
+    return;
+}
+
+sub store_template {
+    my ($contents,$tempexport,$count,$content_type) = @_;
+    if ($contents) {
+        if ($tempexport) {
+            if (!-e $tempexport.'/resources') {
+                mkdir($tempexport.'/resources',0700);
+            }
+            if (!-e $tempexport.'/resources/'.$count) {
+                mkdir($tempexport.'/resources/'.$count,0700);
+            }
+            my $destination = $tempexport.'/resources/'.$count.'/'.$content_type.'.xml';
+            my $storetemplate;
+            if ($storetemplate = Apache::File->new('>'.$destination)) {
+                print $storetemplate $contents;
+                close($storetemplate);
+            }
+            if ($content_type eq 'external') {
+                return $count.'/'.$content_type.'.html';
+            } else {
+                return $count.'/'.$content_type.'.xml';
+            }
+        }
     }
-    return $repstatus;
 }
 
 # Imports the given (name, url) resources into the course
@@ -873,7 +1008,8 @@ sub editor {
 	    if ( ($folder=~/^$1/) || ($1 eq 'default') ) {
 # 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 $url=&Apache::lonnet::userfileupload('uploaddoc',1,'docs');
+              my $newidx=$#Apache::lonratedt::resources+1;
+	      my $url=&Apache::lonnet::userfileupload('uploaddoc',1,'docs/'.$newidx);
               my $ext='false';
               if ($url=~/^http\:\/\//) { $ext='true'; }
               $url=~s/\:/\&colon;/g;
@@ -885,7 +1021,6 @@ sub editor {
 		  $comment=time.'___&&&___'.$ENV{'user.name'}.'___&&&___'.
 		      $ENV{'user.domain'}.'___&&&___'.$comment;
               }
-              my $newidx=$#Apache::lonratedt::resources+1;
               $Apache::lonratedt::resources[$newidx]=
                   $comment.':'.$url.':'.$ext.':normal:res';
               $Apache::lonratedt::order[$#Apache::lonratedt::order+1]=
@@ -1034,10 +1169,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;
@@ -1064,20 +1200,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 {
@@ -1152,9 +1289,13 @@ END
 	} 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) {
@@ -1164,10 +1305,11 @@ END
 	$folderpath.=$folderarg.'&'.$foldername;
 	$url.='folderpath='.&Apache::lonnet::escape($folderpath);
 	$parameterset='<label>'.&mt('Randomly Pick: ').
-	    '<input type="text" size="4" name="randpick_'.$orderidx.'" value="'.
+	    '<input type="text" size="4" onChange="this.form.submit()" name="randpick_'.$orderidx.'" value="'.
 	    (&Apache::lonratedt::getparameter($orderidx,
                                               'parameter_randompick'))[0].
-                                              '" />'.'</label>';
+                                              '" />'.
+'<font size="-2"><a href="javascript:void(0)">'.&mt('Store').'</a></font></label>';
        
     }
     if ($ispage) {
@@ -1176,7 +1318,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>'.
@@ -1184,21 +1336,17 @@ END
     if (($allowed) && ($folder!~/^supplemental/)) {
  	my %lt=&Apache::lonlocal::texthash(
  			      'hd' => 'Hidden',
- 			      'ec' => 'URL hidden',
- 			      'sp' => 'Store Parameters');
+ 			      'ec' => 'URL hidden');
 	my $enctext=
 	    ((&Apache::lonratedt::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i?' checked="1"':'');
 	my $hidtext=
 	    ((&Apache::lonratedt::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i?' checked="1"':'');
 	$line.=(<<ENDPARMS);
 <td bgcolor="#BBBBFF"><font size='-2'>
-<nobr><label><input type="checkbox" name="hidprs_$orderidx" $hidtext/> $lt{'hd'}</label></nobr></td>
+<nobr><label><input type="checkbox" name="hidprs_$orderidx" onClick="this.form.submit()" $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>
+<nobr><label><input type="checkbox" name="encprs_$orderidx" onClick="this.form.submit()" $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'}" />
-</font></td>
 ENDPARMS
     }
     $line.="</form></tr>";
@@ -1313,8 +1461,8 @@ sub verifycontent {
    my $r=shift; 
    my $loaderror=&Apache::lonnet::overloaderror($r);
    if ($loaderror) { return $loaderror; }
-
-   $r->print('<html><head><title>Verify Content</title></head>'.
+   my $html=&Apache::lonxml::xmlbegin();
+   $r->print($html.'<head><title>Verify Content</title></head>'.
               &Apache::loncommon::bodytag('Verify Course Documents'));
    $hashtied=0;
    undef %alreadyseen;
@@ -1342,7 +1490,8 @@ sub verifycontent {
 
 sub checkversions {
     my $r=shift;
-    $r->print('<html><head><title>Check Versions</title></head>'.
+    my $html=&Apache::lonxml::xmlbegin();
+    $r->print($html.'<head><title>Check Versions</title></head>'.
               &Apache::loncommon::bodytag('Check Course Document Versions'));
     my $header='';
     my $startsel='';
@@ -1612,6 +1761,7 @@ sub changewarning {
     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>'. 
@@ -1667,7 +1817,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;
@@ -1676,7 +1826,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));
@@ -1686,14 +1836,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?
@@ -1727,8 +1882,9 @@ sub handler {
     my $now=time;
 
 # print screen
+       my $html=&Apache::lonxml::xmlbegin();
     $r->print(<<ENDDOCUMENT);
-<html>
+$html
 <head>
 <title>The LearningOnline Network with CAPA</title>
 <script>
@@ -1805,16 +1961,20 @@ function makeabout() {
 	       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
+    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;
 }
 
 
@@ -1827,7 +1987,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;
@@ -1837,12 +1997,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') {
@@ -1850,6 +2011,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();
     }