--- loncom/lonnet/perl/lonnet.pm 2012/05/18 20:03:22 1.1170 +++ loncom/lonnet/perl/lonnet.pm 2012/05/29 12:16:42 1.1172.2.3 @@ -1,7 +1,7 @@ # The LearningOnline Network # TCP networking package # -# $Id: lonnet.pm,v 1.1170 2012/05/18 20:03:22 droeschl Exp $ +# $Id: lonnet.pm,v 1.1172.2.3 2012/05/29 12:16:42 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -97,7 +97,6 @@ use File::MMagic; use LONCAPA qw(:DEFAULT :match); use LONCAPA::Configuration; use LONCAPA::lonmetadata; -use LONCAPA::Lond; use File::Copy; @@ -2568,8 +2567,7 @@ sub ssi { } $request->header(Cookie => $ENV{'HTTP_COOKIE'}); - my $response=$ua->request($request); - + my $response= $ua->request($request); if (wantarray) { return ($response->content, $response); } else { @@ -3959,7 +3957,7 @@ my $cachedtime=(); sub load_all_first_access { my ($uname,$udom)=@_; if (($cachedkey eq $uname.':'.$udom) && - (abs($cachedtime-time)<5)) { + (abs($cachedtime-time)<5) && (!$env{'form.markaccess'})) { return; } $cachedtime=time; @@ -10760,6 +10758,7 @@ sub declutter { $thisfn=~s|^adm/wrapper/||; $thisfn=~s|^adm/coursedocs/showdoc/||; $thisfn=~s/^res\///; + $thisfn=~s/^priv\///; unless (($thisfn =~ /^ext/) || ($thisfn =~ /\.(page|sequence)___\d+___ext/)) { $thisfn=~s/\?.+$//; } @@ -11682,6 +11681,11 @@ B: get user returns user role, first access and timer interval hashes =item * +X +B: returns a true if user has a +privileged and active role (i.e. su or dc), false otherwise. + +=item * X B: finds the section of student in the course $cname, return section name/number or '' for "not in course"