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.116 and 1.127

version 1.116, 2012/10/29 17:38:55	version 1.127, 2023/07/14 23:20:15
Line 37	Line 37

=head1 NAME	=head1 NAME

Apache::loncfile - Construction space file management.	Apache::loncfile - Authoring space file management.

=head1 SYNOPSIS	=head1 SYNOPSIS

Content handler for buttons on the top frame of the construction space	Content handler for buttons on the top frame of the construction space
directory.	directory.

=head1 INTRODUCTION	=head1 INTRODUCTION

loncfile is invoked when buttons in the top frame of the construction	loncfile is invoked when buttons in the top frame of the construction
space directory listing are clicked. All operations proceed in two phases.	space directory listing are clicked. All operations proceed in two phases.
The first phase describes to the user exactly what will be done. If the user	The first phase describes to the user exactly what will be done. If the user
confirms the operation, the second phase commits the operation and indicates	confirms the operation, the second phase commits the operation and indicates
Line 88 my $r; # Needs to be global for some	Line 88 my $r; # Needs to be global for some
Parameters:	Parameters:

=over 4	=over 4

=item $request - The current request operation.	=item $request - The current request operation.

=item $message - The message to put in the log file.	=item $message - The message to put in the log file.

=back	=back

Returns:	Returns:
nothing.	nothing.

=cut	=cut

