--- loncom/publisher/londiff.pm 2006/12/05 02:55:55 1.22 +++ loncom/publisher/londiff.pm 2013/06/04 22:20:16 1.37 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to show differences between file versions # -# $Id: londiff.pm,v 1.22 2006/12/05 02:55:55 albertel Exp $ +# $Id: londiff.pm,v 1.37 2013/06/04 22:20:16 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -27,6 +27,9 @@ # ### + + + package Apache::londiff; use strict; @@ -35,7 +38,6 @@ 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(); @@ -55,16 +57,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; } @@ -81,29 +76,56 @@ sub handler { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['filename','versiontwo', 'versionone','filetwo']); -# Get the files +# Check permissions + my $allowed=0; my $cuname=$env{'user.name'}; my $cudom=$env{'user.domain'}; - if ($env{'form.filename'}=~/^\/res\//) { - ($cudom,$cuname,$env{'form.filename'})= - ($env{'form.filename'}=~m{^/res/($LONCAPA::domain_re)/($LONCAPA::username_re)/(.*)$}); + 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 { - unless (($cuname,$cudom)= - &Apache::loncacc::constructaccess($env{'form.filename'}, - $r->dir_config('lonDefDomain'))) { - $r->log_reason($cuname.':'.$cudom. + ($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); - return HTTP_NOT_ACCEPTABLE; + ' - not authorized', + $r->filename); } } - - my $efn=$env{'form.filename'}; + unless ($allowed) { + return HTTP_NOT_ACCEPTABLE; + } - $efn=~s{/\~($LONCAPA::username_re)}{}g; +# Get the files + + my $efn=$env{'form.filename'}; + $efn=~s{^/priv/$LONCAPA::domain_re/$LONCAPA::username_re}{}; my @f1=(); my @f2=(); @@ -111,28 +133,35 @@ sub handler { &Apache::loncommon::content_type($r,'text/html'); $r->send_http_header; - $r->print(&Apache::loncommon::start_page('Resource Differences')); - + $r->print(&Apache::loncommon::start_page('Resource Differences',undef, + {'no_nav_bar' => 1, })); - $r->print('

'.($env{'form.filetwo'}?'':&mt('Compare versions of')). - ' '.$efn.'

'); + $r->print(($env{'form.filetwo'}?'':&mt('Compare versions of')). + ' '.$efn.''); if (($cuname ne $env{'user.name'}) || ($cudom ne $env{'user.domain'})) { - $r->print('

Co-Author: '.$cuname.' at '.$cudom. - '

'); + my $nameshown = &Apache::loncommon::plainname($cuname,$cudom). + ' ('.$cuname.':'.$cudom.')'; + $r->print('

'); + if ($env{'request.role'} =~ /^ca\./) { + $r->print(&mt('Co-Author in Authoring Space for: [_1]',$nameshown)); + } elsif ($env{'request.role'} =~ /^aa\./) { + $r->print(&mt('Assistant Author in Authoring Space for: [_1]',$nameshown)); + } else { + $r->print(&mt('Resource Author is: [_1]',$nameshown)); + } + $r->print('

'); } - if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq 'ssi' || $efn =~ /\.meta$/) { $r->print('

'); if ($env{'form.versionone'} eq 'priv') { - my $fn='/home/'.$cuname.'/public_html/'.$efn; + my $fn=$r->dir_config('lonDocRoot')."/priv/$cudom/$cuname".$efn; @f1=&get_split_file($fn,'local'); - $r->print(''.&mt('Construction Space Version').''); + $r->print(''.&mt('Authoring Space Version').''); } else { - my $fn= - '/home/httpd/html/res/'.$cudom.'/'.$cuname.'/'; + my $fn=$r->dir_config('lonDocRoot')."/res/$cudom/$cuname"; if ($env{'form.versionone'}) { my ($main,$suffix,$is_meta)= &Apache::lonretrieve::get_file_info($efn); @@ -152,17 +181,16 @@ sub handler { if ($env{'form.filetwo'}) { my $efn2=$env{'form.filetwo'}; - $efn2=~s{/\~($LONCAPA::username_re)}{}g; - my $fn='/home/'.$cuname.'/public_html/'.$efn2; + $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='/home/'.$cuname.'/public_html/'.$efn; + my $fn=$r->dir_config('lonDocRoot')."/priv/$cudom/$cuname".$efn; @f2=&get_split_file($fn,'local'); - $r->print(''.&mt('Construction Space Version').''); + $r->print(''.&mt('Authoring Space Version').''); } else { - my $fn= - '/home/httpd/html/res/'.$cudom.'/'.$cuname.'/'; + my $fn=$r->dir_config('lonDocRoot')."/res/$cudom/$cuname/"; if ($env{'form.versiontwo'}) { my ($main,$suffix,$is_meta)= &Apache::lonretrieve::get_file_info($efn); @@ -180,32 +208,30 @@ sub handler { # Run diff my $diffs = diff(\@f1, \@f2); - -# Start page output - - my $chunk; - my $line; - $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('
'); - + if (@$diffs) { + # Start page output + my $chunk; + my $line; + $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('

'.&mt('Binary File').'

'); } - $r->print('
'.&mt('Close This Window').'
'); $r->print(&Apache::loncommon::end_page()); return OK; } @@ -215,5 +241,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