loncom/publisher/loncfile.pm - diff

Return to loncfile.pm CVS log

Up to [LON-CAPA] / loncom / publisher

Diff for /loncom/publisher/loncfile.pm between versions 1.29 and 1.35

version 1.29, 2003/03/10 18:34:14	version 1.35, 2003/08/01 20:32:05
Line 92 use Apache::Constants qw(:common :http :	Line 92 use Apache::Constants qw(:common :http :
use Apache::loncacc;	use Apache::loncacc;
use Apache::Log ();	use Apache::Log ();
use Apache::lonnet;	use Apache::lonnet;
	use Apache::loncommon();

my $DEBUG=0;	my $DEBUG=0;
my $r; # Needs to be global for some stuff RF.	my $r; # Needs to be global for some stuff RF.
Line 172 Global References	Line 173 Global References
sub URLToPath {	sub URLToPath {
my $Url = shift;	my $Url = shift;
&Debug($r, "UrlToPath got: $Url");	&Debug($r, "UrlToPath got: $Url");
$Url=~ s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/;
$Url=~ s/^http\:\/\/[^\/]+//;	$Url=~ s/^http\:\/\/[^\/]+//;
	$Url=~ s/^\///;
	$Url=~ s/(\~\|priv\/)(\w+)\//\/home\/$2\/public_html\//;
&Debug($r, "Returning $Url \n");	&Debug($r, "Returning $Url \n");
return $Url;	return $Url;
}	}
Line 387 sub checksuffix {	Line 389 sub checksuffix {
}	}
return $result;	return $result;
}	}

	sub cleanDest {
	my ($request,$dest)=@_;
	#remove bad characters
	if ($dest=~/[\#\?&]/) {
	$request->print("<p><font color=\"red\">Invalid characters in requested name have been removed.</font></p>");
	$dest=~s/[\#\?&]//g;
	}
	return $dest;
	}

=pod	=pod

=item CloseForm1($request, $user, $file)	=item CloseForm1($request, $user, $file)
Line 412 sub CloseForm1 {	Line 425 sub CloseForm1 {
&Debug($request, "Cancel url is: ".$cancelurl);	&Debug($request, "Cancel url is: ".$cancelurl);
$request->print('<p><input type="submit" value="Continue" /></p></form>');	$request->print('<p><input type="submit" value="Continue" /></p></form>');
$request->print('<form action="'.$cancelurl.	$request->print('<form action="'.$cancelurl.
'" method="GET"><p><input type="submit" value="Cancel" /></p></form>');	'" method="POST"><p><input type="submit" value="Cancel" /></p></form>');

}	}

Line 792 sub NewFile1 {	Line 805 sub NewFile1 {
&Debug($request, "Dest url is: ".$dest);	&Debug($request, "Dest url is: ".$dest);
$request->print('</form>');	$request->print('</form>');
$request->print('<form action="'.$dest.	$request->print('<form action="'.$dest.
'" method="GET"><p><input type="submit" value="Continue" /></p></form>');	'" method="POST"><p><input type="submit" value="Continue" /></p></form>');
$request->print('<form action="'.$cancelurl.	$request->print('<form action="'.$cancelurl.
'" method="GET"><p><input type="submit" value="Cancel" /></p></form>');	'" method="POST"><p><input type="submit" value="Cancel" /></p></form>');
}	}
}	}

