--- loncom/lonnet/perl/lonnet.pm 2009/08/15 00:25:53 1.1017 +++ loncom/lonnet/perl/lonnet.pm 2009/08/18 20:08:25 1.1019 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.1017 2009/08/15 00:25:53 raeburn Exp $ +# $Id: lonnet.pm,v 1.1019 2009/08/18 20:08:25 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -3146,10 +3146,10 @@ sub dcmaildump { sub get_domain_roles { my ($dom,$roles,$startdate,$enddate)=@_; - if (undef($startdate) || $startdate eq '') { + if ((!defined($startdate)) || ($startdate eq '')) { $startdate = '.'; } - if (undef($enddate) || $enddate eq '') { + if ((!defined($enddate)) || ($enddate eq '')) { $enddate = '.'; } my $rolelist; @@ -5645,7 +5645,7 @@ sub auto_validate_courseID { } sub auto_validate_instcode { - my ($cnum,$cdom,$instcode,$owner) = @_; + my ($cnum,$cdom,$instcode,$owner,$inststatuslist,$instseclist) = @_; my ($homeserver,$response); if (($cdom =~ /^$match_domain$/) && ($cnum =~ /^$match_courseid$/)) { $homeserver = &homeserver($cnum,$cdom); @@ -5656,7 +5656,9 @@ sub auto_validate_instcode { } } my $response=&unescape(&reply('autovalidateinstcode:'.$cdom.':'. - &escape($instcode).':'.&escape($owner),$homeserver)); + &escape($instcode).':'.&escape($owner).':'. + &escape($inststatuslist).':'.&escape($instseclist), + $homeserver)); return $response; } @@ -5878,11 +5880,6 @@ sub auto_courserequest_checks { return %validations; } -sub auto_courserequest_validation { - my ($dom,$details,$inststatuses,$message) = @_; - return 'pending'; -} - sub auto_validate_class_sec { my ($cdom,$cnum,$owners,$inst_class) = @_; my $homeserver = &homeserver($cnum,$cdom);