loncom/publisher/lonpublisher.pm - diff

Return to lonpublisher.pm CVS log

Up to [LON-CAPA] / loncom / publisher

Diff for /loncom/publisher/lonpublisher.pm between versions 1.24 and 1.59

version 1.24, 2001/04/16 20:02:50	version 1.59, 2001/12/05 21:12:04
Line 1	Line 1
# The LearningOnline Network with CAPA	# The LearningOnline Network with CAPA
# Publication Handler	# Publication Handler
	#
	# $Id$
	#
	# Copyright Michigan State University Board of Trustees
	#
	# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
	#
	# LON-CAPA is free software; you can redistribute it and/or modify
	# it under the terms of the GNU General Public License as published by
	# the Free Software Foundation; either version 2 of the License, or
	# (at your option) any later version.
	#
	# LON-CAPA is distributed in the hope that it will be useful,
	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	# GNU General Public License for more details.
	#
	# You should have received a copy of the GNU General Public License
	# along with LON-CAPA; if not, write to the Free Software
	# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	#
	# /home/httpd/html/adm/gpl.txt
	#
	# http://www.lon-capa.org/
	#
#	#
# (TeX Content Handler	# (TeX Content Handler
#	#
Line 9	Line 34
# 03/23 Guy Albertelli	# 03/23 Guy Albertelli
# 03/24,03/29,04/03 Gerd Kortemeyer	# 03/24,03/29,04/03 Gerd Kortemeyer
# 04/16/2001 Scott Harrison	# 04/16/2001 Scott Harrison
	# 05/03,05/05,05/07 Gerd Kortemeyer
	# 05/28/2001 Scott Harrison
	# 06/23,08/07,08/11,8/13,8/17,8/18,8/24,9/26,10/16 Gerd Kortemeyer
	# 12/04,12/05 Guy Albertelli
	# 12/05 Gerd Kortemeyer

package Apache::lonpublisher;	package Apache::lonpublisher;

