loncom/interface/lonuserutils.pm - diff

Return to lonuserutils.pm CVS log

Up to [LON-CAPA] / loncom / interface

version 1.128, 2010/11/01 18:01:26	version 1.129, 2010/11/01 18:19:01
Line 4006 sub upfile_drop_add {	Line 4006 sub upfile_drop_add {
$nowhitespace);	$nowhitespace);
next;	next;
} else {	} else {
	$entries{$fields{'domain'}} =~ s/^\s+\|\s+$//g;
if ($entries{$fields{'domain'}}	if ($entries{$fields{'domain'}}
ne &LONCAPA::clean_domain($entries{$fields{'domain'}})) {	ne &LONCAPA::clean_domain($entries{$fields{'domain'}})) {
$r->print('<br />'. '<b>'.$entries{$fields{'domain'}}.	$r->print('<br />'. '<b>'.$entries{$fields{'domain'}}.
Line 4064 sub upfile_drop_add {	Line 4065 sub upfile_drop_add {
# determine email address	# determine email address
my $email='';	my $email='';
if (defined($fields{'email'})) {	if (defined($fields{'email'})) {
	$entries{$fields{'email'}} =~ s/^\s+\|\s+$//g;
if (defined($entries{$fields{'email'}})) {	if (defined($entries{$fields{'email'}})) {
$email=$entries{$fields{'email'}};	$email=$entries{$fields{'email'}};
unless ($email=~/^[^\@]+\@[^\@]+$/) { $email=''; }	unless ($email=~/^[^\@]+\@[^\@]+$/) { $email=''; }
Line 4110 sub upfile_drop_add {	Line 4112 sub upfile_drop_add {
$role = $defaultrole;	$role = $defaultrole;
}	}
# Clean up whitespace	# Clean up whitespace
foreach (\$id,\$fname,\$mname,\$lname,\$gen) {	foreach (\$id,\$fname,\$mname,\$lname,\$gen,\$inststatus) {
$$_ =~ s/(\s+$\|^\s+)//g;	$$_ =~ s/(\s+$\|^\s+)//g;
}	}
# check against rules	# check against rules