version 1.34, 2011/12/23 14:54:26
|
version 1.38, 2017/05/07 13:26:40
|
Line 38 use File::Copy;
|
Line 38 use File::Copy;
|
use File::Compare; |
use File::Compare; |
use Algorithm::Diff qw(diff); |
use Algorithm::Diff qw(diff); |
use Apache::Constants qw(:common :http :methods); |
use Apache::Constants qw(:common :http :methods); |
use Apache::loncacc(); |
|
use Apache::lonnet; |
use Apache::lonnet; |
use Apache::loncommon(); |
use Apache::loncommon(); |
use Apache::lonretrieve(); |
use Apache::lonretrieve(); |
Line 86 sub handler {
|
Line 85 sub handler {
|
if ($env{'form.filename'}=~ m{^/res/}) { |
if ($env{'form.filename'}=~ m{^/res/}) { |
if (&Apache::lonnet::allowed('bre',$env{'form.filename'})) { |
if (&Apache::lonnet::allowed('bre',$env{'form.filename'})) { |
if ($env{'request.course.id'}) { |
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; |
$allowed = 1; |
} |
} |
} else { |
} else { |
Line 101 sub handler {
|
Line 101 sub handler {
|
|
|
if (($env{'form.versionone'} eq 'priv') || ($env{'form.versiontwo'} eq 'priv')) { |
if (($env{'form.versionone'} eq 'priv') || ($env{'form.versiontwo'} eq 'priv')) { |
my ($cstrname,$cstrdom) = |
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)) { |
unless (($cstrname eq $cuname) && ($cstrdom eq $cudom)) { |
$allowed = 0; |
$allowed = 0; |
} |
} |
Line 109 sub handler {
|
Line 109 sub handler {
|
} |
} |
} else { |
} else { |
($cuname,$cudom)= |
($cuname,$cudom)= |
&Apache::loncacc::constructaccess($env{'form.filename'}); |
&Apache::lonnet::constructaccess($env{'form.filename'}); |
if ($cuname ne '' && $cudom ne '') { |
if ($cuname ne '' && $cudom ne '') { |
$allowed = 1; |
$allowed = 1; |
} else { |
} else { |
Line 141 sub handler {
|
Line 141 sub handler {
|
' <span class="LC_filename">'.$efn.'</span>'); |
' <span class="LC_filename">'.$efn.'</span>'); |
|
|
if (($cuname ne $env{'user.name'}) || ($cudom ne $env{'user.domain'})) { |
if (($cuname ne $env{'user.name'}) || ($cudom ne $env{'user.domain'})) { |
$r->print('<p><span class="LC_info">' |
my $nameshown = &Apache::loncommon::plainname($cuname,$cudom). |
.&mt('Co-Author [_1]' |
' ('.$cuname.':'.$cudom.')'; |
,&Apache::loncommon::plainname($cuname,$cudom) |
$r->print('<p><span class="LC_info">'); |
.' ('.$cuname.':'.$cudom.')') |
if ($env{'request.role'} =~ /^ca\./) { |
.'</span></p>' |
$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('</span></p>'); |
} |
} |
|
|
|
|
if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq 'ssi' |
if (&Apache::loncommon::fileembstyle(($efn=~/\.(\w+)$/)) eq 'ssi' |
|| $efn =~ /\.meta$/) { |
|| $efn =~ /\.meta$/) { |
$r->print('<p><span class="LC_diff_removed">'); |
$r->print('<p><span class="LC_diff_removed">'); |
if ($env{'form.versionone'} eq 'priv') { |
if ($env{'form.versionone'} eq 'priv') { |
my $fn=$r->dir_config('lonDocRoot')."/priv/$cudom/$cuname".$efn; |
my $fn=$r->dir_config('lonDocRoot')."/priv/$cudom/$cuname".$efn; |
@f1=&get_split_file($fn,'local'); |
@f1=&get_split_file($fn,'local'); |
$r->print('<b>'.&mt('Construction Space Version').'</b>'); |
$r->print('<b>'.&mt('Authoring Space Version').'</b>'); |
} else { |
} else { |
my $fn=$r->dir_config('lonDocRoot')."/res/$cudom/$cuname"; |
my $fn=$r->dir_config('lonDocRoot')."/res/$cudom/$cuname"; |
if ($env{'form.versionone'}) { |
if ($env{'form.versionone'}) { |
Line 185 sub handler {
|
Line 189 sub handler {
|
} elsif ($env{'form.versiontwo'} eq 'priv') { |
} elsif ($env{'form.versiontwo'} eq 'priv') { |
my $fn=$r->dir_config('lonDocRoot')."/priv/$cudom/$cuname".$efn; |
my $fn=$r->dir_config('lonDocRoot')."/priv/$cudom/$cuname".$efn; |
@f2=&get_split_file($fn,'local'); |
@f2=&get_split_file($fn,'local'); |
$r->print('<b>'.&mt('Construction Space Version').'</b>'); |
$r->print('<b>'.&mt('Authoring Space Version').'</b>'); |
} else { |
} else { |
my $fn=$r->dir_config('lonDocRoot')."/res/$cudom/$cuname/"; |
my $fn=$r->dir_config('lonDocRoot')."/res/$cudom/$cuname/"; |
if ($env{'form.versiontwo'}) { |
if ($env{'form.versiontwo'}) { |