version 1.523, 2016/09/01 19:31:05
|
version 1.526, 2016/11/26 01:47:04
|
Line 995 sub render_resource {
|
Line 995 sub render_resource {
|
$linkopen = ""; |
$linkopen = ""; |
$linkclose = ""; |
$linkclose = ""; |
} |
} |
if ((&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) && |
if (((&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) || |
|
(&Apache::lonnet::allowed('cev',$env{'request.course.id'}))) && |
($resource->symb=~/\_\_\_[^\_]+\_\_\_uploaded/)) { |
($resource->symb=~/\_\_\_[^\_]+\_\_\_uploaded/)) { |
if (!$params->{'map_no_edit_link'}) { |
if (!$params->{'map_no_edit_link'}) { |
my $icon = &Apache::loncommon::lonhttpdurl('/res/adm/pages').'/editmap.png'; |
my $icon = &Apache::loncommon::lonhttpdurl('/res/adm/pages').'/editmap.png'; |
Line 1540 END
|
Line 1541 END
|
$result.='</form>'; |
$result.='</form>'; |
} |
} |
if (($args->{'caller'} eq 'navmapsdisplay') && |
if (($args->{'caller'} eq 'navmapsdisplay') && |
(&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) { |
((&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) || |
|
(&Apache::lonnet::allowed('cev',$env{'request.course.id'})))) { |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
if ($env{'course.'.$env{'request.course.id'}.'.url'} eq |
if ($env{'course.'.$env{'request.course.id'}.'.url'} eq |
Line 2686 sub parmval_real {
|
Line 2688 sub parmval_real {
|
} |
} |
foreach my $item (@recurseup) { |
foreach my $item (@recurseup) { |
my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what; |
my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what; |
last if (defined($$useropt{$norecursechk})); |
if (defined($$useropt{$norecursechk})) { |
|
if ($what =~ /\.(encrypturl|hiddenresource)$/) { |
|
return [$$useropt{$norecursechk},'map']; |
|
} else { |
|
last; |
|
} |
|
} |
my $recursechk=$usercourseprefix.'.'.$item.'___(rec).'.$what; |
my $recursechk=$usercourseprefix.'.'.$item.'___(rec).'.$what; |
if (defined($$useropt{$recursechk})) { return [$$useropt{$recursechk},'map']; } |
if (defined($$useropt{$recursechk})) { return [$$useropt{$recursechk},'map']; } |
} |
} |
Line 2704 sub parmval_real {
|
Line 2712 sub parmval_real {
|
} |
} |
foreach my $item (@recurseup) { |
foreach my $item (@recurseup) { |
my $norecursechk=$usercourseprefix.'.['.$cgroup.'].'.$item.'___(all).'.$what; |
my $norecursechk=$usercourseprefix.'.['.$cgroup.'].'.$item.'___(all).'.$what; |
last if (defined($$courseopt{$norecursechk})); |
if (defined($$courseopt{$norecursechk})) { |
|
if ($what =~ /\.(encrypturl|hiddenresource)$/) { |
|
return [$$courseopt{$norecursechk},'map']; |
|
} else { |
|
last; |
|
} |
|
} |
my $recursechk=$usercourseprefix.'.['.$cgroup.'].'.$item.'___(rec).'.$what; |
my $recursechk=$usercourseprefix.'.['.$cgroup.'].'.$item.'___(rec).'.$what; |
if (defined($$courseopt{$recursechk})) { return [$$courseopt{$recursechk},'map']; } |
if (defined($$courseopt{$recursechk})) { return [$$courseopt{$recursechk},'map']; } |
} |
} |
Line 2721 sub parmval_real {
|
Line 2735 sub parmval_real {
|
} |
} |
foreach my $item (@recurseup) { |
foreach my $item (@recurseup) { |
my $norecursechk=$usercourseprefix.'.['.$csec.'].'.$item.'___(all).'.$what; |
my $norecursechk=$usercourseprefix.'.['.$csec.'].'.$item.'___(all).'.$what; |
last if (defined($$courseopt{$norecursechk})); |
if (defined($$courseopt{$norecursechk})) { |
|
if ($what =~ /\.(encrypturl|hiddenresource)$/) { |
|
return [$$courseopt{$norecursechk},'map']; |
|
} else { |
|
last; |
|
} |
|
} |
my $recursechk=$usercourseprefix.'.['.$csec.'].'.$item.'___(rec).'.$what; |
my $recursechk=$usercourseprefix.'.['.$csec.'].'.$item.'___(rec).'.$what; |
if (defined($$courseopt{$recursechk})) { return [$$courseopt{$recursechk},'map']; } |
if (defined($$courseopt{$recursechk})) { return [$$courseopt{$recursechk},'map']; } |
} |
} |
Line 2755 sub parmval_real {
|
Line 2775 sub parmval_real {
|
} |
} |
foreach my $item (@recurseup) { |
foreach my $item (@recurseup) { |
my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what; |
my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what; |
last if (defined($$courseopt{$norecursechk})); |
if (defined($$courseopt{$norecursechk})) { |
|
if ($what =~ /\.(encrypturl|hiddenresource)$/) { |
|
return [$$courseopt{$norecursechk},'map']; |
|
} else { |
|
last; |
|
} |
|
} |
my $recursechk=$usercourseprefix.'.'.$item.'___(rec).'.$what; |
my $recursechk=$usercourseprefix.'.'.$item.'___(rec).'.$what; |
if (defined($$courseopt{$recursechk})) { |
if (defined($$courseopt{$recursechk})) { |
return [$$courseopt{$recursechk},'map']; |
return [$$courseopt{$recursechk},'map']; |
Line 2894 sub get_mapparam {
|
Line 2920 sub get_mapparam {
|
} |
} |
foreach my $item (@recurseup) { |
foreach my $item (@recurseup) { |
my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what; |
my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what; |
last if (defined($$useropt{$norecursechk})); |
if (defined($$useropt{$norecursechk})) { |
|
if ($what =~ /\.(encrypturl|hiddenresource)$/) { |
|
return $$useropt{$norecursechk}; |
|
} else { |
|
last; |
|
} |
|
} |
my $recursechk=$usercourseprefix.'.'.$item.'___(rec).'.$what; |
my $recursechk=$usercourseprefix.'.'.$item.'___(rec).'.$what; |
if (defined($$useropt{$recursechk})) { |
if (defined($$useropt{$recursechk})) { |
return $$useropt{$recursechk}; |
return $$useropt{$recursechk}; |
Line 2919 sub get_mapparam {
|
Line 2951 sub get_mapparam {
|
} |
} |
foreach my $item (@recurseup) { |
foreach my $item (@recurseup) { |
my $norecursechk=$usercourseprefix.'.['.$cgroup.'].'.$item.'___(all).'.$what; |
my $norecursechk=$usercourseprefix.'.['.$cgroup.'].'.$item.'___(all).'.$what; |
last if (defined($$courseopt{$norecursechk})); |
if (defined($$courseopt{$norecursechk})) { |
|
if ($what =~ /\.(encrypturl|hiddenresource)$/) { |
|
return $$courseopt{$norecursechk}; |
|
} else { |
|
last; |
|
} |
|
} |
my $recursechk=$usercourseprefix.'.['.$cgroup.'].'.$item.'___(rec).'.$what; |
my $recursechk=$usercourseprefix.'.['.$cgroup.'].'.$item.'___(rec).'.$what; |
if (defined($$courseopt{$recursechk})) { |
if (defined($$courseopt{$recursechk})) { |
return $$courseopt{$recursechk}; |
return $$courseopt{$recursechk}; |
Line 2943 sub get_mapparam {
|
Line 2981 sub get_mapparam {
|
} |
} |
foreach my $item (@recurseup) { |
foreach my $item (@recurseup) { |
my $norecursechk=$usercourseprefix.'.['.$csec.'].'.$item.'___(all).'.$what; |
my $norecursechk=$usercourseprefix.'.['.$csec.'].'.$item.'___(all).'.$what; |
last if (defined($$courseopt{$norecursechk})); |
if (defined($$courseopt{$norecursechk})) { |
|
if ($what =~ /\.(encrypturl|hiddenresource)$/) { |
|
return $$courseopt{$norecursechk}; |
|
} else { |
|
last; |
|
} |
|
} |
my $recursechk=$usercourseprefix.'.['.$csec.'].'.$item.'___(rec).'.$what; |
my $recursechk=$usercourseprefix.'.['.$csec.'].'.$item.'___(rec).'.$what; |
if (defined($$courseopt{$recursechk})) { |
if (defined($$courseopt{$recursechk})) { |
return $$courseopt{$recursechk}; |
return $$courseopt{$recursechk}; |
Line 2974 sub get_mapparam {
|
Line 3018 sub get_mapparam {
|
if (@recurseup) { |
if (@recurseup) { |
foreach my $item (@recurseup) { |
foreach my $item (@recurseup) { |
my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what; |
my $norecursechk=$usercourseprefix.'.'.$item.'___(all).'.$what; |
last if (defined($$courseopt{$norecursechk})); |
if (defined($$courseopt{$norecursechk})) { |
|
if ($what =~ /\.(encrypturl|hiddenresource)$/) { |
|
return $$courseopt{$norecursechk}; |
|
} else { |
|
last; |
|
} |
|
} |
my $recursechk=$usercourseprefix.'.'.$item.'___(rec).'.$what; |
my $recursechk=$usercourseprefix.'.'.$item.'___(rec).'.$what; |
if (defined($$courseopt{$recursechk})) { |
if (defined($$courseopt{$recursechk})) { |
return $$courseopt{$recursechk}; |
return $$courseopt{$recursechk}; |
Line 4787 sub getReturnHash {
|
Line 4837 sub getReturnHash {
|
my $self = shift; |
my $self = shift; |
|
|
if (!defined($self->{RETURN_HASH})) { |
if (!defined($self->{RETURN_HASH})) { |
my %tmpHash = &Apache::lonnet::restore($self->{SYMB},undef,$self->{DOMAIN},$self->{USERNAME}); |
#my %tmpHash = &Apache::lonnet::restore($self->{SYMB},undef,$self->{DOMAIN},$self->{USERNAME}); |
$self->{RETURN_HASH} = \%tmpHash; |
#$self->{RETURN_HASH} = \%tmpHash; |
|
# When info is retrieved for several resources (as when rendering a directory), |
|
# it is much faster to use the user profile dump and avoid repeated lonnet requests |
|
# (especially since lonnet::currentdump is using Lond directly whenever possible, |
|
# and lonnet::restore is not at this point). |
|
$self->{NAV_MAP}->get_user_data(); |
|
$self->{RETURN_HASH} = $self->{NAV_MAP}->{STUDENT_DATA}->{$self->{SYMB}}; |
} |
} |
} |
} |
|
|