loncom/lond - diff

Return to lond CVS log

Up to [LON-CAPA] / loncom

version 1.519, 2016/04/02 04:30:29	version 1.521, 2016/05/08 20:48:35
Line 2496 sub remove_user_file_handler {	Line 2496 sub remove_user_file_handler {
if (-e $file) {	if (-e $file) {
#	#
# If the file is a regular file unlink is fine...	# If the file is a regular file unlink is fine...
# However it's possible the client wants a dir.	# However it's possible the client wants a dir
# removed, in which case rmdir is more approprate:	# removed, in which case rmdir is more appropriate.
	# Note: rmdir will only remove an empty directory.
#	#
if (-f $file){	if (-f $file){
unlink($file);	unlink($file);
	# for html files remove the associated .bak file
	# which may have been created by the editor.
	if ($ufile =~ m{^((docs\|supplemental)/(?:\d+\|default)/\d+(?:\|/.+)/)[^/]+\.x?html?$}i) {
	my $path = $1;
	if (-e $file.'.bak') {
	unlink($file.'.bak');
	}
	}
} elsif(-d $file) {	} elsif(-d $file) {
rmdir($file);	rmdir($file);
}	}
Line 5473 sub retrieve_auto_file_handler {	Line 5482 sub retrieve_auto_file_handler {
my ($filename) = split(/:/, $tail);	my ($filename) = split(/:/, $tail);

my $source = $perlvar{'lonDaemons'}.'/tmp/'.$filename;	my $source = $perlvar{'lonDaemons'}.'/tmp/'.$filename;
if ( (-e $source) && ($filename ne '') ) {
	if ($filename =~m{/\.\./}) {
	&Failure($client, "refused\n", $userinput);
	} elsif ( (-e $source) && ($filename ne '') ) {
my $reply = '';	my $reply = '';
if (open(my $fh,$source)) {	if (open(my $fh,$source)) {
while (<$fh>) {	while (<$fh>) {