--- loncom/publisher/londiff.pm 2006/09/13 21:43:26 1.20 +++ loncom/publisher/londiff.pm 2011/10/30 00:30:19 1.31 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to show differences between file versions # -# $Id: londiff.pm,v 1.20 2006/09/13 21:43:26 albertel Exp $ +# $Id: londiff.pm,v 1.31 2011/10/30 00:30:19 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -27,6 +27,9 @@ # ### + + + package Apache::londiff; use strict; @@ -40,7 +43,7 @@ use Apache::lonnet; use Apache::loncommon(); use Apache::lonretrieve(); use Apache::lonlocal; - +use LONCAPA(); sub get_split_file { my ($fn,$style)=@_; @@ -55,16 +58,9 @@ sub get_split_file { } } } elsif ($style eq 'remote') { - my $f1=&Apache::lonnet::getfile($fn); - } - if ($f1=~/\r/) { - @f1=split(/\r/,&Apache::lonnet::getfile($fn)); - foreach my $line (@f1) { - $line=~s/\n//g; - } - } else { - @f1=split(/\n/,&Apache::lonnet::getfile($fn)); + $f1=&Apache::lonnet::getfile($fn); } + @f1=split(/\r\n|\r|\n/,$f1); return @f1; } @@ -75,138 +71,160 @@ sub are_different_files { sub handler { - my $r=shift; + my $r=shift; # Get query string for limited number of parameters - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['filename','versiontwo','versionone','filetwo']); -# Get the files - - my $cuname=$env{'user.name'}; - my $cudom=$env{'user.domain'}; + &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, + ['filename','versiontwo', + 'versionone','filetwo']); + +# Check permissions + my $allowed=0; + my $cuname=$env{'user.name'}; + my $cudom=$env{'user.domain'}; + + if ($env{'form.filename'}=~/^\/res\//) { + if (&Apache::lonnet::allowed('bre',$env{'form.filename'})) { + if ($env{'request.course.id'}) { + if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { + $allowed = 1; + } + } + } elsif (&Apache::lonnet::allowed('bro',$env{'form.filename'})) { + $allowed = 1; + } + if ($allowed) { + ($cudom,$cuname,$env{'form.filename'})= + ($env{'form.filename'}=~m{^/res/($LONCAPA::domain_re)/($LONCAPA::username_re)(/.*)$}); + } + } else { + ($cuname,$cudom)= + &Apache::loncacc::constructaccess($env{'form.filename'}, + $r->dir_config('lonDefDomain')); + if ($cuname ne '' && $cudom ne '') { + $allowed = 1; + } else { + $r->log_reason($env{'user.name'}.':'.$env{'user.domain'}. + ' trying to get diffs file '.$env{'form.filename'}. + ' - not authorized', + $r->filename); + } + } + unless ($allowed) { + return HTTP_NOT_ACCEPTABLE; + } - if ($env{'form.filename'}=~/^\/res\//) { - ($cudom,$cuname,$env{'form.filename'})= - ($env{'form.filename'}=~/^\/res\/(\w+)\/(\w+)\/(.*)$/); - } else { - unless (($cuname,$cudom)= - &Apache::loncacc::constructaccess($env{'form.filename'}, - $r->dir_config('lonDefDomain'))) { - $r->log_reason($cuname.' at '.$cudom. - ' trying to get diffs file '.$env{'form.filename'}. - ' - not authorized', - $r->filename); - return HTTP_NOT_ACCEPTABLE; - } - } +# Get the files - my $efn=$env{'form.filename'}; - - $efn=~s/\/\~(\w+)//g; + my $efn=$env{'form.filename'}; - my @f1=(); - my @f2=(); + $efn=~s{^/priv/$LONCAPA::domain_re/$LONCAPA::username_re}{}; - &Apache::loncommon::content_type($r,'text/html'); - $r->send_http_header; + my @f1=(); + my @f2=(); - $r->print(&Apache::loncommon::start_page('Resource Differences')); + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + $r->print(&Apache::loncommon::start_page('Resource Differences',undef, + {'no_nav_bar' => 1, })); - $r->print('<h1>'.($env{'form.filetwo'}?'':&mt('Compare versions of')). - ' <tt>'.$efn.'</tt></h1>'); + $r->print(($env{'form.filetwo'}?'':&mt('Compare versions of')). + ' <span class="LC_filename">'.$efn.'</span>'); - if (($cuname ne $env{'user.name'}) || ($cudom ne $env{'user.domain'})) { - $r->print('<h3><font color=red>Co-Author: '.$cuname.' at '.$cudom. - '</font></h3>'); - } - - - if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq 'ssi' - || $efn =~ /\.meta$/) { - $r->print('<p><font color="red">'); - if ($env{'form.versionone'} eq 'priv') { - my $fn='/home/'.$cuname.'/public_html/'.$efn; - @f1=&get_split_file($fn,'local'); - $r->print('<b>'.&mt('Construction Space Version').'</b>'); - } else { - my $fn= - '/home/httpd/html/res/'.$cudom.'/'.$cuname.'/'; - if ($env{'form.versionone'}) { - my ($main,$suffix,$is_meta)= - &Apache::lonretrieve::get_file_info($efn); - - $fn.=($efn =~m|(.*/)[^/]+|)[0]; - # add on to $fn the path information in $efn - $fn.=$main.'.'.$env{'form.versionone'}.'.'.$suffix; - $r->print('<b>'.&mt('Version').' '.$env{'form.versionone'}.'</b>'); - } else { - $fn.=$efn; - $r->print('<b>'.&mt('Current Version').'</b>'); - } - @f1=&get_split_file($fn,'remote'); - } - - $r->print('</font><br />'.&mt('versus').'<br /><font color="green">'); - - if ($env{'form.filetwo'}) { - my $efn2=$env{'form.filetwo'}; - $efn2=~s/\/\~(\w+)//g; - my $fn='/home/'.$cuname.'/public_html/'.$efn2; - @f2=&get_split_file($fn,'local'); - $r->print('<tt>'.$efn2.'</tt>'); - } elsif ($env{'form.versiontwo'} eq 'priv') { - my $fn='/home/'.$cuname.'/public_html/'.$efn; - @f2=&get_split_file($fn,'local'); - $r->print('<b>'.&mt('Construction Space Version').'</b>'); - } else { - my $fn= - '/home/httpd/html/res/'.$cudom.'/'.$cuname.'/'; - if ($env{'form.versiontwo'}) { - my ($main,$suffix,$is_meta)= - &Apache::lonretrieve::get_file_info($efn); - # add on to $fn the path information in $efn - $fn.=($efn =~m|(.*/)[^/]+|)[0]; - $fn.=$main.'.'.$env{'form.versiontwo'}.'.'.$suffix; - $r->print('<b>'.&mt('Version').' '.$env{'form.versiontwo'}.'</b>'); - } else { - $fn.=$efn; - $r->print('<b>'.&mt('Current Version').'</b>'); - } - @f2=&get_split_file($fn,'remote'); - } - $r->print('</font></p>'); -# Run diff + if (($cuname ne $env{'user.name'}) || ($cudom ne $env{'user.domain'})) { + $r->print('<p><span class="LC_info">' + .&mt('Co-Author [_1]' + ,&Apache::loncommon::plainname($cuname,$cudom) + .' ('.$cuname.':'.$cudom.')') + .'</span></p>' + ); + } - my $diffs = diff(\@f1, \@f2); -# Start page output + if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq 'ssi' + || $efn =~ /\.meta$/) { + $r->print('<p><span class="LC_diff_removed">'); + if ($env{'form.versionone'} eq 'priv') { + my $fn=$r->dir_config('lonDocRoot')."/priv/$cudom/$cuname".$efn; + @f1=&get_split_file($fn,'local'); + $r->print('<b>'.&mt('Construction Space Version').'</b>'); + } else { + my $fn=$r->dir_config('lonDocRoot')."/res/$cudom/$cuname"; + if ($env{'form.versionone'}) { + my ($main,$suffix,$is_meta)= + &Apache::lonretrieve::get_file_info($efn); + + $fn.=($efn =~m|(.*/)[^/]+|)[0]; + # add on to $fn the path information in $efn + $fn.=$main.'.'.$env{'form.versionone'}.'.'.$suffix; + $r->print('<b>'.&mt('Version').' '.$env{'form.versionone'}.'</b>'); + } else { + $fn.=$efn; + $r->print('<b>'.&mt('Current Version').'</b>'); + } + @f1=&get_split_file($fn,'remote'); + } + + $r->print('</span><br />'.&mt('versus').'<br /><span class="LC_diff_added">'); - my $chunk; - my $line; + if ($env{'form.filetwo'}) { + my $efn2=$env{'form.filetwo'}; + $efn2=~s{^/priv/$LONCAPA::domain_re/$LONCAPA::username_re}{}; + my $fn=$r->dir_config('lonDocRoot')."/priv/$cudom/$cuname".$efn2; + @f2=&get_split_file($fn,'local'); + $r->print('<tt>'.$efn2.'</tt>'); + } elsif ($env{'form.versiontwo'} eq 'priv') { + my $fn=$r->dir_config('lonDocRoot')."/priv/$cudom/$cuname".$efn; + @f2=&get_split_file($fn,'local'); + $r->print('<b>'.&mt('Construction Space Version').'</b>'); + } else { + my $fn= + '/home/httpd/html/res/'.$cudom.'/'.$cuname.'/'; + if ($env{'form.versiontwo'}) { + my ($main,$suffix,$is_meta)= + &Apache::lonretrieve::get_file_info($efn); + # add on to $fn the path information in $efn + $fn.=($efn =~m|(.*/)[^/]+|)[0]; + $fn.=$main.'.'.$env{'form.versiontwo'}.'.'.$suffix; + $r->print('<b>'.&mt('Version').' '.$env{'form.versiontwo'}.'</b>'); + } else { + $fn.=$efn; + $r->print('<b>'.&mt('Current Version').'</b>'); + } + @f2=&get_split_file($fn,'remote'); + } + $r->print('</span></p>'); +# Run diff - $r->print('<pre>'); + my $diffs = diff(\@f1, \@f2); - foreach $chunk (@$diffs) { - - foreach $line (@$chunk) { - my ($sign, $lineno, $text) = @$line; - $text=~s/\</\<\;/g; - $text=~s/\>/\>\;/g; - $lineno=substr($lineno.' ',0,7); - $r->print('<font color='.(($sign eq '+')?'green':'red').'>'. - $sign.' '.$lineno.' '.$text."</font>\n"); - } - $r->print("<hr>\n"); - } - $r->print('</pre>'); - - } else { - $r->print('<h1><font color=red>'.&mt('Binary File').'</font></h1>'); - } - $r->print('<center><a href="javascript:window.close();">'.&mt('Close This Window').'</a></center>'); - $r->print(&Apache::loncommon::end_page()); - return OK; + if (@$diffs) { + # Start page output + my $chunk; + my $line; + $r->print('<pre>'); + foreach $chunk (@$diffs) { + foreach $line (@$chunk) { + my ($sign, $lineno, $text) = @$line; + $text=&HTML::Entities::encode($text,'<>&"'); + $lineno=substr($lineno.' ',0,7); + $r->print('<span class="'.(($sign eq '+')?'LC_diff_added' + :'LC_diff_removed').'">'. + $sign.' '.$lineno.' '.$text."</span>\n"); + } + $r->print("</pre><hr /><pre>\n"); + } + $r->print('</pre>'); + } else { + $r->print('<p class="LC_info">'.&mt('No differences found').'</p>'); + } + } else { + $r->print('<h1><span class="LC_warning">'.&mt('Binary File').'</span></h1>'); + } + $r->print('<center><a href="javascript:window.close();">'.&mt('Close This Window').'</a></center>'); + $r->print(&Apache::loncommon::end_page()); + return OK; } @@ -214,5 +232,27 @@ sub handler { __END__ +=pod + +=head1 NAME + +Apache::londiff + +=head1 SYNOPSIS + +Handler to show difference between two files. + +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. + +=head1 Subroutines + +=over + +=item get_split_file() + +=item are_different_files() +=item handler() +=cut