--- loncom/publisher/londiff.pm 2011/10/30 00:30:19 1.31 +++ 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.31 2011/10/30 00:30:19 raeburn Exp $ +# $Id: londiff.pm,v 1.37 2013/06/04 22:20:16 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,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(); @@ -83,31 +82,40 @@ sub handler { my $cuname=$env{'user.name'}; my $cudom=$env{'user.domain'}; - if ($env{'form.filename'}=~/^\/res\//) { + 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; + $allowed = 1; } if ($allowed) { ($cudom,$cuname,$env{'form.filename'})= - ($env{'form.filename'}=~m{^/res/($LONCAPA::domain_re)/($LONCAPA::username_re)(/.*)$}); + ($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::loncacc::constructaccess($env{'form.filename'}, - $r->dir_config('lonDefDomain')); + &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); + ' - not authorized', + $r->filename); } } unless ($allowed) { @@ -115,9 +123,8 @@ sub handler { } # Get the files - - my $efn=$env{'form.filename'}; + my $efn=$env{'form.filename'}; $efn=~s{^/priv/$LONCAPA::domain_re/$LONCAPA::username_re}{}; my @f1=(); @@ -133,22 +140,26 @@ sub handler { ' '.$efn.''); if (($cuname ne $env{'user.name'}) || ($cudom ne $env{'user.domain'})) { - $r->print('
' - .&mt('Co-Author [_1]' - ,&Apache::loncommon::plainname($cuname,$cudom) - .' ('.$cuname.':'.$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=$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=$r->dir_config('lonDocRoot')."/res/$cudom/$cuname";
if ($env{'form.versionone'}) {
@@ -177,10 +188,9 @@ sub handler {
} 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').'');
+ $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);
@@ -222,7 +232,6 @@ sub handler {
} else {
$r->print(''.&mt('Binary File').'
');
}
- $r->print('