[LON-CAPA-cvs] cvs: loncom(version_2_10_X) /interface loncommon.pm

raeburn raeburn@source.lon-capa.org
Mon, 27 Sep 2010 01:16:23 -0000


raeburn		Mon Sep 27 01:16:23 2010 EDT

  Modified files:              (Branch: version_2_10_X)
    /loncom/interface	loncommon.pm 
  Log:
  - Backport 1.981, 1.982.
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.948.2.10 loncom/interface/loncommon.pm:1.948.2.11
--- loncom/interface/loncommon.pm:1.948.2.10	Fri Sep 24 03:33:37 2010
+++ loncom/interface/loncommon.pm	Mon Sep 27 01:16:22 2010
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.948.2.10 2010/09/24 03:33:37 raeburn Exp $
+# $Id: loncommon.pm,v 1.948.2.11 2010/09/27 01:16:22 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3836,7 +3836,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,
@@ -7200,7 +7202,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';
@@ -10793,7 +10796,7 @@
 	    $initial_env{"browser.interface"} = $form->{'interface'};
 	    $env{'browser.interface'}=$form->{'interface'};
 	}
-        my %is_adv = ( is_adv => &Apache::lonnet::is_advanced_user($domain,$username) );
+        my %is_adv = ( is_adv => $env{'user.adv'} );
         my %domdef = &Apache::lonnet::get_domain_defaults($domain);
 
         foreach my $tool ('aboutme','blog','portfolio') {