Line 19 use Apache::Constants qw(:common :http :	Line 49 use Apache::Constants qw(:common :http :
use HTML::TokeParser;	use HTML::TokeParser;
use Apache::lonxml;	use Apache::lonxml;
use Apache::lonhomework;	use Apache::lonhomework;
	use Apache::loncacc;
use DBI;	use DBI;

my %addid;	my %addid;
Line 31 my %metadatakeys;	Line 62 my %metadatakeys;

my $docroot;	my $docroot;

	my $cuname;
	my $cudom;

# ----------------------------------------------- Evaluate string with metadata	# ----------------------------------------------- Evaluate string with metadata

sub metaeval {	sub metaeval {
Line 42 sub metaeval {	Line 76 sub metaeval {
if ($token->[0] eq 'S') {	if ($token->[0] eq 'S') {
my $entry=$token->[1];	my $entry=$token->[1];
my $unikey=$entry;	my $unikey=$entry;
	if (defined($token->[2]->{'package'})) {
	$unikey.='_package_'.$token->[2]->{'package'};
	}
if (defined($token->[2]->{'part'})) {	if (defined($token->[2]->{'part'})) {
$unikey.='_'.$token->[2]->{'part'};	$unikey.='_'.$token->[2]->{'part'};
}	}
	if (defined($token->[2]->{'id'})) {
	$unikey.='_'.$token->[2]->{'id'};
	}
if (defined($token->[2]->{'name'})) {	if (defined($token->[2]->{'name'})) {
$unikey.='_'.$token->[2]->{'name'};	$unikey.='_'.$token->[2]->{'name'};
}	}
Line 58 sub metaeval {	Line 98 sub metaeval {
} @{$token->[3]};	} @{$token->[3]};
if ($metadatafields{$unikey}) {	if ($metadatafields{$unikey}) {
my $newentry=$parser->get_text('/'.$entry);	my $newentry=$parser->get_text('/'.$entry);
unless ($metadatafields{$unikey}=~/$newentry/) {	unless (($metadatafields{$unikey}=~/$newentry/) \|\|
	($newentry eq '')) {
$metadatafields{$unikey}.=', '.$newentry;	$metadatafields{$unikey}.=', '.$newentry;
}	}
} else {	} else {
Line 86 sub metaread {	Line 127 sub metaread {
return '<br><b>Processed file:</b> <tt>'.$fn.'</tt>';	return '<br><b>Processed file:</b> <tt>'.$fn.'</tt>';
}	}

	# ---------------------------- convert 'time' format into a datetime sql format
	sub sqltime {
	my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
	localtime(@_[0]);
	$mon++; $year+=1900;
	return "$year-$mon-$mday $hour:$min:$sec";
	}

# --------------------------------------------------------- Various form fields	# --------------------------------------------------------- Various form fields

sub textfield {	sub textfield {
Line 112 sub selectbox {	Line 161 sub selectbox {

# -------------------------------------------------------- Publication Step One	# -------------------------------------------------------- Publication Step One

	sub urlfixup {
	my ($url,$target)=@_;
	unless ($url) { return ''; }
	my ($host)=($url=~/(?:http\:\/\/)*([^\/]+)/);
	map {
	if ($_ eq $host) {
	$url=~s/^http\:\/\///;
	$url=~s/^$host//;
	}
	} values %Apache::lonnet::hostname;
	if ($url=~/^http\:\/\//) { return $url; }
	$url=~s/\~$cuname/res\/$cudom\/$cuname/;
	if ($target) {
	$target=~s/\/[^\/]+$//;
	$url=&Apache::lonnet::hreflocation($target,$url);
	}
	return $url;
	}

sub publish {	sub publish {

my ($source,$target,$style)=@_;	my ($source,$target,$style)=@_;
Line 119 sub publish {	Line 187 sub publish {
my $scrout='';	my $scrout='';
my $allmeta='';	my $allmeta='';
my $content='';	my $content='';
	my %allow=();
	undef %allow;

unless ($logfile=Apache::File->new('>>'.$source.'.log')) {	unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
return	return
Line 179 sub publish {	Line 249 sub publish {
print $logfile "Needs ID and/or index fixup\n".	print $logfile "Needs ID and/or index fixup\n".
"Max ID : $maxid (min 10)\n".	"Max ID : $maxid (min 10)\n".
"Max Index: $maxindex (min 10)\n";	"Max Index: $maxindex (min 10)\n";
	}
my $outstring='';	my $outstring='';
my $parser=HTML::TokeParser->new(\$content);	my $parser=HTML::TokeParser->new(\$content);
	$parser->xml_mode(1);
my $token;	my $token;
while ($token=$parser->get_token) {	while ($token=$parser->get_token) {
if ($token->[0] eq 'S') {	if ($token->[0] eq 'S') {
my $counter;	my $counter;
if ($counter=$addid{$token->[1]}) {	my $tag=$token->[1];
	my $lctag=lc($tag);
	unless ($lctag eq 'allow') {
	my %parms=%{$token->[2]};
	$counter=$addid{$tag};
	if (!$counter) { $counter=$addid{$lctag}; }
	if ($counter) {
if ($counter eq 'id') {	if ($counter eq 'id') {
if (defined($token->[2]->{'id'})) {	unless (defined($parms{'id'})) {
$outstring.=$token->[4];
} else {
$maxid++;	$maxid++;
my $thisid=' id="'.$maxid.'"';	$parms{'id'}=$maxid;
my $fixup=$token->[4];	print $logfile 'ID: '.$tag.':'.$maxid."\n";
$fixup=~s/(\<\w+)/$1$thisid/;
$outstring.=$fixup;
print $logfile 'ID: '.$fixup."\n";
}	}
} else {	} elsif ($counter eq 'index') {
if (defined($token->[2]->{'index'})) {	unless (defined($parms{'index'})) {
$outstring.=$token->[4];
} else {
$maxindex++;	$maxindex++;
my $thisindex=' index="'.$maxindex.'"';	$parms{'index'}=$maxindex;
my $fixup=$token->[4];	print $logfile 'Index: '.$tag.':'.$maxindex."\n";
$fixup=~s/(\<\w+)/$1$thisindex/;
$outstring.=$fixup;
print $logfile 'Index: '.$fixup."\n";
}	}
}	}
} else {	}
$outstring.=$token->[4];
	map {
	if (defined($parms{$_})) {
	my $oldurl=$parms{$_};
	my $newurl=&urlfixup($oldurl,$target);
	if ($newurl ne $oldurl) {
	$parms{$_}=$newurl;
	print $logfile 'URL: '.$tag.':'.$oldurl.' - '.
	$newurl."\n";
	}
	$allow{$newurl}=1;
	}
	} ('src','href','background');

	if ($lctag eq 'applet') {
	my $codebase='';
	if (defined($parms{'codebase'})) {
	my $oldcodebase=$parms{'codebase'};
	unless ($oldcodebase=~/\/$/) {
	$oldcodebase.='/';
	}
	$codebase=&urlfixup($oldcodebase,$target);
	$codebase=~s/\/$//;
	if ($codebase ne $oldcodebase) {
	$parms{'codebase'}=$codebase;
	print $logfile 'URL codebase: '.$tag.':'.
	$oldcodebase.' - '.
	$codebase."\n";
	}
	$allow{$codebase.'/*'}=1;
	} else {
	map {
	if (defined($parms{$_})) {
	my $oldurl=$parms{$_};
	my $newurl=&urlfixup($oldurl,$target);
	$newurl=~s/\/[^\/]+$/\/\*/;
	print $logfile 'Allow: applet '.$_.':'.
	$oldurl.' allows '.
	$newurl."\n";
	$allow{$newurl}=1;
	}
	} ('archive','code','object');
	}
}	}

	my $newparmstring='';
	my $endtag='';
	map {
	if ($_ eq '/') {
	$endtag=' /';
	} else {
	my $quote=($parms{$_}=~/\"/?"'":'"');
	$newparmstring.=' '.$_.'='.$quote.$parms{$_}.$quote;
	}
	} keys %parms;
	if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; }
	$outstring.='<'.$tag.$newparmstring.$endtag.'>';
	} else {
	$allow{$token->[2]->{'src'}}=1;
	}
} elsif ($token->[0] eq 'E') {	} elsif ($token->[0] eq 'E') {
$outstring.=$token->[2];	if ($token->[2]) {
	unless ($token->[1] eq 'allow') {
	$outstring.='</'.$token->[1].'>';
	}
	}
} else {	} else {
$outstring.=$token->[1];	$outstring.=$token->[1];
}	}
}	}
	# ------------------------------------------------------------ Construct Allows
	unless ($style eq 'rat') {
	$scrout.='<h3>Dependencies</h3>';
	my $allowstr="\n";
	map {
	my $thisdep=$_;
	$allowstr.='<allow src="'.$thisdep.'" />'."\n";
	$scrout.='<br>';
	unless ($thisdep=~/\*/) {
	$scrout.='<a href="'.$thisdep.'">';
	}
	$scrout.='<tt>'.$thisdep.'</tt>';
	unless ($thisdep=~/\*/) {
	$scrout.='</a>';
	if (
	&Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/'.
	$thisdep.'.meta') eq '-1') {
	$scrout.=
	' - <font color=red>Currently not available</font>';
	} else {
	my %temphash=(&Apache::lonnet::declutter($target).'___'.
	&Apache::lonnet::declutter($thisdep).'___usage'
	=> time);
	$thisdep=~/^\/res\/(\w+)\/(\w+)\//;
	if ((defined($1)) && (defined($2))) {
	&Apache::lonnet::put('resevaldata',\%temphash,$1,$2);
	}
	}
	}
	} keys %allow;
	$outstring=~s/(\<\/[^\>]+\>\s*)$/$allowstr$1/s;
	}
	# ------------------------------------------------------------- Write modified

{	{
my $org;	my $org;
unless ($org=Apache::File->new('>'.$source)) {	unless ($org=Apache::File->new('>'.$source)) {
Line 229 sub publish {	Line 392 sub publish {
print $org $outstring;	print $org $outstring;
}	}
$content=$outstring;	$content=$outstring;

	if ($needsfixup) {
print $logfile "End of ID and/or index fixup\n".	print $logfile "End of ID and/or index fixup\n".
"Max ID : $maxid (min 10)\n".	"Max ID : $maxid (min 10)\n".
"Max Index: $maxindex (min 10)\n";	"Max Index: $maxindex (min 10)\n";
} else {	} else {
print $logfile "Does not need ID and/or index fixup\n";	print $logfile "Does not need ID and/or index fixup\n";
}	}
	}
# --------------------------------------------- Initial step done, now metadata	# --------------------------------------------- Initial step done, now metadata

# ---------------------------------------- Storage for metadata keys and fields	# ---------------------------------------- Storage for metadata keys and fields
Line 244 sub publish {	Line 409 sub publish {
%metadatakeys=();	%metadatakeys=();

my %oldparmstores=();	my %oldparmstores=();

	$scrout.='<h3>Metadata Information</h3>';

# ------------------------------------------------ First, check out environment	# ------------------------------------------------ First, check out environment
unless (-e $source.'.meta') {	unless (-e $source.'.meta') {
Line 253 sub publish {	Line 420 sub publish {
$ENV{'environment.generation'};	$ENV{'environment.generation'};
$metadatafields{'author'}=~s/\s+/ /g;	$metadatafields{'author'}=~s/\s+/ /g;
$metadatafields{'author'}=~s/\s+$//;	$metadatafields{'author'}=~s/\s+$//;
$metadatafields{'owner'}=$ENV{'user.name'}.'@'.$ENV{'user.domain'};	$metadatafields{'owner'}=$cuname.'@'.$cudom;

# ------------------------------------------------ Check out directory hierachy	# ------------------------------------------------ Check out directory hierachy

my $thisdisfn=$source;	my $thisdisfn=$source;
$thisdisfn=~s/^\/home\/$ENV{'user.name'}\///;	$thisdisfn=~s/^\/home\/$cuname\///;

my @urlparts=split(/\//,$thisdisfn);	my @urlparts=split(/\//,$thisdisfn);
$#urlparts--;	$#urlparts--;

my $currentpath='/home/'.$ENV{'user.name'}.'/';	my $currentpath='/home/'.$cuname.'/';

map {	map {
$currentpath.=$_.'/';	$currentpath.=$_.'/';
Line 293 sub publish {	Line 460 sub publish {
}	}

# -------------------------------------------------- Parse content for metadata	# -------------------------------------------------- Parse content for metadata
	if ($style eq 'ssi') {
	my $oldenv=$ENV{'request.uri'};

	$ENV{'request.uri'}=$target;
$allmeta=Apache::lonxml::xmlparse('meta',$content);	$allmeta=Apache::lonxml::xmlparse('meta',$content);
&metaeval($allmeta);	$ENV{'request.uri'}=$oldenv;

	&metaeval($allmeta);
	}
# ---------------- Find and document discrepancies in the parameters and stores	# ---------------- Find and document discrepancies in the parameters and stores

my $chparms='';	my $chparms='';
Line 318 sub publish {	Line 490 sub publish {
my $chparms='';	my $chparms='';
map {	map {
if (($_=~/^parameter/) \|\| ($_=~/^stores/)) {	if (($_=~/^parameter/) \|\| ($_=~/^stores/)) {
unless (($metadatafields{$_.'.name'}) \|\| ($_=~/\.\w+$/)) {	unless (($metadatafields{$_.'.name'}) \|\|
	($metadatafields{$_.'.package'}) \|\| ($_=~/\.\w+$/)) {
print $logfile 'Obsolete: '.$_."\n";	print $logfile 'Obsolete: '.$_."\n";
$chparms.=$_.' ';	$chparms.=$_.' ';
}	}
Line 328 sub publish {	Line 501 sub publish {
$scrout.='<p><b>Obsolete parameters or stored values:</b> '.	$scrout.='<p><b>Obsolete parameters or stored values:</b> '.
$chparms;	$chparms;
}	}
}
# ------------------------------------------------------- Now have all metadata	# ------------------------------------------------------- Now have all metadata

$scrout.=	$scrout.=
Line 336 sub publish {	Line 509 sub publish {
&hiddenfield('phase','two').	&hiddenfield('phase','two').
&hiddenfield('filename',$ENV{'form.filename'}).	&hiddenfield('filename',$ENV{'form.filename'}).
&hiddenfield('allmeta',&Apache::lonnet::escape($allmeta)).	&hiddenfield('allmeta',&Apache::lonnet::escape($allmeta)).
	&hiddenfield('dependencies',join(',',keys %allow)).
&textfield('Title','title',$metadatafields{'title'}).	&textfield('Title','title',$metadatafields{'title'}).
&textfield('Author(s)','author',$metadatafields{'author'}).	&textfield('Author(s)','author',$metadatafields{'author'}).
&textfield('Subject','subject',$metadatafields{'subject'});	&textfield('Subject','subject',$metadatafields{'subject'});
Line 345 sub publish {	Line 519 sub publish {
my $keywordout='<p><b>Keywords:</b><br><table border=2><tr>';	my $keywordout='<p><b>Keywords:</b><br><table border=2><tr>';
my $colcount=0;	my $colcount=0;

{	if (length($content)<500000) {
my $textonly=$content;	my $textonly=$content;
$textonly=~s/\<script[^\<]+\<\/script\>//g;	$textonly=~s/\<script[^\<]+\<\/script\>//g;
$textonly=~s/\<m\>[^\<]+\<\/m\>//g;	$textonly=~s/\<m\>[^\<]+\<\/m\>//g;
Line 377 sub publish {	Line 551 sub publish {
}	}
$colcount++;	$colcount++;
} sort keys %keywords;	} sort keys %keywords;
$keywordout.='</tr></table>';

	} else {
	$keywordout.='<td>File too long for keyword analysis</td>';
}	}

$scrout.=$keywordout;	$keywordout.='</tr></table>';

	$scrout.=$keywordout;

$scrout.=&textfield('Additional Keywords','addkey','');	$scrout.=&textfield('Additional Keywords','addkey','');

Line 408 sub publish {	Line 585 sub publish {

$scrout.=&textfield('Publisher/Owner','owner',	$scrout.=&textfield('Publisher/Owner','owner',
$metadatafields{'owner'});	$metadatafields{'owner'});
	# --------------------------------------------------- Correct copyright for rat
	if ($style eq 'rat') {
	if ($metadatafields{'copyright'} eq 'public') {
	delete $metadatafields{'copyright'};
	}
	delete $cprtag{'public'};
	}

$scrout.=&selectbox('Copyright/Distribution','copyright',	$scrout.=&selectbox('Copyright/Distribution','copyright',
$metadatafields{'copyright'},%cprtag);	$metadatafields{'copyright'},%cprtag);
Line 485 sub phasetwo {	Line 669 sub phasetwo {
}	}

# -------------------------------- Synchronize entry with SQL metadata database	# -------------------------------- Synchronize entry with SQL metadata database
	my %perlvar;
	open (CONFIG,"/etc/httpd/conf/access.conf") \|\| die "Can't read access.conf";
	my $configline;
	while ($configline=<CONFIG>) {
	if ($configline =~ /PerlSetVar/) {
	my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
	chomp($varvalue);
	$perlvar{$varname}=$varvalue;
	}
	}
	close(CONFIG);

	my $warning;
my $dbh;	my $dbh;
{	{
unless (	unless (
$dbh = DBI->connect("DBI:mysql:loncapa","www",$perlvar{'lonSqlAccess'},{ RaiseError =>0,PrintError=>0})	$dbh = DBI->connect("DBI:mysql:loncapa","www",$perlvar{'lonSqlAccess'},{ RaiseError =>0,PrintError=>0})
) {	) {
return '<font color=red>Cannot connect to database!</font>';	$warning='<font color=red>WARNING: Cannot connect to '.
	'database!</font>';
	}
	else {
	my %sqldatafields;
	$sqldatafields{'url'}=$distarget;
	my $sth=$dbh->prepare(
	'delete from metadata where url like binary'.
	'"'.$sqldatafields{'url'}.'"');
	$sth->execute();
	map {my $field=$metadatafields{$_}; $field=~s/\"/\'\'/g;
	$sqldatafields{$_}=$field;}
	('title','author','subject','keywords','notes','abstract',
	'mime','language','creationdate','lastrevisiondate','owner',
	'copyright');

	$sth=$dbh->prepare('insert into metadata values ('.
	'"'.delete($sqldatafields{'title'}).'"'.','.
	'"'.delete($sqldatafields{'author'}).'"'.','.
	'"'.delete($sqldatafields{'subject'}).'"'.','.
	'"'.delete($sqldatafields{'url'}).'"'.','.
	'"'.delete($sqldatafields{'keywords'}).'"'.','.
	'"'.'current'.'"'.','.
	'"'.delete($sqldatafields{'notes'}).'"'.','.
	'"'.delete($sqldatafields{'abstract'}).'"'.','.
	'"'.delete($sqldatafields{'mime'}).'"'.','.
	'"'.delete($sqldatafields{'language'}).'"'.','.
	'"'.
	sqltime(delete($sqldatafields{'creationdate'}))
	.'"'.','.
	'"'.
	sqltime(delete(
	$sqldatafields{'lastrevisiondate'})).'"'.','.
	'"'.delete($sqldatafields{'owner'}).'"'.','.
	'"'.delete(
	$sqldatafields{'copyright'}).'"'.')');
	$sth->execute();
	$dbh->disconnect;
	$scrout.='<p>Synchronized SQL metadata database';
	print $logfile "\nSynchronized SQL metadata database";
}	}
}	}

my %sqldatafields;
$sqldatafields{'url'}=$distarget;
$sth=$dbh->prepare("delete from metadata where url like binary \"".
$sqldatafields{'url'}."\"");
$sth->execute();
map {my $field=$metadatafields{$_}; $field=~s/\"/\'\'/g;
$sqldatafields{$_}=$field;}
('title','author','subject','keywords','notes','abstract',
'mime','language','creationdate','lastrevisiondate','owner','copyright');

$sth=$dbh->prepare('insert into metadata values ('.
'"'.delete($sqldatafields{'title'}).'"'.','.
'"'.delete($sqldatafields{'author'}).'"'.','.
'"'.delete($sqldatafields{'subject'}).'"'.','.
'"'.delete($sqldatafields{'url'}).'"'.','.
'"'.delete($sqldatafields{'keywords'}).'"'.','.
'"'.'current'.'"'.','.
'"'.delete($sqldatafields{'notes'}).'"'.','.
'"'.delete($sqldatafields{'abstract'}).'"'.','.
'"'.delete($sqldatafields{'mime'}).'"'.','.
'"'.delete($sqldatafields{'language'}).'"'.','.
'"'.delete($sqldatafields{'creationdate'}).'"'.','.
'"'.delete($sqldatafields{'lastrevisiondate'}).'"'.','.
'"'.delete($sqldatafields{'owner'}).'"'.','.
'"'.delete($sqldatafields{'copyright'}).'"'.')');
$sth->execute();
$dbh->disconnect;
$scrout.='<p>Synchronized SQL metadata database';
print $logfile "\nSynchronized SQL metadata database";

# ----------------------------------------------------------- Copy old versions	# ----------------------------------------------------------- Copy old versions

Line 681 if (-e $target) {	Line 888 if (-e $target) {
$thissrcdir=~s/\/[^\/]+$/\//;	$thissrcdir=~s/\/[^\/]+$/\//;


return $scrout.	return $warning.$scrout.
'<hr><a href="'.$thisdistarget.'"><font size=+2>View Target</font></a>'.	'<hr><a href="'.$thisdistarget.'"><font size=+2>View Target</font></a>'.
'<p><a href="'.$thissrc.'"><font size=+2>Back to Source</font></a>'.	'<p><a href="'.$thissrc.'"><font size=+2>Back to Source</font></a>'.
'<p><a href="'.$thissrcdir.	'<p><a href="'.$thissrcdir.
Line 700 sub handler {	Line 907 sub handler {
return OK;	return OK;
}	}

	# Get query string for limited number of parameters

	map {
	my ($name, $value) = split(/=/,$_);
	$value =~ tr/+/ /;
	$value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C",hex($1))/eg;
	if ($name eq 'filename') {
	unless ($ENV{'form.'.$name}) {
	$ENV{'form.'.$name}=$value;
	}
	}
	} (split(/&/,$ENV{'QUERY_STRING'}));


# -------------------------------------------------------------- Check filename	# -------------------------------------------------------------- Check filename

my $fn=$ENV{'form.filename'};	my $fn=$ENV{'form.filename'};


unless ($fn) {	unless ($fn) {
$r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.	$r->log_reason($cuname.' at '.$cudom.
' trying to publish empty filename', $r->filename);	' trying to publish empty filename', $r->filename);
return HTTP_NOT_FOUND;	return HTTP_NOT_FOUND;
}	}

unless ($ENV{'user.home'} eq $r->dir_config('lonHostID')) {	($cuname,$cudom)=
$r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.	&Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'));
	unless (($cuname) && ($cudom)) {
	$r->log_reason($cuname.' at '.$cudom.
' trying to publish file '.$ENV{'form.filename'}.	' trying to publish file '.$ENV{'form.filename'}.
' ('.$fn.') - not homeserver ('.$ENV{'user.home'}.')',	' ('.$fn.') - not authorized',
$r->filename);	$r->filename);
return HTTP_NOT_ACCEPTABLE;	return HTTP_NOT_ACCEPTABLE;
}	}

$fn=~s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/;	unless (&Apache::lonnet::homeserver($cuname,$cudom)
	eq $r->dir_config('lonHostID')) {
	$r->log_reason($cuname.' at '.$cudom.
	' trying to publish file '.$ENV{'form.filename'}.
	' ('.$fn.') - not homeserver ('.
	&Apache::lonnet::homeserver($cuname,$cudom).')',
	$r->filename);
	return HTTP_NOT_ACCEPTABLE;
	}

	$fn=~s/^http\:\/\/[^\/]+//;
	$fn=~s/^\/\~(\w+)/\/home\/$1\/public_html/;

my $targetdir='';	my $targetdir='';
$docroot=$r->dir_config('lonDocRoot');	$docroot=$r->dir_config('lonDocRoot');
if ($1 ne $ENV{'user.name'}) {	if ($1 ne $cuname) {
$r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.	$r->log_reason($cuname.' at '.$cudom.
' trying to publish unowned file '.$ENV{'form.filename'}.	' trying to publish unowned file '.$ENV{'form.filename'}.
' ('.$fn.')',	' ('.$fn.')',
$r->filename);	$r->filename);
return HTTP_NOT_ACCEPTABLE;	return HTTP_NOT_ACCEPTABLE;
} else {	} else {
$targetdir=$docroot.'/res/'.$ENV{'user.domain'};	$targetdir=$docroot.'/res/'.$cudom;
}	}


unless (-e $fn) {	unless (-e $fn) {
$r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.	$r->log_reason($cuname.' at '.$cudom.
' trying to publish non-existing file '.$ENV{'form.filename'}.	' trying to publish non-existing file '.$ENV{'form.filename'}.
' ('.$fn.')',	' ('.$fn.')',
$r->filename);	$r->filename);
Line 812 unless ($ENV{'form.phase'} eq 'two') {	Line 1047 unless ($ENV{'form.phase'} eq 'two') {
$thisdistarget=~s/^$docroot//;	$thisdistarget=~s/^$docroot//;

my $thisdisfn=$thisfn;	my $thisdisfn=$thisfn;
$thisdisfn=~s/^\/home\/$ENV{'user.name'}\/public_html\///;	$thisdisfn=~s/^\/home\/$cuname\/public_html\///;

$r->print('<h2>Publishing '.	$r->print('<h2>Publishing '.
&Apache::lonnet::filedescription($thistype).' <tt>'.	&Apache::lonnet::filedescription($thistype).' <tt>'.
$thisdisfn.'</tt></h2><b>Target:</b> <tt>'.$thisdistarget.'</tt><p>');	$thisdisfn.'</tt></h2><b>Target:</b> <tt>'.$thisdistarget.'</tt><p>');

	if (($cuname ne $ENV{'user.name'}) \|\| ($cudom ne $ENV{'user.domain'})) {
	$r->print('<h3><font color=red>Co-Author: '.$cuname.' at '.$cudom.
	'</font></h3>');
	}

	if (&Apache::lonnet::fileembstyle($thistype) eq 'ssi') {
	$r->print('<br><a href="/adm/diff?filename=/~'.$cuname.'/'.
	$thisdisfn.
	'&versionone=priv" target=cat>Diffs with Current Version</a><p>');
	}

# ------------ We are publishing from $thisfn to $thistarget with $thisembstyle	# ------------ We are publishing from $thisfn to $thistarget with $thisembstyle

unless ($ENV{'form.phase'} eq 'two') {	unless ($ENV{'form.phase'} eq 'two') {
$r->print('<hr>'.&publish($thisfn,$thistarget,$thisembstyle));	$r->print(
	'<hr>'.&publish($thisfn,$thistarget,$thisembstyle));
} else {	} else {
$r->print('<hr>'.&phasetwo($thisfn,$thistarget,$thisembstyle,$thisdistarget));	$r->print(
	'<hr>'.&phasetwo($thisfn,$thistarget,$thisembstyle,$thisdistarget));
}	}

}	}

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

Removed from v.1.24
changed lines
	Added in v.1.59