loncom/lond - diff

Return to lond CVS log

Up to [LON-CAPA] / loncom

version 1.518, 2016/02/17 19:15:44	version 1.520, 2016/05/08 19:05:10
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 5505 sub crsreq_checks_handler {	Line 5514 sub crsreq_checks_handler {
my $userinput = "$cmd:$tail";	my $userinput = "$cmd:$tail";
my $dom = $tail;	my $dom = $tail;
my $result;	my $result;
my @reqtypes = ('official','unofficial','community','textbook');	my @reqtypes = ('official','unofficial','community','textbook','placement');
eval {	eval {
local($SIG{__DIE__})='DEFAULT';	local($SIG{__DIE__})='DEFAULT';
my %validations;	my %validations;