loncom/publisher/londiff.pm - diff

Return to londiff.pm CVS log

Up to [LON-CAPA] / loncom / publisher

Diff for /loncom/publisher/londiff.pm between versions 1.28.2.1 and 1.32

version 1.28.2.1, 2011/11/07 15:18:13	version 1.32, 2011/10/30 14:59:57
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/$cuname".$env{'form.filename'},$cudom);	&Apache::loncacc::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;
}	}
}	}
}	}
} else {	} else {
($cuname,$cudom)=	($cuname,$cudom)=
&Apache::loncacc::constructaccess($env{'form.filename'},	&Apache::loncacc::constructaccess($env{'form.filename'});
$r->dir_config('lonDefDomain'));
if ($cuname ne '' && $cudom ne '') {	if ($cuname ne '' && $cudom ne '') {
$allowed = 1;	$allowed = 1;
} else {	} else {
$r->log_reason($env{'user.name'}.':'.$env{'user.domain'}.	$r->log_reason($env{'user.name'}.':'.$env{'user.domain'}.
' trying to get diffs file '.$env{'form.filename'}.	' trying to get diffs file '.$env{'form.filename'}.
' - not authorized',	' - not authorized',
$r->filename);	$r->filename);
}	}
}	}
unless ($allowed) {	unless ($allowed) {
return HTTP_NOT_ACCEPTABLE;	return HTTP_NOT_ACCEPTABLE;
Line 127 sub handler {	Line 126 sub handler {
# Get the files	# Get the files

my $efn=$env{'form.filename'};	my $efn=$env{'form.filename'};
	$efn=~s{^/priv/$LONCAPA::domain_re/$LONCAPA::username_re}{};
$efn=~s{/\~($LONCAPA::username_re)}{}g;

my @f1=();	my @f1=();
my @f2=();	my @f2=();
Line 156 sub handler {	Line 154 sub handler {
\|\| $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='/home/'.$cuname.'/public_html/'.$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('Construction Space Version').'</b>');
} else {	} else {
my $fn=	my $fn=$r->dir_config('lonDocRoot')."/res/$cudom/$cuname";
'/home/httpd/html/res/'.$cudom.'/'.$cuname.'/';
if ($env{'form.versionone'}) {	if ($env{'form.versionone'}) {
my ($main,$suffix,$is_meta)=	my ($main,$suffix,$is_meta)=
&Apache::lonretrieve::get_file_info($efn);	&Apache::lonretrieve::get_file_info($efn);
Line 181 sub handler {	Line 178 sub handler {

if ($env{'form.filetwo'}) {	if ($env{'form.filetwo'}) {
my $efn2=$env{'form.filetwo'};	my $efn2=$env{'form.filetwo'};
$efn2=~s{/\~($LONCAPA::username_re)}{}g;	$efn2=~s{^/priv/$LONCAPA::domain_re/$LONCAPA::username_re}{};
my $fn='/home/'.$cuname.'/public_html/'.$efn2;	my $fn=$r->dir_config('lonDocRoot')."/priv/$cudom/$cuname".$efn2;
@f2=&get_split_file($fn,'local');	@f2=&get_split_file($fn,'local');
$r->print('<tt>'.$efn2.'</tt>');	$r->print('<tt>'.$efn2.'</tt>');
} elsif ($env{'form.versiontwo'} eq 'priv') {	} 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');	@f2=&get_split_file($fn,'local');
$r->print('<b>'.&mt('Construction Space Version').'</b>');	$r->print('<b>'.&mt('Construction Space Version').'</b>');
} else {	} else {

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.28.2.1
changed lines
	Added in v.1.32