--- loncom/interface/londocs.pm	2006/05/12 16:47:35	1.227
+++ loncom/interface/londocs.pm	2006/05/30 12:46:09	1.228
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.227 2006/05/12 16:47:35 albertel Exp $
+# $Id: londocs.pm,v 1.228 2006/05/30 12:46:09 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,6 +42,8 @@ use HTML::Entities;
 use GDBM_File;
 use Apache::lonlocal;
 use Cwd;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
 
 my $iconpath;
 
@@ -950,9 +952,9 @@ sub breadcrumbs {
     if ($env{'form.markedcopy_url'}) {
 	&Apache::lonnet::logthis('Found '.$env{'form.markedcopy_url'});
        $cpinfo='&markedcopy_url='.
-               &Apache::lonnet::escape($env{'form.markedcopy_url'}).
+               &escape($env{'form.markedcopy_url'}).
                '&markedcopy_title='.
-               &Apache::lonnet::escape($env{'form.markedcopy_title'});
+               &escape($env{'form.markedcopy_title'});
     }
     while (@folders) {
 	my $folder=shift(@folders);
@@ -960,12 +962,12 @@ sub breadcrumbs {
 	if ($folderpath) {$folderpath.='&';}
 	$folderpath.=$folder.'&'.$foldername;
 	my $url='/adm/coursedocs?folderpath='.
-	    &Apache::lonnet::escape($folderpath);
+	    &escape($folderpath);
 	    &Apache::lonhtmlcommon::add_breadcrumb(
 		      {'href'=>$url.$cpinfo,
-		       'title'=>&Apache::lonnet::unescape($foldername),
+		       'title'=>&unescape($foldername),
 		       'text'=>'<font size="+1">'.
-			   &Apache::lonnet::unescape($foldername).'</font>'
+			   &unescape($foldername).'</font>'
 		       });
 		       
 						 
@@ -1170,8 +1172,8 @@ sub editor {
 		foreach (split(/\&/,$env{'form.importdetail'})) {
 		    if (defined($_)) {
 			my ($name,$url)=split(/\=/,$_);
-			$name=&Apache::lonnet::unescape($name);
-			$url=&Apache::lonnet::unescape($url);
+			$name=&unescape($name);
+			$url=&unescape($url);
 			push @imports, $name, $url;
 		    }
 		}
@@ -1324,14 +1326,14 @@ sub process_file_upload {
                   method="post" enctype="multipart/form-data">
    <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 />
    <table>';
                     foreach my $embed_file (keys(%{$allfiles})) {
                         $$upload_output .= '<tr><td>'.$embed_file.
           '<input name="embedded_item_'.$num.'" type="file" />
-           <input name="embedded_orig_'.$num.'" type="hidden" value="'.&Apache::lonnet::escape($embed_file).'" />';
+           <input name="embedded_orig_'.$num.'" type="hidden" value="'.&escape($embed_file).'" />';
                         my $attrib;
                         if (@{$$allfiles{$embed_file}} > 1) {
                             $attrib = join(':',@{$$allfiles{$embed_file}});
@@ -1342,7 +1344,7 @@ sub process_file_upload {
            '<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}).'" />';
+          '<input name="codebase_'.$num.'" type="hidden" value="'.&escape($$codebase{$embed_file}).'" />';
                         }
                         $$upload_output .= '</td></tr>';
                         $num ++;
@@ -1385,7 +1387,7 @@ sub entryline {
     my ($index,$title,$url,$folder,$allowed,$residx,$coursenum)=@_;
     $title=~s/\&colon\;/\:/g;
     $title=&HTML::Entities::encode(&HTML::Entities::decode(
-     &Apache::lonnet::unescape($title)),'"<>&\'');
+     &unescape($title)),'"<>&\'');
     my $renametitle=$title;
     my $foldertitle=$title;
     my $pagetitle=$title;
@@ -1405,21 +1407,21 @@ sub entryline {
     my $folderpath;
     if ($env{'form.folderpath'}) {
         $container = 'sequence';
-	$folderpath=&Apache::lonnet::escape($env{'form.folderpath'});
+	$folderpath=&escape($env{'form.folderpath'});
 	# $htmlfoldername=&HTML::Entities::encode($env{'form.foldername'},'<>&"');
     }
     my ($pagepath,$pagesymb);
     if ($env{'form.pagepath'}) {
         $container = 'page';
-        $pagepath=&Apache::lonnet::escape($env{'form.pagepath'});
-        $pagesymb=&Apache::lonnet::escape($env{'form.pagesymb'});
+        $pagepath=&escape($env{'form.pagepath'});
+        $pagesymb=&escape($env{'form.pagesymb'});
     }
     my $cpinfo='';
     if ($env{'form.markedcopy_url'}) {
        $cpinfo='&markedcopy_url='.
-               &Apache::lonnet::escape($env{'form.markedcopy_url'}).
+               &escape($env{'form.markedcopy_url'}).
                '&markedcopy_title='.
-               &Apache::lonnet::escape($env{'form.markedcopy_title'});
+               &escape($env{'form.markedcopy_title'});
     }
     if ($allowed) {
 	my $incindex=$index+1;
@@ -1577,21 +1579,21 @@ END
 	} elsif ($url=~m|^/ext/|) { 
 	    $url='/adm/wrapper'.$url;
 	}
-	$url.=(($url=~/\?/)?'&':'?').'symb='.&Apache::lonnet::escape($symb);
+	$url.=(($url=~/\?/)?'&':'?').'symb='.&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);
+	    $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb);
 	}
     }
     my $parameterset='&nbsp;';
     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;
-	$url.='folderpath='.&Apache::lonnet::escape($folderpath).$cpinfo;
+	$url.='folderpath='.&escape($folderpath).$cpinfo;
 	$parameterset='<label>'.&mt('Randomly Pick: ').
 	    '<input type="text" size="4" onChange="this.form.submit()" name="randpick_'.$orderidx.'" value="'.
 	    (&Apache::lonratedt::getparameter($orderidx,
@@ -1601,7 +1603,7 @@ END
        
     }
     if ($ispage) {
-        my $pagename=&Apache::lonnet::escape($pagetitle);
+        my $pagename=&escape($pagetitle);
         my $pagepath;
         my $folderpath=$env{'form.folderpath'};
         if ($folderpath) { $pagepath = $folderpath.'&' };
@@ -1615,8 +1617,8 @@ END
 					       $residx,
 					       $path.$pagearg.'.page');
 	}
-	$url.='pagepath='.&Apache::lonnet::escape($pagepath).
-	    '&pagesymb='.&Apache::lonnet::escape($symb).$cpinfo;
+	$url.='pagepath='.&escape($pagepath).
+	    '&pagesymb='.&escape($symb).$cpinfo;
     }
     $line.='<td bgcolor="#FFFFBB"><a href="'.$url.'"><img src="'.$icon.
 	'" border="0"></a></td>'.
@@ -1671,7 +1673,7 @@ sub untiehash {
 
 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!~/\*$/)) {
@@ -1771,14 +1773,14 @@ sub verifycontent {
    &tiehash();
    foreach (keys %hash) {
        if ($hash{$_}=~/\.(page|sequence)$/) {
-	   if (($_=~/^src_/) && ($alreadyseen{&Apache::lonnet::unescape($hash{$_})})) {
+	   if (($_=~/^src_/) && ($alreadyseen{&unescape($hash{$_})})) {
 	       $r->print('<hr /><font color="red">'.
 			 &mt('The following sequence or page is included more than once in your course: ').
-			 &Apache::lonnet::unescape($hash{$_}).'</font><br />'.
+			 &unescape($hash{$_}).'</font><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 (($_=~/^src\_(.+)$/) && (!$alreadyseen{&unescape($hash{$_})})) {
            &checkonthis($r,$hash{$_},0,$hash{'title_'.$1});
        }
    }
@@ -2066,12 +2068,12 @@ 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.='&amp;pagesymb='.&Apache::lonnet::escape($env{'form.pagesymb'});
+	    $path=&escape($env{'form.pagepath'});
+	    $path.='&amp;pagesymb='.&escape($env{'form.pagesymb'});
 	}
 	$url='/adm/coursedocs?'.$pathvar.'='.$path;
     }
@@ -2147,12 +2149,12 @@ sub handler {
 					     'markedcopy_title']);
     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="" />';
@@ -2184,7 +2186,7 @@ sub handler {
 # 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));
 
 # graphics settings
@@ -2218,15 +2220,15 @@ sub handler {
           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 = ();
@@ -2236,7 +2238,7 @@ sub handler {
                       @attributes = ($env{'form.embedded_attrib_'.$i});
                   }
                   foreach (@attributes) {
-                      push(@{$attribs{$i}},&Apache::lonnet::unescape($_));
+                      push(@{$attribs{$i}},&unescape($_));
                   }
                   if ($javacodebase) {
                       $codebase{$i} = $javacodebase;
@@ -2330,7 +2332,7 @@ sub handler {
 	   if ($env{'form.folder'} eq '' ||
 	       $env{'form.folder'} eq 'supplemental') {
 	       $folderpath='default&'.
-		   &Apache::lonnet::escape(&mt('Main Course Documents'));
+		   &escape(&mt('Main Course Documents'));
 	   }
        }
        unless ($env{'form.pagepath'}) {
@@ -2374,7 +2376,7 @@ ENDCOURSEVERIFY
        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 Course Documents'));
        }
        my $postexec='';
        if ($folder eq 'default') {
@@ -2605,7 +2607,7 @@ ENDBLOCK
        if ($folder =~ /^supplemental$/ &&
 	   $env{'form.folderpath'} =~ /^default\&/) {
 	   $env{'form.folderpath'}='supplemental&'.
-	       &Apache::lonnet::escape(&mt('Supplemental Course Documents'));
+	       &escape(&mt('Supplemental Course Documents'));
        }
        &editor($r,$coursenum,$coursedom,$folder,$allowed);
        if ($allowed) {