--- loncom/xml/lonxml.pm	2002/03/21 20:51:10	1.159
+++ loncom/xml/lonxml.pm	2002/03/29 18:32:46	1.163
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.159 2002/03/21 20:51:10 www Exp $
+# $Id: lonxml.pm,v 1.163 2002/03/29 18:32:46 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -62,14 +62,14 @@ package Apache::lonxml;
 use vars 
 qw(@pwd @outputstack $redirection $import @extlinks $metamode $evaluate %insertlist @namespace);
 use strict;
-use HTML::TokeParser;
-use HTML::TreeBuilder;
-use HTML::Entities;
-use Safe;
-use Safe::Hole;
-use Math::Cephes qw(:trigs :hypers :bessels erf erfc);
-use Math::Random qw(:all);
-use Opcode;
+use HTML::TokeParser();
+use HTML::TreeBuilder();
+use HTML::Entities();
+use Safe();
+use Safe::Hole();
+use Math::Cephes();
+use Math::Random();
+use Opcode();
 
 sub register {
   my ($space,@taglist) = @_;
@@ -90,15 +90,15 @@ sub deregister {
 }
 
 use Apache::Constants qw(:common);
-use Apache::lontexconvert;
-use Apache::style;
-use Apache::run;
-use Apache::londefdef;
-use Apache::scripttag;
-use Apache::edit;
-use Apache::lonnet;
-use Apache::File;
-use Apache::loncommon;
+use Apache::lontexconvert();
+use Apache::style();
+use Apache::run();
+use Apache::londefdef();
+use Apache::scripttag();
+use Apache::edit();
+use Apache::lonnet();
+use Apache::File();
+use Apache::loncommon();
 
 #==================================================   Main subroutine: xmlparse  
 #debugging control, to turn on debugging modify the correct handler
@@ -319,7 +319,8 @@ sub registerurl {
     my $forcereg=shift;
     my $target = shift;
     my $result = '';
-    if ($ENV{'request.publicaccess'}) {
+    if (($ENV{'request.publicaccess'}) || 
+       ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html')) {
 	return 
          '<script>function LONCAPAreg(){} function LONCAPAstale(){}</script>';
     }
@@ -442,7 +443,7 @@ ENDDONOTREGTHIS
         $result .=<<"ENDBROWSERSCRIPT";
 <script>
     var editbrowser;
-    function openbrowser(formname,elementname) {
+    function openbrowser(formname,elementname,only,omit) {
         var url = '/res/?';
         if (editbrowser == null) {
             url += 'launch=1&';
@@ -450,6 +451,12 @@ ENDDONOTREGTHIS
         url += 'catalogmode=interactive&';
         url += 'mode=edit&';
         url += 'form=' + formname + '&';
+        if (only != null) {
+            url += 'only=' + only + '&';
+        } 
+        if (omit != null) {
+            url += 'omit=' + omit + '&';
+        }
         url += 'element=' + elementname + '';
         var title = 'Browser';
         var options = 'scrollbars=1,resizable=1,menubar=0';
@@ -534,7 +541,7 @@ sub htmlclean {
 
     my $output= $tree->as_HTML(undef,' ');
 
-    $output=~s/\<(br|hr|img|meta|allow)([^\>\/]*)\>/\<$1$2 \/\>/gis;
+    $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;
@@ -623,7 +630,7 @@ sub inner_xmlparse {
 	  $finaloutput .= &Apache::run::evaluate($result,$safeeval,'');
 	}
 	$result = '';
-      } 
+      }
       if ($token->[0] eq 'E') { 
 	&end_tag($stack,$parstack,$token);
       }
@@ -807,6 +814,11 @@ sub setup_globals {
     $Apache::lonxml::metamode = 0;
     $Apache::lonxml::evaluate = 0;
     $Apache::lonxml::import = 0;
+  } elsif ($target eq 'analyze') {
+    $Apache::lonxml::redirection = 0;
+    $Apache::lonxml::metamode = 0;
+    $Apache::lonxml::evaluate = 1;
+    $Apache::lonxml::import = 1;
   } else {
     $Apache::lonxml::redirection = 0;
     $Apache::lonxml::metamode = 0;
@@ -982,6 +994,7 @@ sub newparser {
   my ($parser,$contentref,$dir) = @_;
   push (@$parser,HTML::TokeParser->new($contentref));
   $$parser['-1']->xml_mode('1');
+#  $$parser['-1']->attr_encoded('1');
   if ( $dir eq '' ) {
     push (@Apache::lonxml::pwd, $Apache::lonxml::pwd[$#Apache::lonxml::pwd]);
   } else {
@@ -1092,17 +1105,21 @@ sub inserteditinfo {
       my ($result,$filecontents)=@_;
       $filecontents = &HTML::Entities::encode($filecontents);
 #      my $editheader='<a href="#editsection">Edit below</a><hr />';
+      my $buttons=(<<BUTTONS);
+<input type="submit" name="attemptclean" 
+       value="Save and then attempt to clean HTML" />
+<input type="submit" name="savethisfile" value="Save this" />
+<input type="submit" name="viewmode" value="View" />
+BUTTONS
       my $editfooter=(<<ENDFOOTER);
 <hr />
 <a name="editsection" />
 <form method="post">
+<input type="hidden" name="editmode" value="Edit" />
+$buttons
 <textarea cols="80" rows="40" name="filecont">$filecontents</textarea>
+$buttons
 <br />
-<input type="hidden" name="showmode" value="Edit" />
-<input type="submit" name="attemptclean" 
-       value="Save and then attempt to clean HTML" />
-<input type="submit" name="savethisfile" value="Save this" />
-<input type="submit" name="showmode" value="View" />
 </form>
 ENDFOOTER
 #      $result=~s/(\<body[^\>]*\>)/$1$editheader/is;
@@ -1181,7 +1198,7 @@ ENDNOTFOUND
     $filecontents='';
     if ($ENV{'request.state'} ne 'published') {
       $filecontents=&createnewhtml();
-      $ENV{'form.showmode'}='Edit'; #force edit mode
+      $ENV{'form.editmode'}='Edit'; #force edit mode
     }
   } else {
     unless ($ENV{'request.state'} eq 'published') {
@@ -1189,7 +1206,7 @@ ENDNOTFOUND
 	$filecontents=&htmlclean($filecontents,1);
       }
     }
-    if ($ENV{'form.showmode'} ne 'Edit') {
+    if (!$ENV{'form.editmode'} || $ENV{'form.viewmode'}) {
       $result = &Apache::lonxml::xmlparse($target,$filecontents,'',%mystyle);
     }
   }
@@ -1198,7 +1215,7 @@ ENDNOTFOUND
 # Edit action? Insert editing commands
 #
   unless ($ENV{'request.state'} eq 'published') {
-    if ($ENV{'form.showmode'} eq 'Edit') {
+    if ($ENV{'form.editmode'} && (!($ENV{'form.viewmode'}))) {
       $result='<html><body bgcolor="#FFFFFF"></body></html>';
       $result=&inserteditinfo($result,$filecontents);
     }