[LON-CAPA-cvs] cvs: loncom(version_2_9_X) /interface loncommon.pm
raeburn
raeburn@source.lon-capa.org
Mon, 01 Nov 2010 13:45:36 -0000
raeburn Mon Nov 1 13:45:36 2010 EDT
Modified files: (Branch: version_2_9_X)
/loncom/interface loncommon.pm
Log:
- Backport 1.982.
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.692.4.36 loncom/interface/loncommon.pm:1.692.4.37
--- loncom/interface/loncommon.pm:1.692.4.36 Wed Jul 21 22:23:08 2010
+++ loncom/interface/loncommon.pm Mon Nov 1 13:45:35 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.692.4.36 2010/07/21 22:23:08 raeburn Exp $
+# $Id: loncommon.pm,v 1.692.4.37 2010/11/01 13:45:35 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -3737,7 +3737,9 @@
$udom = $env{'user.domain'};
}
if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
- my %roleshash = &Apache::lonnet::dump('roles',$udom,$uname);
+ my $extra = &Apache::lonnet::freeze_escape({'skipcheck' => 1});
+ my %roleshash = &Apache::lonnet::dump('roles',$udom,$uname,'.',undef,
+ $extra);
if (!%roles) {
%roles = (
cc => 1,
@@ -6492,7 +6494,8 @@
sub check_user_status {
my ($udom,$uname,$cdom,$crs,$role,$sec) = @_;
- my %userinfo = &Apache::lonnet::dump('roles',$udom,$uname);
+ my $extra = &Apache::lonnet::freeze_escape({'skipcheck' => 1});
+ my %userinfo = &Apache::lonnet::dump('roles',$udom,$uname,'.',undef,$extra);
my @uroles = keys %userinfo;
my $srchstr;
my $active_chk = 'none';