--- loncom/lonnet/perl/lonnet.pm 2011/08/09 01:35:24 1.1129 +++ loncom/lonnet/perl/lonnet.pm 2011/09/16 22:24:01 1.1132 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.1129 2011/08/09 01:35:24 raeburn Exp $ +# $Id: lonnet.pm,v 1.1132 2011/09/16 22:24:01 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -348,7 +348,7 @@ sub get_remote_globals { sub remote_devalidate_cache { my ($lonhost,$name,$id) = @_; - my $response = &reply('devalidatecache',&escape($name).':'.&escape($id),$lonhost); + my $response = &reply('devalidatecache:'.&escape($name).':'.&escape($id),$lonhost); return $response; } @@ -1242,7 +1242,7 @@ sub check_loadbalancing { my %domconfig = &Apache::lonnet::get_dom('configuration',['loadbalancing'],$dom_in_use); if (ref($domconfig{'loadbalancing'}) eq 'HASH') { - $result = &do_cache_new('loadbalancing',$dom_in_use,$domconfig{'usersessions'}{'loadbalancing'},$cachetime); + $result = &do_cache_new('loadbalancing',$dom_in_use,$domconfig{'loadbalancing'},$cachetime); } } if (ref($result) eq 'HASH') { @@ -1308,7 +1308,7 @@ sub check_loadbalancing { my %domconfig = &Apache::lonnet::get_dom('configuration',['loadbalancing'],$serverhomedom); if (ref($domconfig{'loadbalancing'}) eq 'HASH') { - $result = &do_cache_new('loadbalancing',$dom_in_use,$domconfig{'usersessions'}{'loadbalancing'},$cachetime); + $result = &do_cache_new('loadbalancing',$dom_in_use,$domconfig{'loadbalancing'},$cachetime); } } if (ref($result) eq 'HASH') { @@ -3986,7 +3986,7 @@ sub hashref2str { $result.='='; #print("Got a ref of ".(ref($key))." skipping."); } else { - if ($key) {$result.=&escape($key).'=';} else { last; } + if (defined($key)) {$result.=&escape($key).'=';} else { last; } } if(ref($hashref->{$key}) eq 'ARRAY') { @@ -7075,6 +7075,13 @@ sub assignrole { return 'refused'; } } + } elsif ($role eq 'au') { + if ($url ne '/'.$udom.'/') { + &logthis('Attempt by '.$env{'user.name'}.':'.$env{'user.domain'}. + ' to assign author role for '.$uname.':'.$udom. + ' in domain: '.$url.' refused (wrong domain).'); + return 'refused'; + } } $mrole=$role; }