Line 836 sub phaseone {	Line 849 sub phaseone {

# my $conspace=ConstructionPathFromRelative($uname, $fn);	# my $conspace=ConstructionPathFromRelative($uname, $fn);

	$ENV{'form.newfilename'}=&cleanDest($r,$ENV{'form.newfilename'});

$r->print('<form action="/adm/cfile" method="post">'.	$r->print('<form action="/adm/cfile" method="post">'.
'<input type="hidden" name="filename" value="/~'.$uname.$fn.'" />'.	'<input type="hidden" name="filename" value="/~'.$uname.$fn.'" />'.
'<input type="hidden" name="phase" value="two" />'.	'<input type="hidden" name="phase" value="two" />'.
Line 865 sub phaseone {	Line 879 sub phaseone {
$ENV{'form.action'} eq 'newhtmlfile' \|\|	$ENV{'form.action'} eq 'newhtmlfile' \|\|
$ENV{'form.action'} eq 'newproblemfile' \|\|	$ENV{'form.action'} eq 'newproblemfile' \|\|
$ENV{'form.action'} eq 'newpagefile' \|\|	$ENV{'form.action'} eq 'newpagefile' \|\|
$ENV{'form.action'} eq 'newsequencefile') {	$ENV{'form.action'} eq 'newsequencefile' \|\|
	$ENV{'form.action'} eq 'newrightsfile' \|\|
	$ENV{'form.action'} eq 'newstyfile' \|\|
	$ENV{'form.action'} eq 'Select Action') {
if($ENV{'form.newfilename'}) {	if($ENV{'form.newfilename'}) {
my $newfilename = $ENV{'form.newfilename'};	my $newfilename = $ENV{'form.newfilename'};
if (!defined($dir)) {	if (!defined($dir)) {
Line 1225 sub handler {	Line 1242 sub handler {

if ($ENV{'form.filename'}) {	if ($ENV{'form.filename'}) {
$fn=&Apache::lonnet::unescape($ENV{'form.filename'});	$fn=&Apache::lonnet::unescape($ENV{'form.filename'});
&Debug($r, "loncfile::handler - raw url: $fn");	$fn=&URLToPath($fn);
# $fn=~s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/;
# $fn=~s/^http\:\/\/[^\/]+//;
$fn=URLToPath($fn);
&Debug($r, "loncfile::handler - doctored url: $fn");

} else {	} else {
&Debug($r, "loncfile::handler - no form.filename");	&Debug($r, "loncfile::handler - no form.filename");
$r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.	$r->log_reason($ENV{'user.name'}.' at '.$ENV{'user.domain'}.
Line 1269 sub handler {	Line 1281 sub handler {

$r->print('<html><head><title>LON-CAPA Construction Space</title></head>');	$r->print('<html><head><title>LON-CAPA Construction Space</title></head>');

$r->print(	$r->print(&Apache::loncommon::bodytag('File Operation'));
'<body bgcolor="#FFFFFF"><img align="right" src="/adm/lonIcons/lonlogos.gif" />');


$r->print('<h1>Construction Space <tt>'.$fn.'</tt></h1>');	$r->print('<h1>Construction Space <tt>'.$fn.'</tt></h1>');
Line 1295 sub handler {	Line 1306 sub handler {
$ENV{'form.action'} eq 'newhtmlfile' \|\|	$ENV{'form.action'} eq 'newhtmlfile' \|\|
$ENV{'form.action'} eq 'newproblemfile' \|\|	$ENV{'form.action'} eq 'newproblemfile' \|\|
$ENV{'form.action'} eq 'newpagefile' \|\|	$ENV{'form.action'} eq 'newpagefile' \|\|
$ENV{'form.action'} eq 'newsequencefile' ) {	$ENV{'form.action'} eq 'newsequencefile' \|\|
	$ENV{'form.action'} eq 'newrightsfile' \|\|
	$ENV{'form.action'} eq 'newstyfile' \|\|
	$ENV{'form.action'} eq 'Select Action' ) {
$r->print('<h3>New Resource</h3>');	$r->print('<h3>New Resource</h3>');
} else {	} else {
$r->print('<p>Unknown Action</p></body></html>');	$r->print('<p>Unknown Action '.$ENV{'form.action'}.' </p></body></html>');
return OK;	return OK;
}	}
if ($ENV{'form.phase'} eq 'two') {	if ($ENV{'form.phase'} eq 'two') {

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

Removed from v.1.29
changed lines
	Added in v.1.35