--- loncom/xml/lonxml.pm	2001/06/16 18:34:31	1.96
+++ loncom/xml/lonxml.pm	2001/08/20 16:12:46	1.120
@@ -12,12 +12,15 @@
 # 6/2,6/3,6/8,6/9 Gerd Kortemeyer
 # 6/12,6/13 H. K. Ng
 # 6/16 Gerd Kortemeyer
+# 7/27 H. K. Ng
+# 8/7,8/9,8/10,8/11,8/15,8/16,8/17,8/18,8/20 Gerd Kortemeyer
 
 package Apache::lonxml; 
 use vars 
 qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist @namespace);
 use strict;
 use HTML::TokeParser;
+use HTML::TreeBuilder;
 use Safe;
 use Safe::Hole;
 use Math::Cephes qw(:trigs :hypers :bessels erf erfc);
@@ -70,9 +73,12 @@ $evaluate = 1;
 # data structure for eidt mode, determines what tags can go into what other tags
 %insertlist=();
 
-#stores the list of active tag namespaces
+# stores the list of active tag namespaces
 @namespace=();
 
+# has the dynamic menu been updated to know about this resource
+$Apache::lonxml::registered=0;
+
 sub xmlbegin {
   my $output='';
   if ($ENV{'browser.mathml'}) {
@@ -89,7 +95,158 @@ sub xmlbegin {
 }
 
 sub xmlend {
-    return '</html>';
+    my $discussion='';
+    if ($ENV{'request.course.id'}) {
+       my $crs='/'.$ENV{'request.course.id'};
+       if ($ENV{'request.course.sec'}) {
+          $crs.='_'.$ENV{'request.course.sec'};
+       }                 
+       $crs=~s/\_/\//g;
+       my $seeid=&Apache::lonnet::allowed('rin',$crs);
+       my $symb=&Apache::lonnet::symbread();
+       if ($symb) {
+          my %contrib=&Apache::lonnet::restore($symb,$ENV{'request.course.id'},
+                     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+          if ($contrib{'version'}) {
+              $discussion.=
+                  '<address><hr /><h2>Course Discussion of Resource</h2>';
+              my $idx;
+              for ($idx=1;$idx<=$contrib{'version'};$idx++) {
+		my $hidden=($contrib{'hidden'}=~/\.$idx\./);
+		unless (($hidden) && (!$seeid)) {
+                 my $message=$contrib{$idx.':message'};
+                 $message=~s/\n/\<br \/\>/g;
+                 if ($message) {
+                  if ($hidden) {
+		      $message='<font color="#888888">'.$message.'</font>';
+                  }
+                  my $sender='Anonymous';
+                  if ((!$contrib{$idx.':anonymous'}) || ($seeid)) {
+                      $sender=$contrib{$idx.':sendername'}.' at '.
+		      $contrib{$idx.':senderdomain'};
+                      if ($contrib{$idx.':anonymous'}) {
+			  $sender.=' (anonymous)';
+                      }
+                      if ($seeid) {
+			  if ($hidden) {
+                             $sender.=' <a href="/adm/feedback?unhide='.
+				 $symb.':::'.$idx.'">Make Visible</a>';
+                          } else {
+                             $sender.=' <a href="/adm/feedback?hide='.
+				 $symb.':::'.$idx.'">Hide</a>';
+			  }
+                      }                   
+                  }
+		  $discussion.='<p><b>'.$sender.'</b> ('.
+                      localtime($contrib{$idx.':timestamp'}).
+                      '):<blockquote>'.$message.
+                      '</blockquote></p>';
+	        }
+               } 
+              }
+              $discussion.='</address>';
+          }
+       }
+    }
+    return $discussion.'</html>';
+}
+
+sub tokeninputfield {
+    my $defhost=$Apache::lonnet::perlvar{'lonHostID'};
+    $defhost=~tr/a-z/A-Z/;
+    return (<<ENDINPUTFIELD)
+<script>
+    function updatetoken() {
+	var comp=new Array;
+        var barcode=unescape(document.tokeninput.barcode.value);
+        comp=barcode.split('*');
+        if (typeof(comp[0])!="undefined") {
+	    document.tokeninput.codeone.value=comp[0];
+	}
+        if (typeof(comp[1])!="undefined") {
+	    document.tokeninput.codetwo.value=comp[1];
+	}
+        if (typeof(comp[2])!="undefined") {
+            comp[2]=comp[2].toUpperCase();
+	    document.tokeninput.codethree.value=comp[2];
+	}
+        document.tokeninput.barcode.value='';
+    }  
+</script>
+<form method="post" name="tokeninput">
+<table border="2" bgcolor="#FFFFBB">
+<tr><th>DocID Checkin</th></tr>
+<tr><td>
+<table>
+<tr>
+<td>Scan in Barcode</td>
+<td><input type="text" size="22" name="barcode" 
+onChange="updatetoken()"/></td>
+</tr>
+<tr><td><i>or</i> Type in DocID</td>
+<td>
+<input type="text" size="5" name="codeone" />
+<b><font size="+2">*</font></b>
+<input type="text" size="5" name="codetwo" />
+<b><font size="+2">*</font></b>
+<input type="text" size="10" name="codethree" value="$defhost" 
+onChange="this.value=this.value.toUpperCase()" />
+</td></tr>
+</table>
+</td></tr>
+<tr><td><input type="submit" value="Check in DocID" /></td></tr>
+</table>
+</form>
+ENDINPUTFIELD
+}
+
+sub maketoken {
+    my ($symb,$tuname,$tudom,$tcrsid)=@_;
+    unless ($symb) {
+	$symb=&Apache::lonnet::symbread();
+    }
+    unless ($tuname) {
+	$tuname=$ENV{'user.name'};
+        $tudom=$ENV{'user.domain'};
+        $tcrsid=$ENV{'request.course.id'};
+    }
+
+    return &Apache::lonnet::checkout($symb,$tuname,$tudom,$tcrsid);
+}
+
+sub printtokenheader {
+    my ($target,$token,$symb,$tuname,$tudom,$tcrsid)=@_;
+    unless ($token) { return ''; }
+
+    unless ($symb) {
+	$symb=&Apache::lonnet::symbread();
+    }
+    unless ($tuname) {
+	$tuname=$ENV{'user.name'};
+        $tudom=$ENV{'user.domain'};
+        $tcrsid=$ENV{'request.course.id'};
+    }
+
+    my %reply=&Apache::lonnet::get('environment',
+              ['firstname','middlename','lastname','generation'],
+              $tudom,$tuname);
+    my $plainname=$reply{'firstname'}.' '. 
+                  $reply{'middlename'}.' '.
+                  $reply{'lastname'}.' '.
+		  $reply{'generation'};
+
+    if ($target eq 'web') {
+	return 
+ '<img align="right" src="/cgi-bin/barcode.gif?encode='.$token.'" />'.
+               'Checked out for '.$plainname.
+               '<br />User: '.$tuname.' at '.$tudom.
+	       '<br />CourseID: '.$tcrsid.
+               '<br />DocID: '.$token.
+               '<br />Time: '.localtime().'<hr />';
+    } else {
+        return $token;                         
+    }
 }
 
 sub fontsettings() {
@@ -102,7 +259,10 @@ sub fontsettings() {
 }
 
 sub registerurl {
-    if ($ENV{'REQUEST_URI'}!~/^\/(res\/)*adm\//) {
+    my $forcereg=shift;
+    if ($Apache::lonxml::registered) { return ''; }
+    $Apache::lonxml::registered=1;
+    if (($ENV{'REQUEST_URI'}!~/^\/(res\/)*adm\//) || ($forcereg)) {
         my $hwkadd='';
         if ($ENV{'REQUEST_URI'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
 	    if (&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
@@ -139,6 +299,8 @@ ENDPARM
           menu.currentStale=0;
           menu.clearbut(3,1);
           menu.switchbutton
+       (6,3,'catalog.gif','catalog','info','catalog_info()');
+          menu.switchbutton
        (8,1,'eval.gif','evaluate','this','gopost("/adm/evaluate",currentURL)');
           menu.switchbutton
     (8,2,'fdbk.gif','feedback','on this','gopost("/adm/feedback",currentURL)');
@@ -167,7 +329,7 @@ ENDPARM
           menu.clearbut(7,3);
           menu.menucltim=menu.setTimeout(
  'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+
- 'clearbut(9,1);clearbut(9,2);clearbut(9,3);',
+ 'clearbut(9,1);clearbut(9,2);clearbut(9,3);clearbut(6,3)',
 			  2000);
 
       }
@@ -229,14 +391,9 @@ sub xmlparse {
  &setup_globals($target);
  #&printalltags();
  my @pars = ();
- @Apache::lonxml::pwd=();
  my $pwd=$ENV{'request.filename'};
  $pwd =~ s:/[^/]*$::;
  &newparser(\@pars,\$content_file_string,$pwd);
- my $currentstring = '';
- my $finaloutput = ''; 
- my $newarg = '';
- my $result;
 
  my $safeeval = new Safe;
  my $safehole = new Safe::Hole;
@@ -248,94 +405,128 @@ sub xmlparse {
  my @stack = (); 
  my @parstack = ();
  &initdepth;
- my $token;
- while ( $#pars > -1 ) {
-   while ($token = $pars[$#pars]->get_token) {
-     if (($token->[0] eq 'T') || ($token->[0] eq 'C') || ($token->[0] eq 'D') ) {
-       if ($metamode<1) { $result=$token->[1]; }
-     } elsif ($token->[0] eq 'PI') {
-       if ($metamode<1) { $result=$token->[2]; }
-     } elsif ($token->[0] eq 'S') {
-       # add tag to stack 	    
-       push (@stack,$token->[1]);
-       # add parameters list to another stack
-       push (@parstack,&parstring($token));
-       &increasedepth($token);       
-       if (exists $style_for_target{$token->[1]}) {
-	 if ($Apache::lonxml::redirection) {
-	   $Apache::lonxml::outputstack['-1'] .=  
-	     &recurse($style_for_target{$token->[1]},$target,$safeeval,
-		      \%style_for_target,@parstack);
-	 } else {
-	   $finaloutput .= &recurse($style_for_target{$token->[1]},$target,
-				    $safeeval,\%style_for_target,@parstack);
-	 }
-       } else {
-	 $result = &callsub("start_$token->[1]", $target, $token, \@stack,
-			    \@parstack, \@pars, $safeeval, \%style_for_target);
-       }              
-     } elsif ($token->[0] eq 'E')  {
-       #clear out any tags that didn't end
-       while ($token->[1] ne $stack[$#stack] && ($#stack > -1)) {
-	 &Apache::lonxml::warning("Unbalanced tags in resource $stack['-1']");
-	 pop @stack;pop @parstack;&decreasedepth($token);
-       }
-       
-       if (exists $style_for_target{'/'."$token->[1]"}) {
-	 if ($Apache::lonxml::redirection) {
-	   $Apache::lonxml::outputstack['-1'] .=  
-	     &recurse($style_for_target{'/'."$token->[1]"},
-		      $target,$safeeval,\%style_for_target,@parstack);
-	 } else {
-	   $finaloutput .= &recurse($style_for_target{'/'."$token->[1]"},
-				    $target,$safeeval,\%style_for_target,
-				    @parstack);
-	 }
 
-       } else {
-	 $result = &callsub("end_$token->[1]", $target, $token, \@stack, 
-			    \@parstack, \@pars,$safeeval, \%style_for_target);
-       }
-     } else {
-       &Apache::lonxml::error("Unknown token event :$token->[0]:$token->[1]:");
-     }
-     #evaluate variable refs in result
-     if ($result ne "") {
-       if ( $#parstack > -1 ) {
-	 if ($Apache::lonxml::redirection) {
-	   $Apache::lonxml::outputstack['-1'] .= 
-	     &Apache::run::evaluate($result,$safeeval,$parstack[$#parstack]);
-	 } else {
-	   $finaloutput .= &Apache::run::evaluate($result,$safeeval,
-						  $parstack[$#parstack]);
-	 }
-       } else {
-	 $finaloutput .= &Apache::run::evaluate($result,$safeeval,'');
-       }
-       $result = '';
-     } 
-     if ($token->[0] eq 'E') { 
-       pop @stack;pop @parstack;&decreasedepth($token);
-     }
-   }
-   pop @pars;
-   pop @Apache::lonxml::pwd;
- }
+ my $finaloutput = &inner_xmlparse($target,\@stack,\@parstack,\@pars,
+				   $safeeval,\%style_for_target);
+
+ return $finaloutput;
+}
 
-# if ($target eq 'meta') {
-#   $finaloutput.=&endredirection;
-# }
+sub htmlclean {
+    my ($raw,$full)=@_;
 
-  if (($ENV{'QUERY_STRING'}) && ($target eq 'web')) {
-      $finaloutput=&afterburn($finaloutput);
-  }
+    my $tree = HTML::TreeBuilder->new;
+    $tree->ignore_unknown(0);
+    
+    $tree->parse($raw);
 
- return $finaloutput;
+    my $output= $tree->as_HTML(undef,' ');
+     
+    $output=~s/\<(br|hr|img|meta|allow)([^\>\/]*)\>/\<$1$2 \/\>/gis;
+    $output=~s/\<\/(br|hr|img|meta|allow)\>//gis;
+    unless ($full) {
+       $output=~s/\<[\/]*(body|head|html)\>//gis;
+    }
+
+    $tree = $tree->delete;
+
+    return $output;
 }
 
+sub inner_xmlparse {
+  my ($target,$stack,$parstack,$pars,$safeeval,$style_for_target)=@_;
+  &Apache::lonxml::debug('Reentrant parser starting, again?');
+  my $finaloutput = '';
+  my $result;
+  my $token;
+  while ( $#$pars > -1 ) {
+    while ($token = $$pars['-1']->get_token) {
+      if (($token->[0] eq 'T') || ($token->[0] eq 'C') || ($token->[0] eq 'D') ) {
+	if ($metamode<1) {
+	  $result=$token->[1];
+	}
+      } elsif ($token->[0] eq 'PI') {
+	if ($metamode<1) {
+	  $result=$token->[2];
+	}
+      } elsif ($token->[0] eq 'S') {
+	# add tag to stack 	    
+	push (@$stack,$token->[1]);
+	# add parameters list to another stack
+	push (@$parstack,&parstring($token));
+	&increasedepth($token);       
+	if (exists $$style_for_target{$token->[1]}) {
+	  if ($Apache::lonxml::redirection) {
+	    $Apache::lonxml::outputstack['-1'] .=  
+	      &recurse($$style_for_target{$token->[1]},$target,$safeeval,
+		       $style_for_target,@$parstack);
+	  } else {
+	    $finaloutput .= &recurse($$style_for_target{$token->[1]},$target,
+				     $safeeval,$style_for_target,@$parstack);
+	  }
+	} else {
+	  $result = &callsub("start_$token->[1]", $target, $token, $stack,
+			     $parstack, $pars, $safeeval, $style_for_target);
+	}              
+      } elsif ($token->[0] eq 'E') {
+	#clear out any tags that didn't end
+	while ($token->[1] ne $$stack['-1'] && ($#$stack > -1)) {
+	  &Apache::lonxml::warning("Unbalanced tags in resource $$stack['-1']");
+	  &end_tag($stack,$parstack,$token);
+	}
+		
+	if (exists $$style_for_target{'/'."$token->[1]"}) {
+	  if ($Apache::lonxml::redirection) {
+	    $Apache::lonxml::outputstack['-1'] .=  
+	      &recurse($$style_for_target{'/'."$token->[1]"},
+		       $target,$safeeval,$style_for_target,@$parstack);
+	  } else {
+	    $finaloutput .= &recurse($$style_for_target{'/'."$token->[1]"},
+				     $target,$safeeval,$style_for_target,
+				     @$parstack);
+	  }
+		    
+	} else {
+	  $result = &callsub("end_$token->[1]", $target, $token, $stack,
+			     $parstack, $pars,$safeeval, $style_for_target);
+	}
+      } else {
+	&Apache::lonxml::error("Unknown token event :$token->[0]:$token->[1]:");
+      }
+      #evaluate variable refs in result
+      if ($result ne "") {
+	if ( $#$parstack > -1 ) {
+	  if ($Apache::lonxml::redirection) {
+	    $Apache::lonxml::outputstack['-1'] .= 
+	      &Apache::run::evaluate($result,$safeeval,$$parstack['-1']);
+	  } else {
+	    $finaloutput .= &Apache::run::evaluate($result,$safeeval,
+						   $$parstack['-1']);
+	  }
+	} else {
+	  $finaloutput .= &Apache::run::evaluate($result,$safeeval,'');
+	}
+	$result = '';
+      } 
+      if ($token->[0] eq 'E') { 
+	&end_tag($stack,$parstack,$token);
+      }
+    }
+    pop @$pars;
+    pop @Apache::lonxml::pwd;
+  }
+
+  # if ($target eq 'meta') {
+  #   $finaloutput.=&endredirection;
+  # }
+
+  if (($ENV{'QUERY_STRING'}) && ($target eq 'web')) {
+    $finaloutput=&afterburn($finaloutput);
+  }
+  return $finaloutput;
+}
 
 sub recurse {
-  
   my @innerstack = (); 
   my @innerparstack = ();
   my ($newarg,$target,$safeeval,$style_for_target,@parstack) = @_;
@@ -363,7 +554,7 @@ sub recurse {
 	while ($tokenpat->[1] ne $innerstack[$#innerstack] 
 	       && ($#innerstack > -1)) {
 	  &Apache::lonxml::warning("Unbalanced tags in resource $innerstack['-1']");
-	  pop @innerstack;pop @innerparstack;&decreasedepth($tokenpat);
+	  &end_tag(\@innerstack,\@innerparstack,$tokenpat);
 	}
 	$partstring = &callsub("end_$tokenpat->[1]", $target, $tokenpat,
 			       \@innerstack, \@innerparstack, \@pat,
@@ -413,38 +604,47 @@ sub callsub {
 	$sub=~tr/A-Z/a-z/;
 	$space=$Apache::lonxml::alltags{$tag}
     }
-    if ($space) {
-      #&Apache::lonxml::debug("Calling sub $sub in $space $metamode<br />\n");
-      $sub1="$space\:\:$sub";
-      $Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter);
-      ($currentstring,$nodefault) = &$sub1($target,$token,$tagstack,
-					   $parstack,$parser,$safeeval,
-					   $style);
-    } else {
-      #&Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode<br />\n");
-      if ($metamode <1) {
-	if (defined($token->[4]) && ($metamode < 1)) {
-	  $currentstring = $token->[4];
-	} else {
-	  $currentstring = $token->[2];
+
+    my $deleted=0;
+    $Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter);
+    if (($token->[0] eq 'S') && ($target eq 'modified')) {
+      $deleted=&Apache::edit::handle_delete($space,$target,$token,$tagstack,
+					     $parstack,$parser,$safeeval,
+					     $style);
+    }
+    if (!$deleted) {
+      if ($space) {
+	#&Apache::lonxml::debug("Calling sub $sub in $space $metamode<br />\n");
+	$sub1="$space\:\:$sub";
+	($currentstring,$nodefault) = &$sub1($target,$token,$tagstack,
+					     $parstack,$parser,$safeeval,
+					     $style);
+      } else {
+	#&Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode<br />\n");
+	if ($metamode <1) {
+	  if (defined($token->[4]) && ($metamode < 1)) {
+	    $currentstring = $token->[4];
+	  } else {
+	    $currentstring = $token->[2];
+	  }
 	}
       }
-    }
-#    &Apache::lonxml::debug("nodefalt:$nodefault:");
-    if ($currentstring eq '' && $nodefault eq '') {
-      if ($target eq 'edit') {
-	&Apache::lonxml::debug("doing default edit for $token->[1]");
-	if ($token->[0] eq 'S') {
-	  $currentstring = &Apache::edit::tag_start($target,$token);
-	} elsif ($token->[0] eq 'E') {
-	  $currentstring = &Apache::edit::tag_end($target,$token);
-	}
-      } elsif ($target eq 'modified') {
-	if ($token->[0] eq 'S') {
-	  $currentstring = $token->[4];
-	  $currentstring.=&Apache::edit::handle_insert();
-	} else {
-	  $currentstring = $token->[2];
+      #    &Apache::lonxml::debug("nodefalt:$nodefault:");
+      if ($currentstring eq '' && $nodefault eq '') {
+	if ($target eq 'edit') {
+	  &Apache::lonxml::debug("doing default edit for $token->[1]");
+	  if ($token->[0] eq 'S') {
+	    $currentstring = &Apache::edit::tag_start($target,$token);
+	  } elsif ($token->[0] eq 'E') {
+	    $currentstring = &Apache::edit::tag_end($target,$token);
+	  }
+	} elsif ($target eq 'modified') {
+	  if ($token->[0] eq 'S') {
+	    $currentstring = $token->[4];
+	    $currentstring.=&Apache::edit::handle_insert();
+	  } else {
+	    $currentstring = $token->[2];
+	  }
 	}
       }
     }
@@ -455,6 +655,8 @@ sub callsub {
 
 sub setup_globals {
   my ($target)=@_;
+  $Apache::lonxml::registered = 0;
+  @Apache::lonxml::pwd=();
   if ($target eq 'meta') {
     $Apache::lonxml::redirection = 0;
     $Apache::lonxml::metamode = 1;
@@ -489,6 +691,7 @@ sub init_safespace {
   $safeeval->permit(":base_math");
   $safeeval->permit("sort");
   $safeeval->deny(":base_io");
+  $safehole->wrap(\&Apache::scripttag::xmlparse,$safeeval,'&xmlparse');
   $safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');
   
   $safehole->wrap(\&Math::Cephes::asin,$safeeval,'&asin');
@@ -553,6 +756,13 @@ sub endredirection {
   pop @Apache::lonxml::outputstack;
 }
 
+sub end_tag {
+  my ($tagstack,$parstack,$token)=@_;
+  pop(@$tagstack);
+  pop(@$parstack);
+  &decreasedepth($token);
+}
+
 sub initdepth {
   @Apache::lonxml::depthcounter=();
   $Apache::lonxml::depth=-1;
@@ -664,6 +874,9 @@ sub parstring {
 
 sub writeallows {
     my $thisurl='/res/'.&Apache::lonnet::declutter(shift);
+    if ($ENV{'httpref.'.$thisurl}) {
+	$thisurl=$ENV{'httpref.'.$thisurl};
+    }
     my $thisdir=$thisurl;
     $thisdir=~s/\/[^\/]+$//;
     my %httpref=();
@@ -751,7 +964,9 @@ SIMPLECONTENT
 <form method="post">
 <textarea cols="80" rows="40" name="filecont">$filecontents</textarea>
 <br />
-<input type="submit" name="savethisfile" value="Save this file" />
+<input type="submit" name="attemptclean" 
+       value="Save and then attempt to clean HTML" />
+<input type="submit" name="savethisfile" value="Save this" />
 </form>
 ENDFOOTER
       $result=~s/(\<body[^\>]*\>)/$1$editheader/is;
@@ -782,7 +997,7 @@ sub handler {
 # Edit action? Save file.
 #
   unless ($ENV{'request.state'} eq 'published') {
-      if ($ENV{'form.savethisfile'}) {
+      if (($ENV{'form.savethisfile'}) || ($ENV{'form.attemptclean'})) {
 	  &storefile($file,$ENV{'form.filecont'});
       }
   }
@@ -802,6 +1017,11 @@ sub handler {
 ENDNOTFOUND
     $filecontents='';
   } else {
+      unless ($ENV{'request.state'} eq 'published') {
+         if ($ENV{'form.attemptclean'}) {
+	    $filecontents=&htmlclean($filecontents,1);
+         }
+      }
     $result = &Apache::lonxml::xmlparse($target,$filecontents,'',%mystyle);
   }
 
@@ -894,6 +1114,11 @@ sub register_insert {
     $tagnum++;
   }
 }
+
+sub description {
+  my ($token)=@_;
+  return $insertlist{$insertlist{"$token->[1].num"}.'.description'};
+}
 1;
 __END__