--- loncom/publisher/londiff.pm 2012/04/18 20:14:35 1.35 +++ loncom/publisher/londiff.pm 2017/05/07 13:26:40 1.38 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Handler to show differences between file versions # -# $Id: londiff.pm,v 1.35 2012/04/18 20:14:35 raeburn Exp $ +# $Id: londiff.pm,v 1.38 2017/05/07 13:26:40 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(); @@ -86,7 +85,8 @@ sub handler { 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'})) { + if ((&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) || + (&Apache::lonnet::allowed('cev',$env{'request.course.id'}))) { $allowed = 1; } } else { @@ -101,7 +101,7 @@ sub handler { if (($env{'form.versionone'} eq 'priv') || ($env{'form.versiontwo'} eq 'priv')) { my ($cstrname,$cstrdom) = - &Apache::loncacc::constructaccess("/priv/$cudom/$cuname".$env{'form.filename'}); + &Apache::lonnet::constructaccess("/priv/$cudom/$cuname".$env{'form.filename'}); unless (($cstrname eq $cuname) && ($cstrdom eq $cudom)) { $allowed = 0; } @@ -109,7 +109,7 @@ sub handler { } } else { ($cuname,$cudom)= - &Apache::loncacc::constructaccess($env{'form.filename'}); + &Apache::lonnet::constructaccess($env{'form.filename'}); if ($cuname ne '' && $cudom ne '') { $allowed = 1; } else { @@ -145,9 +145,9 @@ sub handler { ' ('.$cuname.':'.$cudom.')'; $r->print('

'); if ($env{'request.role'} =~ /^ca\./) { - $r->print(&mt('Co-Author in Construction Space for: [_1]',$nameshown)); + $r->print(&mt('Co-Author in Authoring Space for: [_1]',$nameshown)); } elsif ($env{'request.role'} =~ /^aa\./) { - $r->print(&mt('Assistant Author in Construction Space for: [_1]',$nameshown)); + $r->print(&mt('Assistant Author in Authoring Space for: [_1]',$nameshown)); } else { $r->print(&mt('Resource Author is: [_1]',$nameshown)); } @@ -160,7 +160,7 @@ sub handler { 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'}) { @@ -189,7 +189,7 @@ 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=$r->dir_config('lonDocRoot')."/res/$cudom/$cuname/"; if ($env{'form.versiontwo'}) {