--- loncom/publisher/loncleanup.pm 2005/05/28 18:53:50 1.3 +++ loncom/publisher/loncleanup.pm 2011/10/23 23:46:07 1.12 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to cleanup XML files # -# $Id: loncleanup.pm,v 1.3 2005/05/28 18:53:50 albertel Exp $ +# $Id: loncleanup.pm,v 1.12 2011/10/23 23:46:07 www 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,21 +249,139 @@ sub htmlclean { sub phaseone { my ($r,$fn,$uname,$udom)=@_; + $r->print( + &Apache::lonhtmlcommon::start_pick_box() + .&Apache::lonhtmlcommon::row_title(&mt('Select actions to attempt')) + .' ' + .&mt('Linefeeds, formfeeds, and carriage returns') + .'
' + .' ' + .&mt('Empty tags') + .'
' + .' ' + .&mt('Lower casing') + .'
' + .' ' + .&mt('Symbol font') + .&Apache::lonhtmlcommon::row_closure(1) + .&Apache::lonhtmlcommon::end_pick_box() + ); + + $r->print( + '' + .'

' + .'' + .'

' + ); } sub phasetwo { + # Check original file my ($r,$fn,$uname,$udom)=@_; + open(IN,'/home/httpd/html/priv/'.$udom.'/'.$uname.'/'.$fn); + my $text=''; + while (my $line=) { + $text.=$line; + } + close(IN); + my $uri='/~'.$uname.$fn; + my $result=&Apache::lonnet::ssi_body($uri, + ('grade_target'=>'web', + 'return_only_error_and_warning_counts' => 1)); + my ($errorcount,$warningcount)=split(':',$result); + + # 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) + .'
' + .&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'), + ($env{'form.lower'} ne 'on'), + ($env{'form.symbol'} ne 'on')); + my ($main,$ext)=($fn=~/^(.*)\.(\w+)/); + my $newfn=$main.'_Auto_Cleaned_Up.'.$ext; + open(OUT,'>/home/httpd/html/priv/'.$udom.'/'.$uname.'/'.$newfn); + print OUT $text; + close(OUT); + my $newuri='/~'.$uname.$newfn; + $result=&Apache::lonnet::ssi_body($newuri, + ('grade_target'=>'web', + 'return_only_error_and_warning_counts' => 1)); + ($errorcount,$warningcount)=split(':',$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) + .'
' + .&Apache::lonhtmlcommon::confirm_success( + &mt('[quant,_1,warning]',$warningcount), $warningcount) + .&Apache::lonhtmlcommon::row_closure() + ); + + # Display actions + $r->print( + &Apache::lonhtmlcommon::row_title(&mt('Actions')) + .'' + .&Apache::lonhtmlcommon::row_closure(1) + .&Apache::lonhtmlcommon::end_pick_box() + .'

' + .'' + .'' + .' ' + .'

' + ); } sub phasethree { my ($r,$fn,$uname,$udom)=@_; + my $old='/home/httpd/html/priv/'.$udom.'/'.$uname.'/'.$fn; + my ($main,$ext)=($fn=~/^(.*)\.(\w+)/); + my $newfn=$main.'_Auto_Cleaned_Up.'.$ext; + my $new='/home/httpd/html/priv/'.$udom.'/'.$uname.'/'.$newfn; + if ($env{'form.accept'}) { + $r->print( + '

' + .&mt('Accepting changes') + .'

' + ); + move($new,$old); + } else { + $r->print( + '

' + .&mt('Rejecting changes') + .'

' + ); + unlink($new); + } } # ---------------------------------------------------------------- Main Handler sub handler { my $r=shift; - + my $fn=''; # Get query string for limited number of parameters @@ -267,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); @@ -294,24 +417,47 @@ 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('LON-CAPA Construction Space'); - - $r->print(&Apache::loncommon::bodytag('Cleanup XML Document')); - - if ($env{'form.phase'} eq 'three') { - &phasethree($r,$fn,$uname,$udom); - } elsif ($env{'form.phase'} eq 'two') { - &phasetwo($r,$fn,$uname,$udom); + # 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('

'.$fn.'

'. + '
'. + ''); + unless ($fn=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm|sty)$/) { + $r->print(&mt('Cannot cleanup this filetype')); } else { - &phaseone($r,$fn,$uname,$udom); + if ($env{'form.phase'} eq 'three') { + &phasethree($r,$fn,$uname,$udom); + } elsif ($env{'form.phase'} eq 'two') { + &phasetwo($r,$fn,$uname,$udom); + } else { + &phaseone($r,$fn,$uname,$udom); + } } + my $dir=$fn; + $dir=~s/\/[^\/]+$/\//; + $r->print( + '
' + .&Apache::lonhtmlcommon::start_funclist() + .&Apache::lonhtmlcommon::add_item_funclist( + ''.&mt('Back to Source File').'') + .&Apache::lonhtmlcommon::add_item_funclist( + ''.&mt('Back to Source Directory').'') + .&Apache::lonhtmlcommon::end_funclist() + .&Apache::loncommon::end_page() + ); - $r->print(''); return OK; }