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.17 and 1.29

version 1.17, 2002/09/02 20:06:57	version 1.29, 2003/03/10 18:34:14
Line 7	Line 7
# presents a page that describes the proposed action to the user	# presents a page that describes the proposed action to the user
# and requests confirmation. The second phase commits the action	# and requests confirmation. The second phase commits the action
# and displays a page showing the results of the action.	# and displays a page showing the results of the action.
#	#

#	#
# $Id$	# $Id$
#	#
Line 88 use strict;	Line 87 use strict;
use Apache::File;	use Apache::File;
use File::Basename;	use File::Basename;
use File::Copy;	use File::Copy;
	use HTML::Entities();
use Apache::Constants qw(:common :http :methods);	use Apache::Constants qw(:common :http :methods);
use Apache::loncacc;	use Apache::loncacc;
use Apache::Log ();	use Apache::Log ();
Line 127 sub Debug {	Line 127 sub Debug {
my $log = $r->log;	my $log = $r->log;
my $message = shift;	my $message = shift;

# Put out the indicated message butonly if DEBUG is false.	# Put out the indicated message butonly if DEBUG is true.

if ($DEBUG) {	if ($DEBUG) {
$log->debug($message);	$log->debug($message);
Line 322 sub exists {	Line 322 sub exists {
my ($user, $domain, $dir, $file) = @_;	my ($user, $domain, $dir, $file) = @_;

# Create complete paths in publication and construction space.	# Create complete paths in publication and construction space.
	my $relativedir=$dir;
my $published = &PublicationPath($domain, $user, $dir, $file);	$relativedir=s\|/home/\Q$user\E/public_html\|\|;
my $construct = &ConstructionPath($user, $dir, $file);	my $published = &PublicationPath($domain, $user, $relativedir, $file);
	my $construct = &ConstructionPath($user, $relativedir, $file);

# If the resource exists in either space indicate this fact.	# If the resource exists in either space indicate this fact.
# Note that the check for existence in resource space is stricter.	# Note that the check for existence in resource space is stricter.

my $result;	my $result;
	if ( -d $construct ) {
	return 'Error: destination for operation is a directory.';
	}
if ( -e $published) {	if ( -e $published) {
$result.='<p><font color=red>Warning: target file exists, and has been published!</font></p>';	$result.='<p><font color="red">Warning: target file exists, and has been published!</font></p>';
}	}
elsif ( -e $construct) {	elsif ( -e $construct) {
$result.='<p><font color=red>Warning: target file exists!</font></p>';	$result.='<p><font color="red">Warning: target file exists!</font></p>';
}	}

return $result;	return $result;

Line 379 sub checksuffix {	Line 383 sub checksuffix {
if ($old=~m:(.*)/+([^/]+)\.(\w+)$:) { $oldsuffix=$3; }	if ($old=~m:(.*)/+([^/]+)\.(\w+)$:) { $oldsuffix=$3; }
if ($oldsuffix ne $newsuffix) {	if ($oldsuffix ne $newsuffix) {
$result.=	$result.=
'<p><font color=red>Warning: change of MIME type!</font></p>';	'<p><font color="red">Warning: change of MIME type!</font></p>';
}	}
return $result;	return $result;
}	}
Line 406 sub CloseForm1 {	Line 410 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="GET"><p><input type="submit" value="Cancel" /></p></form>');

}	}

Line 440 Parameters:	Line 444 Parameters:
sub CloseForm2 {	sub CloseForm2 {
my ($request, $user, $directory) = @_;	my ($request, $user, $directory) = @_;

$request->print('<h3><a=href="/priv/'.$user.$directory.'/">Done </a> </h3>');	$request->print('<h3><a href="/priv/'.$user.$directory.'/">Done </a> </h3>');
}	}

=pod	=pod
Line 490 sub Rename1 {	Line 494 sub Rename1 {
if(-e $conspace) {	if(-e $conspace) {
if($ENV{'form.newfilename'}) {	if($ENV{'form.newfilename'}) {
my $newfilename = $ENV{'form.newfilename'};	my $newfilename = $ENV{'form.newfilename'};
	if ($newfilename =~ m\|/[^\.]+$\|) {
	#no extension add on orignal extension
	if ($filename =~ m\|/[^\.]*\.([^\.]+)$\|) {
	$newfilename.='.'.$1;
	}
	}
$request->print(&checksuffix($filename, $newfilename));	$request->print(&checksuffix($filename, $newfilename));
$request->print(&exists($user, $domain, $dir, $newfilename));	#renaming a dir, delete the trailing /
$request->print('<input type=hidden name=newfilename value="'.	#remove last element for current dir
	if ($filename =~ m\|/$\|) {
	$filename =~ s\|/$\|\|;
	$dir =~ s\|/[^/]*$\|\|;
	}
	my $return=&exists($user, $domain, $dir, $newfilename);
	$request->print($return);
	if ($return =~/^Error:/) {
	$request->print('<br /><a href="'.$cancelurl.'">Cancel</a>');
	return;
	}
	my $dest=&SimplifyDir($dir,$newfilename);
	$request->print('<input type="hidden" name="newfilename" value="'.
$newfilename.	$newfilename.
'"><p>Rename <tt>'.$filename.'</tt> to <tt>'.	'" /><p>Rename <tt>'.$filename.
$dir.'/'.$newfilename.'</tt>?</p>');	'</tt><br /> to <tt>'.
	$dest.'</tt>?</p>');
&CloseForm1($request, $cancelurl);	&CloseForm1($request, $cancelurl);
} else {	} else {
$request->print('<p>No new filename specified</p></form>');	$request->print('<p>No new filename specified</p></form>');
Line 540 sub Delete1 {	Line 563 sub Delete1 {


if( -e $filename) {	if( -e $filename) {
$request->print('<input type=hidden name=newfilename value="'.	$request->print('<input type="hidden" name="newfilename" value="'.
$filename.'">');	$filename.'"/>');
$request->print('<p> Delete <tt>'.$filename.'</tt>?</p>');	$request->print('<p> Delete <tt>'.$filename.'</tt>?</p>');
&CloseForm1($request, $cancelurl);	&CloseForm1($request, $cancelurl);
} else {	} else {
Line 586 sub Copy1 {	Line 609 sub Copy1 {
$cancelurl =~ s/\/public_html//;	$cancelurl =~ s/\/public_html//;



if(-e $filename) {	if(-e $filename) {
$request->print(&checksuffix($filename,$newfilename));	$request->print(&checksuffix($filename,$newfilename));
$request->print(&exists($user, $domain, $dir, $newfilename));	my $return=&exists($user, $domain, $dir, $newfilename);
$request->print('<input type = hidden name = newfilename value = "'.	$request->print($return);
	if ($return =~/^Error:/) {
	$request->print('<br /><a href="'.$cancelurl.'">Cancel</a>');
	return;
	}
	my $dest=&SimplifyDir($dir,$newfilename);
	$request->print('<input type = "hidden" name = "newfilename" value = "'.
$dir.'/'.$newfilename.	$dir.'/'.$newfilename.
'"><p>Copy <tt>'.$filename.'</tt> to'.	'" /><p>Copy <tt>'.$filename.'</tt><br /> to '.
'<tt>'.$dir.'/'.$newfilename.'</tt>/?</p>');	'<tt>'.$dest.'</tt>?</p>');
&CloseForm1($request, $cancelurl);	&CloseForm1($request, $cancelurl);
} else {	} else {
$request->print('<p>No such file <tt>'.$filename.'</p></form>');	$request->print('<p>No such file <tt>'.$filename.'</p></form>');
Line 602 sub Copy1 {	Line 630 sub Copy1 {

=pod	=pod

	=item SimplifyDir

	Removes all extra / and all .. references

	Parameters:

	=over 4

	=item $dir - string [in] a directory name

	=item $file - string [in] a file reference relative to $dir

	=back

	Results: the concatenated path.

	=cut

	sub SimplifyDir {
	my ($dir,$file) = @_;
	my $location = $dir. '/'.$file;
	$location=~s://+:/:g; # remove duplicate /
	while ($location=~m:/\.\./:) {$location=~s:/[^/]+/\.\./:/:g;}#remove dir/..
	return $location;
	}

	=pod

=item NewDir1	=item NewDir1

Does all phase 1 processing of directory creation:	Does all phase 1 processing of directory creation:
Line 652 sub NewDir1	Line 708 sub NewDir1
$request->print('<p>Directory exists.</p></form>');	$request->print('<p>Directory exists.</p></form>');
}	}
else {	else {
$request->print('<input type=hidden name=newfilename value="'.	$request->print('<input type="hidden" name="newfilename" value="'.
$newdir.'"><p>Make new directory <tt>'.	$newdir.'" /><p>Make new directory <tt>'.
$path."/".$newdir.'</tt>?</p>');	$path."/".$newdir.'</tt>?</p>');
&CloseForm1($request, $cancelurl);	&CloseForm1($request, $cancelurl);

Line 662 sub NewDir1	Line 718 sub NewDir1

=pod	=pod

	=item NewFile1

	Does all phase 1 processing of file creation:
	Ensures that the user provides a new filename, adds proper extension
	if needed and that the file does not already exist, if it is a html,
	problem, page, or sequence, it then creates a form link to hand the
	actual creation off to the proper handler.

	Parameters:

	=over 4

	=item $request - Apache Request Object [in] - Server request object for the
	current url.

	=item $username - Name of the user that is requesting the directory creation.

	=item $domain - Name of the domain of the user

	=item $dir - current absolute diretory

	=item $newfilename
	- Name of the file to be created; no path information
	=back

	Side Effects:

	=over 4

	=item 2 new forms are displayed. Clicking on the confirmation button
	causes the browser to attempt to load the specfied URL, allowing the
	proper handler to take care of file creation. There is also a Cancle
	button which returns you to the driectory listing you came from

	=back

	=cut


	sub NewFile1 {
	my ($request, $user, $domain, $dir, $newfilename) = @_;

	&Debug($request, "Dir is : ".$dir);
	&Debug($request, "Newfile is : ".$newfilename);

	my $cancelurl = "/priv/".$dir;
	$cancelurl =~ s/\/home\///;
	$cancelurl =~ s/\/public_html//;

	if ($ENV{'form.action'} =~ /new(.+)file/) {
	my $extension=$1;
	if ($newfilename !~ /\Q.$extension\E$/) {
	if ($newfilename =~ m\|^[^\.]*\.([^\.]+)$\|) {
	#already has an extension strip it and add in expected one
	$newfilename =~ s\|.([^\.]+)$\|\|;
	}
	$newfilename.=".$extension";
	}
	}

	my $fullpath = $dir.'/'.$newfilename;

	&Debug($request, "Full path is : ".$fullpath);

	if(-e $fullpath) {
	$request->print('<p>File exists.</p></form>');
	}
	else {
	$request->print('<p>Make new file <tt>'.$dir.'/'.$newfilename.'</tt>?</p>');
	my $dest=&MakeFinalUrl($request,$fullpath);
	&Debug($request, "Cancel url is: ".$cancelurl);
	&Debug($request, "Dest url is: ".$dest);
	$request->print('</form>');
	$request->print('<form action="'.$dest.
	'" method="GET"><p><input type="submit" value="Continue" /></p></form>');
	$request->print('<form action="'.$cancelurl.
	'" method="GET"><p><input type="submit" value="Cancel" /></p></form>');
	}
	}

	=pod

=item phaseone($r, $fn, $uname, $udom)	=item phaseone($r, $fn, $uname, $udom)

Peforms phase one processing of the request. In phase one, error messages	Peforms phase one processing of the request. In phase one, error messages
Line 699 sub phaseone {	Line 837 sub phaseone {
# my $conspace=ConstructionPathFromRelative($uname, $fn);	# my $conspace=ConstructionPathFromRelative($uname, $fn);


$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" />'.
'<input type=hidden name=action value='.$ENV{'form.action'}.'>');	'<input type="hidden" name="action" value="'.$ENV{'form.action'}.'" />');

if ($ENV{'form.action'} eq 'rename') {	if ($ENV{'form.action'} eq 'rename') {
	if (!defined($dir)) {
&Rename1($r, $fn, $uname, $udom, $dir);	$fn=~m:(.*)/:;
	$dir=$1;
	}
	&Rename1($r, $fn, $uname, $udom, $dir);
} elsif ($ENV{'form.action'} eq 'delete') {	} elsif ($ENV{'form.action'} eq 'delete') {

&Delete1($r, $uname, $fn);	&Delete1($r, $uname, $fn);
Line 721 sub phaseone {	Line 861 sub phaseone {
}	}
} elsif ($ENV{'form.action'} eq 'newdir') {	} elsif ($ENV{'form.action'} eq 'newdir') {
&NewDir1($r, $uname, $dir, $ENV{'form.newfilename'});	&NewDir1($r, $uname, $dir, $ENV{'form.newfilename'});
	} elsif ($ENV{'form.action'} eq 'newfile' \|\|
	$ENV{'form.action'} eq 'newhtmlfile' \|\|
	$ENV{'form.action'} eq 'newproblemfile' \|\|
	$ENV{'form.action'} eq 'newpagefile' \|\|
	$ENV{'form.action'} eq 'newsequencefile') {
	if($ENV{'form.newfilename'}) {
	my $newfilename = $ENV{'form.newfilename'};
	if (!defined($dir)) {
	$fn=~m:(.*)/:;
	$dir=$1;
	}
	&NewFile1($r, $uname, $udom, $dir, $newfilename);
	} else {
	$r->print('<p>No new filename specified.</p></form>');
	}
}	}

}	}

=pod	=pod
Line 769 sub Rename2 {	Line 923 sub Rename2 {
$newfile);	$newfile);

if(-e $oldfile) {	if(-e $oldfile) {
unless(rename($oldfile,	my $dest;
$directory.'/'.$newfile)) {
$request->print('<font color=red>Error: '.$!.'</font>');	if ($oldfile =~ m\|/$\|) {
	#renaming a dir
	$oldfile =~ s\|/$\|\|;
	$dest=$directory;
	$dest=~s\|(/)([^/]*)$\|$1\|;
	$dest.='/'.$newfile;
	} else {
	$dest=$directory.'/'.$newfile;
	}

	unless(rename($oldfile,$dest)) {
	$request->print('<font color="red">Error: '.$!.'</font>');
return 0;	return 0;
} else {}	} else {}
} else {	} else {
Line 815 sub Delete2 {	Line 980 sub Delete2 {

if(-e $filename) {	if(-e $filename) {
unless(unlink($filename)) {	unless(unlink($filename)) {
$request->print('<font color=red>Error: '.$!.'</font>');	$request->print('<font color="red">Error: '.$!.'</font>');
return 0;	return 0;
}	}
} else {	} else {
$request->print('<p> No such file. </form');	$request->print('<p> No such file. </p></form');
return 0;	return 0;
}	}
return 1;	return 1;
Line 858 sub Copy2 {	Line 1023 sub Copy2 {
&Debug($request ,"Will try to copy $oldfile to $newfile");	&Debug($request ,"Will try to copy $oldfile to $newfile");
if(-e $oldfile) {	if(-e $oldfile) {
unless (copy($oldfile, $newfile)) {	unless (copy($oldfile, $newfile)) {
$request->print('<font color=red> copy Error: '.$!.'</font>');	$request->print('<font color="red"> copy Error: '.$!.'</font>');
return 0;	return 0;
} else {	} else {
unless (chmod(0660, $newfile)) {	unless (chmod(0660, $newfile)) {
$request->print('<font color=red> chmod error: '.$!.'</font>');	$request->print('<font color="red"> chmod error: '.$!.'</font>');
return 0;	return 0;
}	}
return 1;	return 1;
Line 899 sub NewDir2 {	Line 1064 sub NewDir2 {
my ($request, $user, $newdirectory) = @_;	my ($request, $user, $newdirectory) = @_;

unless(mkdir($newdirectory, 02770)) {	unless(mkdir($newdirectory, 02770)) {
$request->print('<font color=red>Error: '.$!.'</font>');	$request->print('<font color="red">Error: '.$!.'</font>');
return 0;	return 0;
}	}
unless(chmod(02770, ($newdirectory))) {	unless(chmod(02770, ($newdirectory))) {
$request->print('<font color=red> Error: '.$!.'</font>');	$request->print('<font color="red"> Error: '.$!.'</font>');
return 0;	return 0;
}	}
return 1;	return 1;
Line 948 sub phasetwo {	Line 1113 sub phasetwo {

# Break down the file into it's component pieces.	# Break down the file into it's component pieces.

$fn=~/(.*)\/([^\/]+)\.(\w+)$/;	my $dir; # Directory path
my $dir=$1; # Directory path	my $main; # Filename.
my $main=$2; # Filename.	my $suffix; # Extension.
my $suffix=$3; # Extension.
	if ($fn=~m:(.*)/([^/]+)\.(\w+)$:) {
	$dir=$1; # Directory path
	$main=$2; # Filename.
	$suffix=$3; # Extension.
	}

my $dest; # On success this is where we'll go.	my $dest; # On success this is where we'll go.

&Debug($r,	&Debug($r,
Line 972 sub phasetwo {	Line 1142 sub phasetwo {

if ($ENV{'form.action'} eq 'rename') { # Rename.	if ($ENV{'form.action'} eq 'rename') { # Rename.
if($ENV{'form.newfilename'}) {	if($ENV{'form.newfilename'}) {
	if (!defined($dir)) {
	$fn=~m:^(.*)/:;
	$dir=$1;
	}
if(!&Rename2($r, $uname, $dir, $fn, $ENV{'form.newfilename'})) {	if(!&Rename2($r, $uname, $dir, $fn, $ENV{'form.newfilename'})) {
return;	return;
}	}
# Prepend the directory to the new name to form the basis of the	# Prepend the directory to the new name to form the basis of the
# url of the new resource.	# url of the new resource.
#	#
	#renaming a dir
	#remove last element for current dir
	if ($fn =~ m\|/$\|) { $dir =~ s\|/[^/]*$\|\|; }
$dest = $dir."/".$ENV{'form.newfilename'};	$dest = $dir."/".$ENV{'form.newfilename'};
}	}
} elsif ($ENV{'form.action'} eq 'delete') {	} elsif ($ENV{'form.action'} eq 'delete') {
Line 987 sub phasetwo {	Line 1164 sub phasetwo {
# Once a resource is deleted, we just list the directory that	# Once a resource is deleted, we just list the directory that
# previously held it.	# previously held it.
#	#
$dest = $dir."/"; # Parent dir.	$dest = $dir."/."; # Parent dir.
} elsif ($ENV{'form.action'} eq 'copy') {	} elsif ($ENV{'form.action'} eq 'copy') {
if($ENV{'form.newfilename'}) {	if($ENV{'form.newfilename'}) {
if(!&Copy2($r, $uname, $dir, $fn, $ENV{'form.newfilename'})) {	if(!&Copy2($r, $uname, $dir, $fn, $ENV{'form.newfilename'})) {
Line 996 sub phasetwo {	Line 1173 sub phasetwo {
$dest = $ENV{'form.newfilename'};	$dest = $ENV{'form.newfilename'};

} else {	} else {
$r->print('<p>No New filename specified</form>');	$r->print('<p>No New filename specified</p></form>');
return;	return;
}	}

Line 1015 sub phasetwo {	Line 1192 sub phasetwo {
# Substitute for priv for the first home in $dir to get our	# Substitute for priv for the first home in $dir to get our
# construction space path.	# construction space path.
#	#
	$dest=&MakeFinalUrl($r,$dest);

	$r->print('<h3><a href="'.$dest.'">Done</a></h3>');
	}

	sub MakeFinalUrl {
	my($r,$dest)=@_;
&Debug($r, "Final url is: $dest");	&Debug($r, "Final url is: $dest");
$dest =~ s/\/home\//\/priv\//;	$dest =~ s\|/home/\|/priv/\|;
$dest =~ s/\/public_html//;	$dest =~ s\|/public_html\|\|;

my $base = &Apache::lonnet::escape(&File::Basename::basename($dest));
my $dpath= &File::Basename::dirname($dest);
$dest = $dpath.'/'.$base;

	my $base = &File::Basename::basename($dest);
	my $dpath= &File::Basename::dirname($dest);
	if ($base eq '.') { $base=''; }
	$dest = &HTML::Entities::encode($dpath.'/'.$base);

&Debug($r, "Final url after rewrite: $dest");	&Debug($r, "Final url after rewrite: $dest");
	return $dest;
$r->print('<h3><a href="'.$dest.'">Done</a></h3>');
}	}

sub handler {	sub handler {
Line 1041 sub handler {	Line 1224 sub handler {
my $fn;	my $fn;

if ($ENV{'form.filename'}) {	if ($ENV{'form.filename'}) {
$fn=$ENV{'form.filename'};	$fn=&Apache::lonnet::unescape($ENV{'form.filename'});
&Debug($r, "loncfile::handler - raw url: $fn");	&Debug($r, "loncfile::handler - raw url: $fn");
# $fn=~s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/;	# $fn=~s/^http\:\/\/[^\/]+\/\~(\w+)/\/home\/$1\/public_html/;
# $fn=~s/^http\:\/\/[^\/]+//;	# $fn=~s/^http\:\/\/[^\/]+//;
Line 1087 sub handler {	Line 1270 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(
'<body bgcolor="#FFFFFF"><img align=right src=/adm/lonIcons/lonlogos.gif>');	'<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>');

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

Line 1108 sub handler {	Line 1291 sub handler {
$r->print('<h3>New Directory</h3>');	$r->print('<h3>New Directory</h3>');
} elsif ($ENV{'form.action'} eq 'copy') {	} elsif ($ENV{'form.action'} eq 'copy') {
$r->print('<h3>Copy</h3>');	$r->print('<h3>Copy</h3>');
	} elsif ($ENV{'form.action'} eq 'newfile' \|\|
	$ENV{'form.action'} eq 'newhtmlfile' \|\|
	$ENV{'form.action'} eq 'newproblemfile' \|\|
	$ENV{'form.action'} eq 'newpagefile' \|\|
	$ENV{'form.action'} eq 'newsequencefile' ) {
	$r->print('<h3>New Resource</h3>');
} else {	} else {
$r->print('<p>Unknown Action</body></html>');	$r->print('<p>Unknown 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.17
changed lines
	Added in v.1.29