--- loncom/interface/lonuserutils.pm 2008/08/13 08:17:58 1.61
+++ loncom/interface/lonuserutils.pm 2008/08/20 21:28:14 1.62
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Utility functions for managing LON-CAPA user accounts
#
-# $Id: lonuserutils.pm,v 1.61 2008/08/13 08:17:58 bisitz Exp $
+# $Id: lonuserutils.pm,v 1.62 2008/08/20 21:28:14 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -558,7 +558,7 @@ function verify(vf,sec_caller) {
if (tw==11) { foundrole=1; }
if (tw==12) { founddomain=1; }
}
- verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail,foundrole,founddom);
+ verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail,foundrole,founddomain);
}
//
@@ -3592,16 +3592,8 @@ sub upfile_drop_add {
'');
next;
} else {
- my $baddom = 0;
if ($entries{$fields{'dom'}}
ne &LONCAPA::clean_domain($entries{$fields{'domain'}})) {
- $baddom = 1;
- } else {
- if (&Apache::lonnet::domain($entries{$fields{'domain'}}) eq '') {
- $baddom = 1;
- }
- }
- if ($baddom) {
$r->print('
'. ''.$entries{$fields{'domain'}}.
': '.&mt('Unacceptable domain for user [_2] [_3] [_4] [_5]',$fname,$mname,$lname,$gen).'');
next;