sub Debug {	sub Debug {
# Put out the indicated message butonly if DEBUG is true.	# Put out the indicated message but only if DEBUG is true.
if ($DEBUG) {	if ($DEBUG) {
my ($r,$message) = @_;	my ($r,$message) = @_;
$r->log_reason($message);	$r->log_reason($message);
Line 109 sub Debug {	Line 109 sub Debug {
}	}

sub done {	sub done {
my ($url)=@_;	my ($destfn) = @_;
my $done=&mt("Done");	return
return(<<ENDDONE);	'<p>'
<a href="$url">$done</a>	.&Apache::lonhtmlcommon::confirm_success(&mt("Done"))
<script type="text/javascript">	.'<br /><a href="'.&url($destfn).'">'.&mt("Continue").'</a>'
location.href="$url";	.'<script type="text/javascript">'
</script>	.'location.href="'.&url($destfn,'js').'";'
ENDDONE	.'</script>'
	.'</p>';
}	}

=pod	=pod
Line 124 ENDDONE	Line 125 ENDDONE
=item URLToPath($url)	=item URLToPath($url)

Convert a URL to a file system path.	Convert a URL to a file system path.

In order to manipulate the construction space objects, it is necessary	In order to manipulate the construction space objects, it is necessary
to access url identified objects a filespace objects. This function	to access url identified objects a filespace objects. This function
translates a construction space URL to a file system path.	translates a construction space URL to a file system path.
Line 133 ENDDONE	Line 134 ENDDONE
=over 4	=over 4

=item Url - string [in] The url to convert.	=item Url - string [in] The url to convert.

=back	=back

Returns:	Returns:

=over 4	=over 4

=item The corresponding file system path.	=item The corresponding file system path.

=back	=back

Line 166 sub URLToPath {	Line 167 sub URLToPath {
}	}

sub url {	sub url {
my $fn=shift;	my ($fn,$context) = @_;
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};	my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
$fn=~ s/^\Q$londocroot\E//;	$fn=~ s/^\Q$londocroot\E//;
$fn=~s{/\./}{/}g;	$fn=~s{/\./}{/}g;
$fn=&HTML::Entities::encode($fn,'<>"&');	if ($context eq 'js') {
	&js_escape(\$fn);
	} else {
	$fn=&HTML::Entities::encode($fn,'\'<>"&');
	}
return $fn;	return $fn;
}	}

Line 205 sub obsolete_unpub {	Line 210 sub obsolete_unpub {
# see if directory is empty	# see if directory is empty
# ignores any .meta, .save, .bak, and .log files created for a previously	# ignores any .meta, .save, .bak, and .log files created for a previously
# published file, which has since been marked obsolete and deleted.	# published file, which has since been marked obsolete and deleted.
# ignores a .DS_Store file put there when viewing directory via webDAV on MacOS.	# ignores a .DS_Store file put there when viewing directory via webDAV on MacOS.
sub empty_directory {	sub empty_directory {
my ($dirname,$phase) = @_;	my ($dirname,$phase) = @_;
if (opendir DIR, $dirname) {	if (opendir DIR, $dirname) {
my @files = grep(!/^\.\.?$/, readdir(DIR)); # ignore . and ..	my @files = grep(!/^\.\.?$/, readdir(DIR)); # ignore . and ..
if (@files) {	if (@files) {
my @orphans = grep(/\.(meta\|save\|log\|bak\|DS_Store)$/,@files);	my @orphans = grep(/\.(meta\|save\|log\|bak\|DS_Store)$/,@files);
if (scalar(@files) - scalar(@orphans) > 0) {	if (scalar(@files) - scalar(@orphans) > 0) {
return 0;	return 0;
} else {	} else {
if (($phase eq 'Delete2') && (@orphans > 0)) {	if (($phase eq 'Delete2') && (@orphans > 0)) {
Line 234 sub empty_directory {	Line 239 sub empty_directory {

=item exists($user, $domain, $file)	=item exists($user, $domain, $file)

Determine if a resource file name has been published or exists	Determine if a resource filename has been published or exists
in the construction space.	in the construction space.

Parameters:	Parameters:
Line 264 Returns:	Line 269 Returns:
=item string - Either where the resource exists as an html string that can	=item string - Either where the resource exists as an html string that can
be embedded in a dialog or an empty string if the resource	be embedded in a dialog or an empty string if the resource
does not exist.	does not exist.

=back	=back

=cut	=cut
Line 278 sub exists {	Line 283 sub exists {
$published=~s{^\Q$londocroot/priv/\E}{$londocroot/res/};	$published=~s{^\Q$londocroot/priv/\E}{$londocroot/res/};
my ($type,$result);	my ($type,$result);
if ( -d $construct ) {	if ( -d $construct ) {
return ('error','<p><span class="LC_error">'.&mt('Error: destination for operation is an existing directory.').'</span></p>');	return ('error','<p class="LC_error">'.&mt('Error: destination for operation is an existing directory.').'</p>');

}	}

if ( -e $published) {	if ( -e $published) {
if ( -e $construct ) {	if ( -e $construct ) {
$type = 'warning';	$type = 'warning';
$result.='<p><span class="LC_warning">'.&mt('Warning: target file exists, and has been published!').'</span></p>';	$result.='<p class="LC_warning">'.&mt('Warning: target file exists, and has been published!').'</p>';
} else {	} else {
my $published_type = (-d $published) ? 'directory' : 'file';	my $published_type = (-d $published) ? 'directory' : 'file';

if ($published_type eq $creating) {	if ($published_type eq $creating) {
$type = 'warning';	$type = 'warning';
$result.='<p><span class="LC_warning">'.&mt("Warning: a published $published_type of this name exists.").'</span></p>';	$result.='<p class="LC_warning">'.&mt("Warning: a published $published_type of this name exists.").'</p>';
} else {	} else {
$type = 'error';	$type = 'error';
$result.='<p><span class="LC_error">'.&mt("Error: a published $published_type of this name exists.").'</span></p>';	$result.='<p class="LC_error">'.&mt("Error: a published $published_type of this name exists.").'</p>';
}	}
}	}
} elsif ( -e $construct) {	} elsif ( -e $construct) {
$type = 'warning';	$type = 'warning';
$result.='<p><span class="LC_warning">'.&mt('Warning: target file exists!').'</span></p>';	$result.='<p class="LC_warning">'.&mt('Warning: target file exists!').'</p>';
}	}

return ($type,$result);	return ($type,$result);
Line 308 sub exists {	Line 313 sub exists {
=pod	=pod

=item checksuffix($old, $new)	=item checksuffix($old, $new)

Determine if a resource filename suffix (the stuff after the .) would change	Determine if a resource filename suffix (the stuff after the .) would change
as a result of this operation.	as a result of this operation.

Line 343 sub checksuffix {	Line 348 sub checksuffix {
if ($old=~m:(.*)/+([^/]+)\.(\w+)$:) { $oldsuffix=$3; }	if ($old=~m:(.*)/+([^/]+)\.(\w+)$:) { $oldsuffix=$3; }
if (lc($oldsuffix) ne lc($newsuffix)) {	if (lc($oldsuffix) ne lc($newsuffix)) {
$result.=	$result.=
'<p><span class="LC_warning">'.&mt('Warning: change of MIME type!').'</span></p>';	'<p class="LC_warning">'.&mt('Warning: change of MIME type!').'></p>';
}	}
return $result;	return $result;
}	}

sub cleanDest {	sub cleanDest {
my ($request,$dest,$subdir,$fn,$uname,$udom)=@_;	my ($dest,$subdir,$fn,$uname,$udom)=@_;
#remove bad characters	#remove bad characters
my $foundbad=0;	my $foundbad=0;
	my $warnings;
my $error='';	my $error='';
if ($subdir && $dest =~/\./) {	if ($subdir && $dest =~/\./) {
$foundbad=1;	$foundbad=1;
Line 366 sub cleanDest {	Line 372 sub cleanDest {
my ($newpath)=($dest=~m\|(.*)/\|);	my ($newpath)=($dest=~m\|(.*)/\|);
($newpath,$error)=&relativeDest($fn,$newpath,$uname,$udom);	($newpath,$error)=&relativeDest($fn,$newpath,$uname,$udom);
if (! -d "$newpath") {	if (! -d "$newpath") {
$request->print('<p><span class="LC_warning">'	$warnings = '<p class="LC_warning">'
.&mt("You have requested to create file in directory [_1] which doesn't exist. The requested directory path has been removed from the requested file name."	.&mt("You have requested to create file in directory [_1] which doesn't exist. The requested directory path has been removed from the requested filename."
,&display($newpath))	,&display($newpath))
.'</span></p>');	.'</p>';
$dest=~s\|.*/\|\|;	$dest=~s\|.*/\|\|;
}	}
}	}
if ($dest =~ /\.(\d+)\.(\w+)$/){	if ($dest =~ /\.(\d+)\.(\w+)$/) {
$request->print('<p><span class="LC_warning">'	$warnings .= '<p class="LC_warning">'
.&mt('Bad filename [_1]',&display($dest))	.&mt('Bad filename [_1]',&display($dest))
.'<br />'	.'<br />'
.&mt('[_1](name).(number).(extension)[_2] not allowed.','<tt>','</tt>')	.&mt('[_1](name).(number).(extension)[_2] not allowed.','<tt>','</tt>')
.'<br />'	.'<br />'
.&mt('Removing the [_1].number.[_2] from requested filename.','<tt>','</tt>')	.&mt('Removing the [_1].number.[_2] from requested filename.','<tt>','</tt>')
.'</span></p>');	.'</p>';
$dest =~ s/\.(\d+)(\.\w+)$/$2/;	$dest =~ s/\.(\d+)(\.\w+)$/$2/;
}	}
if ($foundbad) {	if ($foundbad) {
$request->print('<p><span class="LC_warning">'	$warnings .= '<p class="LC_warning">'
.&mt('Invalid characters in requested name have been removed.')	.&mt('Invalid characters in requested name have been removed.')
.'</span></p>'	.'</p>';
);
}	}
return ($dest,$error);	return ($dest,$error,$warnings);
}	}

sub relativeDest {	sub relativeDest {
Line 436 Parameters:	Line 441 Parameters:

sub CloseForm1 {	sub CloseForm1 {
my ($request, $fn) = @_;	my ($request, $fn) = @_;
$request->print('<p><input type="submit" value="'.&mt('Continue').'" /></p></form>');	$request->print('<input type="submit" value="'.&mt('Continue').'" /></form>');
$request->print('<form action="'.&url($fn).	$request->print(' <form action="'.&url($fn).'" method="post">'.
'" method="post"><p><input type="submit" value="'.&mt('Cancel').'" /></p></form>');	'<input type="submit" value="'.&mt('Cancel').'" /></form>');
}	}


Line 458 Parameters:	Line 463 Parameters:
=item $user - string [in] - Name of the user that is initiating the	=item $user - string [in] - Name of the user that is initiating the
request.	request.

=item $directory - string [in] - Directory in which the operation is	=item $directory - string [in] - Directory in which the operation is
being done relative to the top level construction space	being done relative to the top level construction space
directory.	directory.

Line 468 Parameters:	Line 473 Parameters:

sub CloseForm2 {	sub CloseForm2 {
my ($request, $user, $fn) = @_;	my ($request, $user, $fn) = @_;
$request->print(&done(&url($fn)));	$request->print(&done($fn));
}	}

=pod	=pod

=item Rename1($request, $filename, $user, $domain, $dir)	=item Rename1($request, $filename, $user, $domain, $dir)

Perform phase 1 processing of the file rename operation.	Perform phase 1 processing of the file rename operation.

Parameters:	Parameters:

=over 4	=over 4

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

=item $filename - The filename relative to construction space.	=item $filename - The filename relative to construction space.
Line 504 new filename relative to the current dir	Line 509 new filename relative to the current dir

=back	=back

=cut	=cut

sub Rename1 {	sub Rename1 {
my ($request, $user, $domain, $fn, $newfilename, $style) = @_;	my ($request, $user, $domain, $fn, $newfilename, $style) = @_;
Line 582 sub Rename1 {	Line 587 sub Rename1 {
);	);
return;	return;
}	}

}	}

=pod	=pod
Line 596 Parameters:	Line 601 Parameters:

=over 4	=over 4

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

=item $user - string [in] Name of the user initiating the request.	=item $user - string [in] Name of the user initiating the request.
Line 627 sub Delete1 {	Line 632 sub Delete1 {
);	);
return;	return;
}	}
} else {	} else {
unless (&obsolete_unpub($user,$domain,$fn)) {	unless (&obsolete_unpub($user,$domain,$fn)) {
$request->print('<p><span class="LC_error">'	$request->print('<p><span class="LC_error">'
.&mt('Cannot delete non-obsolete published file.')	.&mt('Cannot delete non-obsolete published file.')
Line 664 Parameters:	Line 669 Parameters:

=over 4	=over 4

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

=item $user - string [in] Name of the user initiating the request.	=item $user - string [in] Name of the user initiating the request.
Line 690 sub Copy1 {	Line 695 sub Copy1 {
if ($newfilename =~ m\|/[^\.]+$\|) {	if ($newfilename =~ m\|/[^\.]+$\|) {
#no extension add on original extension	#no extension add on original extension
if ($fn =~ m\|/[^\.]*\.([^\.]+)$\|) { $newfilename.='.'.$1; }	if ($fn =~ m\|/[^\.]*\.([^\.]+)$\|) { $newfilename.='.'.$1; }
}	}
$newfilename=~s://+:/:g; # remove duplicate /	$newfilename=~s://+:/:g; # remove duplicate /
while ($newfilename=~m:/\.\./:) {	while ($newfilename=~m:/\.\./:) {
$newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/..	$newfilename=~ s:/[^/]+/\.\./:/:g; #remove dir/..
Line 699 sub Copy1 {	Line 704 sub Copy1 {
my ($type,$return)=&exists($user, $domain, $newfilename);	my ($type,$return)=&exists($user, $domain, $newfilename);
$request->print($return);	$request->print($return);
if ($type eq 'error') {	if ($type eq 'error') {
$request->print('<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a>');	$request->print('<br /><a href="'.&url($fn).'">'.&mt('Cancel').'</a></form>');
return;	return;
}	}
	# Check if there is enough space.
	my @fileinfo = stat($fn);
	my ($dir,$fname) = ($fn =~ m{^(.+/)([^/]+)$});
	my $filesize = $fileinfo[7];
	$filesize = int($filesize/1000); #expressed in kb
	my $output = &Apache::loncommon::excess_filesize_warning($user,$domain,'author',
	$fname,$filesize,'copy');
	if ($output) {
	$request->print($output.'<br /><a href="'.&url($dir).'">'.&mt('Cancel').'</a></form>');
	return;
	}
$request->print(	$request->print(
'<input type="hidden" name="newfilename"'	'<input type="hidden" name="newfilename"'
.' value="'.$newfilename.'" />'	.' value="'.$newfilename.'" />'
Line 724 sub Copy1 {	Line 740 sub Copy1 {
=pod	=pod

=item NewDir1	=item NewDir1

Does all phase 1 processing of directory creation:	Does all phase 1 processing of directory creation:
Ensures that the user provides a new directory name,	Ensures that the user provides a new directory name,
and that the directory does not already exist.	and that the directory does not already exist.
Line 742 Parameters:	Line 758 Parameters:

=item $fn - source file.	=item $fn - source file.

=item $newdir - Name of the directory to be created; path relative to the	=item $newdir - Name of the directory to be created; path relative to the
top level of construction space.	top level of construction space.
=back	=back

Line 806 sub Decompress1 {	Line 822 sub Decompress1 {
=pod	=pod

=item NewFile1	=item NewFile1

Does all phase 1 processing of file creation:	Does all phase 1 processing of file creation:
Ensures that the user provides a new filename, adds proper extension	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,	if needed and that the file does not already exist, if it is a html,
Line 824 Parameters:	Line 840 Parameters:

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

=item $fn - Source file name	=item $fn - Source filename

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

	=item $warnings - Information about changes to filename made by cleanDest().

=back	=back

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

=back	=back

=cut	=cut

sub NewFile1 {	sub NewFile1 {
my ($request, $user, $domain, $fn, $newfilename) = @_;	my ($request, $user, $domain, $fn, $newfilename, $warnings) = @_;
return if (&filename_check($newfilename) ne 'ok');	return if (&filename_check($newfilename,$warnings) ne 'ok');

if ($env{'form.action'} =~ /new(.+)file/) {	if ($env{'form.action'} =~ /new(.+)file/) {
my $extension=$1;	my $extension=$1;
Line 858 sub NewFile1 {	Line 877 sub NewFile1 {
}	}
}	}
my ($type, $result)=&exists($user,$domain,$newfilename);	my ($type, $result)=&exists($user,$domain,$newfilename);
$request->print($result);
if ($type eq 'error') {	if ($type eq 'error') {
	$request->print($warnings.$result);
$request->print('</form>');	$request->print('</form>');
} else {	} else {
my $extension;	my $extension;
Line 871 sub NewFile1 {	Line 890 sub NewFile1 {
my @okexts = qw(xml html xhtml htm xhtm problem page sequence rights sty task library js css txt);	my @okexts = qw(xml html xhtml htm xhtm problem page sequence rights sty task library js css txt);
if (($extension eq '') \|\| (!grep(/^\Q$extension\E/,@okexts))) {	if (($extension eq '') \|\| (!grep(/^\Q$extension\E/,@okexts))) {
my $validexts = '.'.join(', .',@okexts);	my $validexts = '.'.join(', .',@okexts);
	$request->print($warnings.$result);
$request->print('<p class="LC_warning">'.	$request->print('<p class="LC_warning">'.
&mt('Invalid filename: ').&display($newfilename).'</p><p>'.	&mt('Invalid filename: ').&display($newfilename).'</p><p>'.
&mt('The name of the new file needs to end with an appropriate file extension to indicate the type of file to create.').'<br />'.	&mt('The name of the new file needs to end with an appropriate file extension to indicate the type of file to create.').'<br />'.
Line 879 sub NewFile1 {	Line 899 sub NewFile1 {
'<form name="fileaction" action="/adm/cfile" method="post">'.	'<form name="fileaction" action="/adm/cfile" method="post">'.
'<input type="hidden" name="qualifiedfilename" value="'.$fn.'" />'.	'<input type="hidden" name="qualifiedfilename" value="'.$fn.'" />'.
'<input type="hidden" name="action" value="newfile" />'.	'<input type="hidden" name="action" value="newfile" />'.
'<span class ="LC_nobreak">'.&mt('Enter a file name: ').'<input type="text" name="newfilename" value="Type Name Here" onfocus="if (this.value == '."'Type Name Here') this.value=''".'" /> <input type="submit" value="Go" />'.	'<span class ="LC_nobreak">'.&mt('Enter a filename: ').'<input type="text" name="newfilename" value="Type Name Here" onfocus="if (this.value == '."'Type Name Here') this.value=''".'" /> <input type="submit" value="Go" />'.
'</span></form></p>'.	'</span></form></p>'.
'<p><form action="'.&url($fn).	'<p><form action="'.&url($fn).
'" method="post"><p><input type="submit" value="'.&mt('Cancel').'" /></form></p>');	'" method="post"><p><input type="submit" value="'.&mt('Cancel').'" /></form></p>');
return;	} elsif (($type ne 'warning') && ($warnings eq '') && ($result eq '')) {
	my $query = "";
	$query .= "?mode=" . $env{'form.mode'} unless (!exists($env{'form.mode'}) \|\| !length($env{'form.mode'}));
	$request->print('
	<script type="text/javascript">
	window.location = "'.&url($newfilename,'js'). $query .'";
	</script>');
	} else {
	$request->print($warnings.$result);
	$request->print('<p>'.&mt('Make new file').' '.&display($newfilename).'?</p>');
	$request->print('</form>');
	$request->print('<form action="'.&url($newfilename).
	'" method="post"><p><input type="submit" value="'.&mt('Continue').'" /></p></form>');
	$request->print('<form action="'.&url($fn).
	'" method="post"><p><input type="submit" value="'.&mt('Cancel').'" /></p></form>');
}	}

$request->print('<p>'.&mt('Make new file').' '.&display($newfilename).'?</p>');
$request->print('</form>');

$request->print('<form action="'.&url($newfilename).
'" method="post"><p><input type="submit" value="'.&mt('Continue').'" /></p></form>');
$request->print('<form action="'.&url($fn).
'" method="post"><p><input type="submit" value="'.&mt('Cancel').'" /></p></form>');
}	}
return;	return;
}	}
Line 912 sub filename_check {	Line 938 sub filename_check {
' '.&mt('Not Allowed').'</span>');	' '.&mt('Not Allowed').'</span>');
return;	return;
}	}
return 'ok';	return 'ok';
}	}

=pod	=pod
Line 923 sub filename_check {	Line 949 sub filename_check {
are returned if the request cannot be performed (e.g. attempts to manipulate	are returned if the request cannot be performed (e.g. attempts to manipulate
files that are nonexistent). If the operation can be performed, what is	files that are nonexistent). If the operation can be performed, what is
about to be done will be presented to the user for confirmation. If the	about to be done will be presented to the user for confirmation. If the
user confirms the request, then phase two is executed, the action	user confirms the request, then phase two is executed, the action
performed and reported to the user.	performed and reported to the user.

Parameters:	Parameters:
Line 932 performed and reported to the user.	Line 958 performed and reported to the user.

=item $r - request object [in] - The Apache request being executed.	=item $r - request object [in] - The Apache request being executed.

=item $fn = string [in] - The filename being manipulated by the	=item $fn = string [in] - The filename being manipulated by the
request.	request.

=item $uname - string [in] Name of user logged in and doing this action.	=item $uname - string [in] Name of user logged in and doing this action.

=item $udom - string [in] Domain name under which the user logged in.	=item $udom - string [in] Domain name under which the user logged in.

=back	=back

Line 945 performed and reported to the user.	Line 971 performed and reported to the user.

sub phaseone {	sub phaseone {
my ($r,$fn,$uname,$udom)=@_;	my ($r,$fn,$uname,$udom)=@_;

my $doingdir=0;	my $doingdir=0;
if ($env{'form.action'} eq 'newdir') { $doingdir=1; }	if ($env{'form.action'} eq 'newdir') { $doingdir=1; }
my ($newfilename,$error) =	my ($newfilename,$error,$warnings) =
&cleanDest($r,$env{'form.newfilename'},$doingdir,$fn,$uname,$udom);	&cleanDest($env{'form.newfilename'},$doingdir,$fn,$uname,$udom);
unless ($error) {	unless ($error) {
($newfilename,$error)=&relativeDest($fn,$newfilename,$uname,$udom);	($newfilename,$error)=&relativeDest($fn,$newfilename,$uname,$udom);
}	}
Line 958 sub phaseone {	Line 984 sub phaseone {
if ($fn=~m{^(.*/)[^/]+$}) {	if ($fn=~m{^(.*/)[^/]+$}) {
$dirlist=$1;	$dirlist=$1;
} else {	} else {
$dirlist=$fn;	$dirlist=$fn;
	}
	if ($warnings) {
	$r->print($warnings);
}	}
$r->print('<div class="LC_error">'.$error.'</div>'.	$r->print('<div class="LC_error">'.$error.'</div>'.
'<h3><a href="'.&url($dirlist).'">'.&mt('Return to Directory').	'<p><a href="'.&url($dirlist).'">'.&mt('Return to Directory').
'</a></h3>');	'</a></p>');
return;	return;
}	}
$r->print('<form action="/adm/cfile" method="post">'.	$r->print('<form action="/adm/cfile" method="post">'.
'<input type="hidden" name="qualifiedfilename" value="'.$fn.'" />'.	'<input type="hidden" name="qualifiedfilename" value="'.$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 'newfile' \|\|
&Rename1($r, $uname, $udom, $fn, $newfilename, 'rename');	$env{'form.action'} eq 'newhtmlfile' \|\|
} elsif ($env{'form.action'} eq 'move') {	$env{'form.action'} eq 'newproblemfile' \|\|
&Rename1($r, $uname, $udom, $fn, $newfilename, 'move');	$env{'form.action'} eq 'newpagefile' \|\|
} elsif ($env{'form.action'} eq 'delete') {	$env{'form.action'} eq 'newsequencefile' \|\|
&Delete1($r, $uname, $udom, $fn);	$env{'form.action'} eq 'newrightsfile' \|\|
} elsif ($env{'form.action'} eq 'decompress') {	$env{'form.action'} eq 'newstyfile' \|\|
&Decompress1($r, $uname, $udom, $fn);	$env{'form.action'} eq 'newtaskfile' \|\|
} elsif ($env{'form.action'} eq 'copy') {	$env{'form.action'} eq 'newlibraryfile' \|\|
if($newfilename) {	$env{'form.action'} eq 'Select Action') {
&Copy1($r, $uname, $udom, $fn, $newfilename);
} else {
$r->print('<p class="LC_error">'
.&mt('No new filename specified.')
.'</p></form>'
);
}
} elsif ($env{'form.action'} eq 'newdir') {
my $mode = '';
if (exists($env{'form.callingmode'}) ) {
$mode = $env{'form.callingmode'};
}
&NewDir1($r, $uname, $udom, $fn, $newfilename, $mode);
} 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' \|\|
$env{'form.action'} eq 'newrightsfile' \|\|
$env{'form.action'} eq 'newstyfile' \|\|
$env{'form.action'} eq 'newtaskfile' \|\|
$env{'form.action'} eq 'newlibraryfile' \|\|
$env{'form.action'} eq 'Select Action') {
my $empty=&mt('Type Name Here');	my $empty=&mt('Type Name Here');
if (($newfilename!~/\/$/) && ($newfilename!~/$empty$/)) {	if (($newfilename!~/\/$/) && ($newfilename!~/$empty$/)) {
&NewFile1($r, $uname, $udom, $fn, $newfilename);	&NewFile1($r, $uname, $udom, $fn, $newfilename, $warnings);
} else {	} else {
	if ($warnings) {
	$r->print($warnings);
	}
$r->print('<p class="LC_error">'	$r->print('<p class="LC_error">'
.&mt('No new filename specified.')	.&mt('No new filename specified.')
.'</p></form>'	.'</p></form>'
);	);
}	}
	} else {
	if ($warnings) {
	$r->print($warnings);
	}
	if ($env{'form.action'} eq 'rename') {
	&Rename1($r, $uname, $udom, $fn, $newfilename, 'rename');
	} elsif ($env{'form.action'} eq 'move') {
	&Rename1($r, $uname, $udom, $fn, $newfilename, 'move');
	} elsif ($env{'form.action'} eq 'delete') {
	&Delete1($r, $uname, $udom, $fn);
	} elsif ($env{'form.action'} eq 'decompress') {
	&Decompress1($r, $uname, $udom, $fn);
	} elsif ($env{'form.action'} eq 'copy') {
	if ($newfilename) {
	&Copy1($r, $uname, $udom, $fn, $newfilename);
	} else {
	$r->print('<p class="LC_error">'
	.&mt('No new filename specified.')
	.'</p></form>'
	);
	}
	} elsif ($env{'form.action'} eq 'newdir') {
	my $mode = '';
	if (exists($env{'form.callingmode'}) ) {
	$mode = $env{'form.callingmode'};
	}
	&NewDir1($r, $uname, $udom, $fn, $newfilename, $mode);
	}
}	}
}	}

Line 1066 sub Rename2 {	Line 1103 sub Rename2 {
return 0;	return 0;
}	}
## If old name.(extension) exits, move under new name.	## If old name.(extension) exits, move under new name.
## If it doesn't exist and a new.(extension) exists	## If it doesn't exist and a new.(extension) exists
## delete it (only concern when renaming over files)	## delete it (only concern when renaming over files)
my $tmp1=$oRN.'.meta';	my $tmp1=$oRN.'.meta';
my $tmp2=$nRN.'.meta';	my $tmp2=$nRN.'.meta';
Line 1098 sub Rename2 {	Line 1135 sub Rename2 {
}	}
} else {	} else {
$request->print(	$request->print(
'<p>'	'<p class="LC_error">'
.&mt('No such file: [_1]',	.&mt('No such file: [_1]',
&display($oldfile))	&display($oldfile))
.'</p></form>'	.'</p></form>'
Line 1112 sub Rename2 {	Line 1149 sub Rename2 {

=item Delete2($request, $user, $filename)	=item Delete2($request, $user, $filename)

Performs phase two of a delete. The user has confirmed that they want	Performs phase two of a delete. The user has confirmed that they want
to delete the selected file. The file is deleted and the results of the	to delete the selected file. The file is deleted and the results of the
delete attempt are indicated.	delete attempt are indicated.

Line 1139 Returns:	Line 1176 Returns:

sub Delete2 {	sub Delete2 {
my ($request, $user, $filename) = @_;	my ($request, $user, $filename) = @_;
if (-d $filename) {	if (-d $filename) {
unless (&empty_directory($filename,'Delete2')) {	unless (&empty_directory($filename,'Delete2')) {
$request->print('<span class="LC_error">'.&mt('Error: Directory Non Empty').'</span>');	$request->print('<span class="LC_error">'.&mt('Error: Directory Non Empty').'</span>');
return 0;	return 0;
} else {	} else {
if(-e $filename) {	if(-e $filename) {
unless(rmdir($filename)) {	unless(rmdir($filename)) {
$request->print('<span class="LC_error">'.&mt('Error').': '.$!.'</span>');	$request->print('<span class="LC_error">'.&mt('Error').': '.$!.'</span>');
Line 1172 sub Delete2 {	Line 1209 sub Delete2 {

=item Copy2($request, $username, $dir, $oldfile, $newfile)	=item Copy2($request, $username, $dir, $oldfile, $newfile)

Performs phase 2 of a copy. The file is copied and the status	Performs phase 2 of a copy. The file is copied and the status
of that copy is reported back to the user.	of that copy is reported back to the user.

=over 4	=over 4
Line 1210 sub Copy2 {	Line 1247 sub Copy2 {
} elsif (!chmod(0660, $newfile)) {	} elsif (!chmod(0660, $newfile)) {
$request->print('<span class="LC_error">'.&mt('chmod error').': '.$!.'</span>');	$request->print('<span class="LC_error">'.&mt('chmod error').': '.$!.'</span>');
return 0;	return 0;
} elsif (-e $oldfile.'.meta' &&	} elsif (-e $oldfile.'.meta' &&
!copy($oldfile.'.meta', $newfile.'.meta') &&	!copy($oldfile.'.meta', $newfile.'.meta') &&
!chmod(0660, $newfile.'.meta')) {	!chmod(0660, $newfile.'.meta')) {
$request->print('<span class="LC_error">'.&mt('copy metadata error').	$request->print('<span class="LC_error">'.&mt('copy metadata error').
Line 1250 Returns 0 - failure 1 - success.	Line 1287 Returns 0 - failure 1 - success.

sub NewDir2 {	sub NewDir2 {
my ($request, $user, $newdirectory) = @_;	my ($request, $user, $newdirectory) = @_;

unless(mkdir($newdirectory, 02770)) {	unless(mkdir($newdirectory, 02770)) {
$request->print('<span class="LC_error">'.&mt('Error').': '.$!.'</span>');	$request->print('<span class="LC_error">'.&mt('Error').': '.$!.'</span>');
return 0;	return 0;
Line 1283 sub decompress2 {	Line 1320 sub decompress2 {
is performed and the result is shown.	is performed and the result is shown.

The strategy is to break out the processing into specific action processors	The strategy is to break out the processing into specific action processors
named action2 where action is the requested action and the 2 denotes	named action2 where action is the requested action and the 2 denotes
phase 2 processing.	phase 2 processing.

Parameters:	Parameters:
Line 1307 Parameters:	Line 1344 Parameters:

sub phasetwo {	sub phasetwo {
my ($r,$fn,$uname,$udom)=@_;	my ($r,$fn,$uname,$udom)=@_;

&Debug($r, "loncfile - Entering phase 2 for $fn");	&Debug($r, "loncfile - Entering phase 2 for $fn");

# Break down the file into its component pieces.	# Break down the file into its component pieces.

my $dir; # Directory path	my $dir; # Directory path
my $main; # Filename.	my $main; # Filename.
my $suffix; # Extension.	my $suffix; # Extension.
Line 1331 sub phasetwo {	Line 1368 sub phasetwo {
&Debug($r," newfilename = ".$env{'form.newfilename'});	&Debug($r," newfilename = ".$env{'form.newfilename'});

my $conspace=$fn;	my $conspace=$fn;

&Debug($r,"loncfile::phase2 Full construction space name: $conspace");	&Debug($r,"loncfile::phase2 Full construction space name: $conspace");

&Debug($r,"loncfie::phase2 action is $env{'form.action'}");	&Debug($r,"loncfie::phase2 action is $env{'form.action'}");

# Select the appropriate processing sub.	# Select the appropriate processing sub.
if ($env{'form.action'} eq 'decompress') {	if ($env{'form.action'} eq 'decompress') {
$main .= '.'.$suffix;	$main .= '.'.$suffix;
if(!&decompress2($r, $uname, $dir, $main)) {	if(!&decompress2($r, $uname, $dir, $main)) {
return ;	return ;
Line 1348 sub phasetwo {	Line 1385 sub phasetwo {
if($env{'form.newfilename'}) {	if($env{'form.newfilename'}) {
if (!defined($dir)) {	if (!defined($dir)) {
$fn=~m:^(.*)/:;	$fn=~m:^(.*)/:;
$dir=$1;	$dir=$1;
}	}
if(!&Rename2($r, $uname, $dir, $fn, $env{'form.newfilename'})) {	if(!&Rename2($r, $uname, $dir, $fn, $env{'form.newfilename'})) {
return;	return;
Line 1359 sub phasetwo {	Line 1396 sub phasetwo {
$disp_newname = $1;	$disp_newname = $1;
$disp_newname =~ s/\///;	$disp_newname =~ s/\///;
}	}
} elsif ($env{'form.action'} eq 'delete') {	} elsif ($env{'form.action'} eq 'delete') {
if(!&Delete2($r, $uname, $env{'form.newfilename'})) {	if(!&Delete2($r, $uname, $env{'form.newfilename'})) {
return ;	return ;
}	}
Line 1367 sub phasetwo {	Line 1404 sub phasetwo {
# 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'})) {
return ;	return ;
Line 1386 sub phasetwo {	Line 1423 sub phasetwo {
$dest = $newdir."/";	$dest = $newdir."/";
}	}
if ( ($env{'form.action'} eq 'newdir') && ($env{'form.phase'} eq 'two') && ( ($env{'form.callingmode'} eq 'testbank') \|\| ($env{'form.callingmode'} eq 'imsimport') ) ) {	if ( ($env{'form.action'} eq 'newdir') && ($env{'form.phase'} eq 'two') && ( ($env{'form.callingmode'} eq 'testbank') \|\| ($env{'form.callingmode'} eq 'imsimport') ) ) {
$r->print('<h3><a href="javascript:self.close()">'.&mt('Done').'</a></h3>');	$r->print(
	'<p>'
	.&Apache::lonhtmlcommon::confirm_success(&mt('Done'))
	.'<br /><a href="javascript:self.close()">'.&mt('Continue').'</a>'
	.'</p>'
	);
} else {	} else {
if ($env{'form.action'} eq 'rename') {	if ($env{'form.action'} eq 'rename') {
$r->print('<h3><a href="'.&url($dest).'">'.&mt('Return to Directory').'</a></h3>');	$r->print(
$r->print('<h3><a href="'.&url($dest_newname).'">'.$disp_newname.'</a></h3>');	'<p>'.&Apache::lonhtmlcommon::confirm_success(&mt('Done')).'</p>'
	.&Apache::lonhtmlcommon::actionbox(
	['<a href="'.&url($dest).'">'.&mt('Return to Directory').'</a>',
	'<a href="'.&url($dest_newname).'">'.$disp_newname.'</a>']));
} else {	} else {
$r->print(&done(&url($dest)));	$r->print(&done($dest));
}	}
}	}
}	}
Line 1401 sub handler {	Line 1446 sub handler {

$r=shift;	$r=shift;

&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['decompress','action','filename','newfilename']);	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['decompress','action','filename','newfilename','mode']);

&Debug($r, "loncfile.pm - handler entered");	&Debug($r, "loncfile.pm - handler entered");
&Debug($r, " filename: ".$env{'form.filename'});	&Debug($r, " filename: ".$env{'form.filename'});
Line 1417 sub handler {	Line 1462 sub handler {
&Debug($r, "test: $env{'form.filename'}");	&Debug($r, "test: $env{'form.filename'}");
$fn=&unescape($env{'form.filename'});	$fn=&unescape($env{'form.filename'});
$fn=&URLToPath($fn);	$fn=&URLToPath($fn);
} elsif($ENV{'QUERY_STRING'} && $env{'form.phase'} ne 'two') {	} elsif($ENV{'QUERY_STRING'} && $env{'form.phase'} ne 'two') {
#Just hijack the script only the first time around to inject the	#Just hijack the script only the first time around to inject the
#correct information for further processing	#correct information for further processing
$fn=&unescape($env{'form.decompress'});	$fn=&unescape($env{'form.decompress'});
Line 1428 sub handler {	Line 1473 sub handler {
} 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'}.
' unspecified filename for cfile', $r->filename);	' unspecified filename for cfile', $r->filename);
return HTTP_NOT_FOUND;	return HTTP_NOT_FOUND;
}	}

unless ($fn) {	unless ($fn) {
&Debug($r, "loncfile::handler - doctored url is empty");	&Debug($r, "loncfile::handler - doctored url is empty");
$r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.	$r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
' trying to cfile non-existing file', $r->filename);	' trying to cfile non-existing file', $r->filename);
return HTTP_NOT_FOUND;	return HTTP_NOT_FOUND;
}	}

# ----------------------------------------------------------- Start page output	# ----------------------------------------------------------- Start page output

my ($uname,$udom) = &Apache::lonnet::constructaccess($fn);	my ($uname,$udom) = &Apache::lonnet::constructaccess($fn);
&Debug($r,	&Debug($r,
"loncfile::handler constructaccess uname = $uname domain = $udom");	"loncfile::handler constructaccess uname = $uname domain = $udom");
if (($uname eq '') \|\| ($udom eq '')) {	if (($uname eq '') \|\| ($udom eq '')) {
$r->log_reason($uname.' at '.$udom.	$r->log_reason($uname.' at '.$udom.
' trying to manipulate file '.$env{'form.filename'}.	' trying to manipulate file '.$env{'form.filename'}.
' ('.$fn.') - not authorized',	' ('.$fn.') - not authorized',
$r->filename);	$r->filename);
return HTTP_NOT_ACCEPTABLE;	return HTTP_NOT_ACCEPTABLE;
}	}

Line 1475 function writeDone() {	Line 1520 function writeDone() {
my $londocroot = $r->dir_config('lonDocRoot');	my $londocroot = $r->dir_config('lonDocRoot');
my $trailfile = $fn;	my $trailfile = $fn;
$trailfile =~ s{^/(priv/)}{$londocroot/$1};	$trailfile =~ s{^/(priv/)}{$londocroot/$1};

# Breadcrumbs	# Breadcrumbs
	my $crsauthor;
	my $text = 'Authoring Space';
	my $title = 'Authoring Space File Operation',
	my $href = &Apache::loncommon::authorspace(&url($fn));
	if ($env{'request.course.id'}) {
	my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
	my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
	if ($href eq "/priv/$cdom/$cnum/") {
	$text = 'Course Authoring Space';
	$title = 'Course Authoring Space File Operation',
	$crsauthor = 1;
	}
	}
&Apache::lonhtmlcommon::clear_breadcrumbs();	&Apache::lonhtmlcommon::clear_breadcrumbs();
&Apache::lonhtmlcommon::add_breadcrumb({	&Apache::lonhtmlcommon::add_breadcrumb({
'text' => 'Construction Space',	'text' => $text,
'href' => &Apache::loncommon::authorspace($fn),	'href' => $href,
});	});
&Apache::lonhtmlcommon::add_breadcrumb({	&Apache::lonhtmlcommon::add_breadcrumb({
'text' => 'File Operation',	'text' => 'File Operation',
'title' => 'Construction Space File Operation',	'title' => $title,
'href' => '',	'href' => '',
});	});

$r->print(&Apache::loncommon::start_page('Construction Space File Operation',	$r->print(&Apache::loncommon::start_page($title,
$js,	$js,
{'add_entries' => \%loaditem,})	{'add_entries' => \%loaditem,})
.&Apache::lonhtmlcommon::breadcrumbs()	.&Apache::lonhtmlcommon::breadcrumbs()
.&Apache::loncommon::head_subbox(	.&Apache::loncommon::head_subbox(
&Apache::loncommon::CSTR_pageheader($trailfile))	&Apache::loncommon::CSTR_pageheader($trailfile))
);	);

$r->print('<h3>'.&mt('Location').': '.&display($fn).'</h3>');	$r->print('<p>'.&mt('Location').': '.&display($fn).'</p>');

if (($uname ne $env{'user.name'}) \|\| ($udom ne $env{'user.domain'})) {	if (($uname ne $env{'user.name'}) \|\| ($udom ne $env{'user.domain'})) {
$r->print('<p class="LC_info">'	unless ($crsauthor) {
.&mt('Co-Author [_1]',$uname.':'.$udom)	$r->print('<p class="LC_info">'
.'</p>'	.&mt('Co-Author [_1]',$uname.':'.$udom)
);	.'</p>'
	);
	}
}	}


&Debug($r, "loncfile::handler Form action is $env{'form.action'} ");	&Debug($r, "loncfile::handler Form action is $env{'form.action'} ");
if ($env{'form.action'} eq 'delete') {	my %action = &Apache::lonlocal::texthash(
$r->print('<h3>'.&mt('Delete').'</h3>');	'delete' => 'Delete',
} elsif ($env{'form.action'} eq 'rename') {	'rename' => 'Rename',
$r->print('<h3>'.&mt('Rename').'</h3>');	'move' => 'Move',
} elsif ($env{'form.action'} eq 'move') {	'newdir' => 'New Directory',
$r->print('<h3>'.&mt('Move').'</h3>');	'decompress' => 'Decompress',
} elsif ($env{'form.action'} eq 'newdir') {	'copy' => 'Copy',
$r->print('<h3>'.&mt('New Directory').'</h3>');	'newfile' => 'New Resource',
} elsif ($env{'form.action'} eq 'decompress') {	'newhtmlfile' => 'New Resource',
$r->print('<h3>'.&mt('Decompress').'</h3>');	'newproblemfile' => 'New Resource',
} elsif ($env{'form.action'} eq 'copy') {	'newpagefile' => 'New Resource',
$r->print('<h3>'.&mt('Copy').'</h3>');	'newsequencefile' => 'New Resource',
} elsif ($env{'form.action'} eq 'newfile' \|\|	'newrightsfile' => 'New Resource',
$env{'form.action'} eq 'newhtmlfile' \|\|	'newstyfile' => 'New Resource',
$env{'form.action'} eq 'newproblemfile' \|\|	'newtaskfile' => 'New Resource',
$env{'form.action'} eq 'newpagefile' \|\|	'newlibraryfile' => 'New Resource',
$env{'form.action'} eq 'newsequencefile' \|\|	'Select Action' => 'New Resource',
$env{'form.action'} eq 'newrightsfile' \|\|	);
$env{'form.action'} eq 'newstyfile' \|\|	if ($action{$env{'form.action'}}) {
$env{'form.action'} eq 'newtaskfile' \|\|	if ($crsauthor) {
$env{'form.action'} eq 'newlibraryfile' \|\|	my @disallowed = qw(page sequence rights library);
$env{'form.action'} eq 'Select Action' ) {	my $newtype;
$r->print('<h3>'.&mt('New Resource').'</h3>');	if ($env{'form.action'} =~ /^new(\w+)file$/) {
	$newtype = $1;
	} elsif ($env{'form.action'} eq 'newfile') {
	($newtype) = ($env{'form.newfilename'} =~ m{\.([^/.]+)$});
	$newtype = lc($newtype);
	}
	if (($newtype ne '') &&
	(grep(/^\Q$newtype\E$/,@disallowed))) {
	$r->print('<p class="LC_error">'
	.&mt('Creation of a new file of type: [_1] is not permitted in Course Authoring Space',$newtype)
	.'</p>'
	.&Apache::loncommon::end_page()
	);
	return OK;
	}
	}
	$r->print('<h2>'.$action{$env{'form.action'}}.'</h2>');
} else {	} else {
$r->print('<p class="LC_error">'	$r->print('<p class="LC_error">'
.&mt('Unknown Action').' '.$env{'form.action'}	.&mt('Unknown Action: [_1]',$env{'form.action'})
.'</p>'	.'</p>'
.&Apache::loncommon::end_page()	.&Apache::loncommon::end_page()
);	);
return OK;	return OK;
}	}

if ($env{'form.phase'} eq 'two') {	if ($env{'form.phase'} eq 'two') {
&Debug($r, "loncfile::handler entering phase2");	&Debug($r, "loncfile::handler entering phase2");
&phasetwo($r,$fn,$uname,$udom);	&phasetwo($r,$fn,$uname,$udom);
Line 1547 function writeDone() {	Line 1624 function writeDone() {
}	}

$r->print(&Apache::loncommon::end_page());	$r->print(&Apache::loncommon::end_page());
return OK;	return OK;
}	}

1;	1;

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

Removed from v.1.116
changed lines
	Added in v.1.127