version 1.619, 2017/01/24 15:52:58
|
version 1.620, 2017/02/18 14:16:47
|
Line 3339 sub editor {
|
Line 3339 sub editor {
|
$output .= &entryline($idx,$name,$url,$folder,$allowed,$res, |
$output .= &entryline($idx,$name,$url,$folder,$allowed,$res, |
$coursenum,$coursedom,$crstype, |
$coursenum,$coursedom,$crstype, |
$pathitem,$supplementalflag,$container, |
$pathitem,$supplementalflag,$container, |
\%filters,\%curr_groups,$ltitoolsref,$canedit,$isencrypted,$navmapref); |
\%filters,\%curr_groups,$ltitoolsref,$canedit, |
|
$isencrypted,$navmapref); |
$idx++; |
$idx++; |
$shown++; |
$shown++; |
} |
} |
Line 4020 END
|
Line 4021 END
|
if (((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) || |
if (((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) || |
$isencrypted || (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i)) { |
$isencrypted || (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i)) { |
$checkencrypt = 1; |
$checkencrypt = 1; |
} else { |
} elsif (ref($navmapref)) { |
unless (ref($$navmapref)) { |
unless (ref($$navmapref)) { |
$$navmapref = Apache::lonnavmaps::navmap->new(); |
$$navmapref = Apache::lonnavmaps::navmap->new(); |
} |
} |
Line 4075 END
|
Line 4076 END
|
my $encryptmap = ((&LONCAPA::map::getparameter($orderidx, |
my $encryptmap = ((&LONCAPA::map::getparameter($orderidx, |
'parameter_encrypturl'))[0]=~/^yes$/i); |
'parameter_encrypturl'))[0]=~/^yes$/i); |
unless ($hiddenmap) { |
unless ($hiddenmap) { |
unless (ref($$navmapref)) { |
if (ref($navmapref)) { |
$$navmapref = Apache::lonnavmaps::navmap->new(); |
unless (ref($$navmapref)) { |
} |
$$navmapref = Apache::lonnavmaps::navmap->new(); |
if (ref($$navmapref)) { |
} |
if (lc($$navmapref->get_mapparam(undef,$folderurl,"0.hiddenresource")) eq 'yes') { |
if (ref($$navmapref)) { |
my @resources = $$navmapref->retrieveResources($folderurl,$filterFunc,1,1); |
if (lc($$navmapref->get_mapparam(undef,$folderurl,"0.hiddenresource")) eq 'yes') { |
unless (@resources) { |
my @resources = $$navmapref->retrieveResources($folderurl,$filterFunc,1,1); |
$hiddenmap = 1; |
unless (@resources) { |
unless ($env{'request.role.adv'}) { |
$hiddenmap = 1; |
$url = ''; |
unless ($env{'request.role.adv'}) { |
$hiddenfolder = 1; |
$url = ''; |
|
$hiddenfolder = 1; |
|
} |
} |
} |
} |
} |
} |
} |
} |
} |
} |
} |
unless ($encryptmap) { |
unless ($encryptmap) { |
if (lc($$navmapref->get_mapparam(undef,$folderurl,"0.encrypturl")) eq 'yes') { |
if ((ref($navmapref)) && (ref($$navmapref))) { |
$encryptmap = 1; |
if (lc($$navmapref->get_mapparam(undef,$folderurl,"0.encrypturl")) eq 'yes') { |
|
$encryptmap = 1; |
|
} |
} |
} |
} |
} |
|
|