--- loncom/publisher/loncleanup.pm	2005/05/29 01:46:16	1.4
+++ loncom/publisher/loncleanup.pm	2009/09/09 17:58:37	1.11
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to cleanup XML files
 #
-# $Id: loncleanup.pm,v 1.4 2005/05/29 01:46:16 www Exp $
+# $Id: loncleanup.pm,v 1.11 2009/09/09 17:58:37 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,8 +36,12 @@ use File::Copy;
 use Apache::Constants qw(:common :http :methods);
 use Apache::loncacc;
 use Apache::loncommon();
+use Apache::lonhtmlcommon();
 use Apache::lonlocal;
 use Apache::lonnet;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+ 
 
 sub latextrans {
     my $symbolfont=shift;
@@ -218,8 +222,9 @@ sub htmlclean {
     }
 # Generate empty tags, remove wrong end tags
     unless ($blockemptytags) {
-	$raw=~s/\<(br|hr|img|meta|allow|basefont)([^\>\/]*?)\>/\<$1$2 \/\>/gis;
-	$raw=~s/\<\/(br|hr|img|meta|allow|basefont)\>//gis;
+	$raw=~s/\<(br|hr|img|meta|embed|allow|basefont)([^\>]*?)\>/\<$1$2 \/\>/gis;
+	$raw=~s/\<\/(br|hr|img|meta|embed|allow|basefont)\>//gis;
+	$raw=~s/\/ \/\>/\/\>/gs;
 	unless ($full) {
 	    $raw=~s/\<[\/]*(body|head|html)\>//gis;
 	}
@@ -244,20 +249,34 @@ sub htmlclean {
 
 sub phaseone {
     my ($r,$fn,$uname,$udom)=@_;
-    $r->print(&mt('Select actions to attempt:').
-	      '<br /><input type="checkbox" name="linefeed" checked="checked" /> '.
-	      &mt('Linefeeds, formfeeds, and carriage returns').
-	      '<br /><input type="checkbox" name="empty" checked="checked" /> '.
-	      &mt('Empty tags').
-	      '<br /><input type="checkbox" name="lower" checked="checked" /> '.
-	      &mt('Lower casing').
-	      '<br /><input type="checkbox" name="symbol"checked="checked" /> '.
-	      &mt('Symbol font').
-	      '<input type="hidden" name="phase" value="two" />'.
-	      '<p><input type="submit" value="'.&mt('Cleanup').'" /></p>');
+    $r->print(
+        &Apache::lonhtmlcommon::start_pick_box()
+       .&Apache::lonhtmlcommon::row_title(&mt('Select actions to attempt'))
+       .'<input type="checkbox" name="linefeed" checked="checked" /> '
+       .&mt('Linefeeds, formfeeds, and carriage returns')
+       .'<br />'
+       .'<input type="checkbox" name="empty" checked="checked" /> '
+       .&mt('Empty tags')
+       .'<br />'
+       .'<input type="checkbox" name="lower" checked="checked" /> '
+       .&mt('Lower casing')
+       .'<br />'
+       .'<input type="checkbox" name="symbol" checked="checked" /> '
+       .&mt('Symbol font')
+       .&Apache::lonhtmlcommon::row_closure(1)
+       .&Apache::lonhtmlcommon::end_pick_box()
+    );
+
+    $r->print(
+        '<input type="hidden" name="phase" value="two" />'
+       .'<p>'
+       .'<input type="submit" value="'.&mt('Next').'" />'
+       .'</p>'
+    );
 }
 
 sub phasetwo {
+    # Check original file
     my ($r,$fn,$uname,$udom)=@_;
     open(IN,'/home/'.$uname.'/public_html/'.$fn);
     my $text='';
@@ -270,9 +289,20 @@ sub phasetwo {
 					 ('grade_target'=>'web',
 					  'return_only_error_and_warning_counts' => 1));
     my ($errorcount,$warningcount)=split(':',$result);
-    $r->print(&mt('Original file').': '.
-	      $errorcount.' '.&mt('error(s)').', '.
-	      $warningcount.' '.&mt('warning(s)'));
+
+    # Display results for original file
+    $r->print(
+        &Apache::lonhtmlcommon::start_pick_box()
+       .&Apache::lonhtmlcommon::row_title(&mt('Original file'))
+       .&Apache::lonhtmlcommon::confirm_success(
+           &mt('[quant,_1,error]',$errorcount), $errorcount)
+       .'<br />'
+       .&Apache::lonhtmlcommon::confirm_success(
+           &mt('[quant,_1,warning]',$warningcount), $warningcount)
+       .&Apache::lonhtmlcommon::row_closure()
+    );
+
+    # Clean up file
     $text=&htmlclean($text,1,
                ($env{'form.linefeed'} ne 'on'),
                ($env{'form.empty'} ne 'on'),
@@ -285,22 +315,43 @@ sub phasetwo {
     close(OUT);
     my $newuri='/~'.$uname.$newfn;
     $result=&Apache::lonnet::ssi_body($newuri,
-					 ('grade_target'=>'web',
-					  'return_only_error_and_warning_counts' => 1));
+                                         ('grade_target'=>'web',
+                                          'return_only_error_and_warning_counts' => 1));
     ($errorcount,$warningcount)=split(':',$result);
-    $r->print('<br />'.&mt('Cleaned up file').': '.
-	      $errorcount.' '.&mt('error(s)').', '.
-	      $warningcount.' '.&mt('warning(s)').
-              '<br /><a href="'.$newuri.'" target="prev">'.
-	      &mt('Open (and edit) cleaned up file in new window').'</a>'.
-              '<br /><a href="/adm/diff?filename='.&Apache::lonnet::escape($uri).
-	      '&versionone=priv&filetwo='.
-	      &Apache::lonnet::escape($newuri).'" target="prev">'.
-	      &mt('Show diffs in new window').'</a><br />'.
-	      '<input type="hidden" name="phase" value="three" />'.
-	      '<input type="submit" name="accept" value="'.&mt('Accept Result').'" />'.
-	      '<input type="submit" name="reject" value="'.&mt('Reject Result').'" />'
-	      );
+
+    # Display results for cleaned up file
+    $r->print(
+        &Apache::lonhtmlcommon::row_title(&mt('Cleaned up file'))
+       .&Apache::lonhtmlcommon::confirm_success(
+           &mt('[quant,_1,error]',$errorcount), $errorcount)
+       .'<br />'
+       .&Apache::lonhtmlcommon::confirm_success(
+           &mt('[quant,_1,warning]',$warningcount), $warningcount)
+       .&Apache::lonhtmlcommon::row_closure()
+    );
+
+    # Display actions
+    $r->print(
+        &Apache::lonhtmlcommon::row_title(&mt('Actions'))
+       .'<ul>'
+       .'<li><a href="'.$newuri.'" target="prev">'
+       .&mt('Open (and edit) cleaned up file in new window')
+       .'</a></li>'
+       .'<li><a href="/adm/diff?filename='.&escape($uri)
+       .'&versionone=priv&filetwo='.&escape($newuri).'" target="prev">'
+       .&mt('Show diffs in new window')
+       .'</a></li>'
+       .'</ul>'
+       .&Apache::lonhtmlcommon::row_closure(1)
+       .&Apache::lonhtmlcommon::end_pick_box()
+       .'<p>'
+       .'<input type="hidden" name="phase" value="three" />'
+       .'<input type="submit" name="accept" value="'
+       .&mt('Clean Up').'" />'
+       .' <input type="submit" name="reject" value="'
+       .&mt('Cancel').'" />'
+       .'</p>'
+    );
 }
 
 sub phasethree {
@@ -310,10 +361,18 @@ sub phasethree {
     my $newfn=$main.'_Auto_Cleaned_Up.'.$ext;
     my $new='/home/'.$uname.'/public_html'.$newfn;
     if ($env{'form.accept'}) {
-	$r->print(&mt('Accepting changes'));
+	$r->print(
+        '<p class="LC_info">'
+       .&mt('Accepting changes')
+       .'</p>'
+    );
         move($new,$old);
     } else {
-	$r->print(&mt('Rejeting changes'));
+	$r->print(
+        '<p class="LC_info">'
+       .&mt('Rejecting changes')
+       .'</p>'
+    );
         unlink($new);
     }
 }
@@ -331,7 +390,7 @@ sub handler {
 
     if ($env{'form.filename'}) {
 	$fn=$env{'form.filename'};
-	$fn=~s/^http\:\/\/[^\/]+//;
+	$fn=~s/^https?\:\/\/[^\/]+//;
     } else {
 	$r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
 		       ' unspecified filename for cleanup', $r->filename); 
@@ -358,14 +417,20 @@ sub handler {
 	return HTTP_NOT_ACCEPTABLE;
     }
 
-    $fn=~s/\/\~(\w+)//;
+    $fn=~s{/~($LONCAPA::username_re)}{};
 
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
 
-    $r->print('<html><head><title>LON-CAPA Construction Space</title></head>');
-
-    $r->print(&Apache::loncommon::bodytag('Cleanup XML Document'));
+    # Breadcrumbs
+    my $brcrum = [{'href' => &Apache::loncommon::authorspace(),
+                   'text' => 'Construction Space'},
+                  {'href' => '',
+                   'text' => 'Cleanup XML Document'}];
+
+    $r->print(&Apache::loncommon::start_page('Cleanup XML Document',
+                                             undef,
+                                             {'bread_crumbs' => $brcrum,}));
     $r->print('<h2>'.$fn.'</h2>'.
               '<form action="/adm/cleanup" method="post">'.
               '<input type="hidden" name="filename" value="'.$env{'form.filename'}.'" />');
@@ -382,10 +447,17 @@ sub handler {
     }
     my $dir=$fn;
     $dir=~s/\/[^\/]+$/\//;
-    $r->print('</form>'.
-	      '<br /><a href="/priv/'.$uname.'/'.$fn.'">'.&mt('Back to Source File').'</a>'.
-              '<br /><a href="/priv/'.$uname.'/'.$dir.'">'.&mt('Back to Source Directory').'</a>'.
-	      '</body></html>');
+    $r->print(
+        '</form>'
+       .&Apache::lonhtmlcommon::start_funclist()
+       .&Apache::lonhtmlcommon::add_item_funclist(
+            '<a href="/priv/'.$uname.'/'.$fn.'">'.&mt('Back to Source File').'</a>')
+       .&Apache::lonhtmlcommon::add_item_funclist(
+            '<a href="/priv/'.$uname.'/'.$dir.'">'.&mt('Back to Source Directory').'</a>')
+       .&Apache::lonhtmlcommon::end_funclist()
+       .&Apache::loncommon::end_page()
+    );
+
     return OK;  
 }