--- loncom/publisher/londiff.pm 2005/05/29 01:46:16 1.17 +++ loncom/publisher/londiff.pm 2012/10/29 17:38:55 1.36 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to show differences between file versions # -# $Id: londiff.pm,v 1.17 2005/05/29 01:46:16 www Exp $ +# $Id: londiff.pm,v 1.36 2012/10/29 17:38:55 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -27,24 +27,28 @@ # ### + + + package Apache::londiff; use strict; use Apache::File; use File::Copy; +use File::Compare; use Algorithm::Diff qw(diff); use Apache::Constants qw(:common :http :methods); -use Apache::loncacc; use Apache::lonnet; use Apache::loncommon(); +use Apache::lonretrieve(); use Apache::lonlocal; - +use LONCAPA(); sub get_split_file { my ($fn,$style)=@_; my $f1; my @f1; - if ($style='local') { + if ($style eq 'local') { if (-e $fn) { my $fh=Apache::File->new($fn); my $line; @@ -53,153 +57,211 @@ 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; } -sub handler { +sub are_different_files { + my ($fileone,$filetwo)=@_; + return &compare($fileone,$filetwo); +} - my $r=shift; +sub handler { + my $r=shift; # Get query string for limited number of parameters - &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['filename','versiontwo','versionone','filetwo']); + &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'}=~ m{^/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; + } + } else { + $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)(/.*)$}); + + if (($env{'form.versionone'} eq 'priv') || ($env{'form.versiontwo'} eq 'priv')) { + my ($cstrname,$cstrdom) = + &Apache::lonnet::constructaccess("/priv/$cudom/$cuname".$env{'form.filename'}); + unless (($cstrname eq $cuname) && ($cstrdom eq $cudom)) { + $allowed = 0; + } + } + } + } else { + ($cuname,$cudom)= + &Apache::lonnet::constructaccess($env{'form.filename'}); + 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; + } + # Get the files - my $cuname=$env{'user.name'}; - my $cudom=$env{'user.domain'}; + my $efn=$env{'form.filename'}; + $efn=~s{^/priv/$LONCAPA::domain_re/$LONCAPA::username_re}{}; - 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; - } - } + my @f1=(); + my @f2=(); + + &Apache::loncommon::content_type($r,'text/html'); + $r->send_http_header; + + $r->print(&Apache::loncommon::start_page('Resource Differences',undef, + {'no_nav_bar' => 1, })); - my $efn=$env{'form.filename'}; + $r->print(($env{'form.filetwo'}?'':&mt('Compare versions of')). + ' '.$efn.''); + + if (($cuname ne $env{'user.name'}) || ($cudom ne $env{'user.domain'})) { + my $nameshown = &Apache::loncommon::plainname($cuname,$cudom). + ' ('.$cuname.':'.$cudom.')'; + $r->print('
'); + if ($env{'request.role'} =~ /^ca\./) { + $r->print(&mt('Co-Author in Construction Space for: [_1]',$nameshown)); + } elsif ($env{'request.role'} =~ /^aa\./) { + $r->print(&mt('Assistant Author in Construction Space for: [_1]',$nameshown)); + } else { + $r->print(&mt('Resource Author is: [_1]',$nameshown)); + } + $r->print('
'); + } - $efn=~s/\/\~(\w+)//g; + if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq 'ssi' + || $efn =~ /\.meta$/) { + $r->print('');
+ if ($env{'form.versionone'} eq 'priv') {
+ my $fn=$r->dir_config('lonDocRoot')."/priv/$cudom/$cuname".$efn;
+ @f1=&get_split_file($fn,'local');
+ $r->print(''.&mt('Construction Space Version').'');
+ } 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(''.&mt('Version').' '.$env{'form.versionone'}.'');
+ } else {
+ $fn.=$efn;
+ $r->print(''.&mt('Current Version').'');
+ }
+ @f1=&get_split_file($fn,'remote');
+ }
+
+ $r->print('
'.&mt('versus').'
');
- my @f1=();
- my @f2=();
+ 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(''.$efn2.'');
+ } elsif ($env{'form.versiontwo'} eq 'priv') {
+ my $fn=$r->dir_config('lonDocRoot')."/priv/$cudom/$cuname".$efn;
+ @f2=&get_split_file($fn,'local');
+ $r->print(''.&mt('Construction Space Version').'');
+ } else {
+ my $fn=$r->dir_config('lonDocRoot')."/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(''.&mt('Version').' '.$env{'form.versiontwo'}.'');
+ } else {
+ $fn.=$efn;
+ $r->print(''.&mt('Current Version').'');
+ }
+ @f2=&get_split_file($fn,'remote');
+ }
+ $r->print('
');
+ foreach $chunk (@$diffs) {
+ foreach $line (@$chunk) {
+ my ($sign, $lineno, $text) = @$line;
+ $text=&HTML::Entities::encode($text,'<>&"');
+ $lineno=substr($lineno.' ',0,7);
+ $r->print(''.
+ $sign.' '.$lineno.' '.$text."\n");
+ }
+ $r->print("
\n"); + } + $r->print(''); + } else { + $r->print('
'.&mt('No differences found').'
'); + } + } else { + $r->print('');
- if ($env{'form.versionone'} eq 'priv') {
- my $fn='/home/'.$cuname.'/public_html/'.$efn;
- @f1=&get_split_file($fn,'local');
- $r->print(''.&mt('Construction Space Version').'');
- } else {
- my $fn=
- '/home/httpd/html//res/'.$cudom.'/'.$cuname.'/';
- if ($env{'form.versionone'}) {
- my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);
- $fn.=$main.'.'.$env{'form.versionone'}.'.'.$suffix;
- $r->print(''.&mt('Version').' '.$env{'form.versionone'}.'');
- } else {
- $fn.=$efn;
- $r->print(''.&mt('Current Version').'');
- }
- @f1=&get_split_file($fn,'remote');
- }
-
- $r->print('
'.&mt('versus').'
');
-
- 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(''.$efn2.'');
- } elsif ($env{'form.versiontwo'} eq 'priv') {
- my $fn='/home/'.$cuname.'/public_html/'.$efn;
- @f2=&get_split_file($fn,'local');
- $r->print(''.&mt('Construction Space Version').'');
- } else {
- my $fn=
- '/home/httpd/html/res/'.$cudom.'/'.$cuname.'/';
- if ($env{'form.versiontwo'}) {
- my ($main,$suffix)=($efn=~/^(.+)\.(\w+)$/);
- $fn.=$main.'.'.$env{'form.versiontwo'}.'.'.$suffix;
- $r->print(''.&mt('Version').' '.$env{'form.versiontwo'}.'');
- } else {
- $fn.=$efn;
- $r->print(''.&mt('Current Version').'');
- }
- @f2=&get_split_file($fn,'remote');
- }
- $r->print('
'); +Apache::londiff - foreach $chunk (@$diffs) { - - foreach $line (@$chunk) { - my ($sign, $lineno, $text) = @$line; - $text=~s/\\<\;/g; - $text=~s/\>/\>\;/g; - $lineno=substr($lineno.' ',0,7); - $r->print(''. - $sign.' '.$lineno.' '.$text."\n"); - } - $r->print("'); - - } else { - $r->print('
\n"); - } - $r->print('