--- loncom/lonnet/perl/lonnet.pm 2015/08/05 18:47:25 1.1290 +++ loncom/lonnet/perl/lonnet.pm 2015/09/14 13:45:36 1.1292 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.1290 2015/08/05 18:47:25 raeburn Exp $ +# $Id: lonnet.pm,v 1.1292 2015/09/14 13:45:36 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1974,11 +1974,10 @@ sub get_multiple_instusers { $uname = $key; } my ($resp,%info) = &get_instuser($udom,$uname,$id); + $outcome = $resp; if ($resp eq 'ok') { %{$results} = (%{$results}, %info); - $outcome = 'ok'; } else { - $outcome = $resp; last; } } @@ -1986,7 +1985,7 @@ sub get_multiple_instusers { if (($response eq 'unavailable') || ($response eq 'invalid') || ($response eq 'timeout')) { $outcome = $response; } else { - ($outcome,my $userdata) = split(/:/,$response,2); + ($outcome,my $userdata) = split(/=/,$response,2); if ($outcome eq 'ok') { $results = &thaw_unescape($userdata); } @@ -7387,7 +7386,8 @@ sub get_commblock_resources { } } } - if ($interval[0] =~ /^\d+$/) { + if ($interval[0] =~ /^\d+/) { + my ($timelimit) = split(/_/,$interval[0]); my $first_access; if ($type eq 'resource') { $first_access=&get_first_access($interval[1],$item); @@ -7397,7 +7397,7 @@ sub get_commblock_resources { $first_access=&get_first_access($interval[1]); } if ($first_access) { - my $timesup = $first_access+$interval[0]; + my $timesup = $first_access+$timelimit; if ($timesup > $now) { my $activeblock; foreach my $res (@to_test) {