version 1.293, 2009/10/20 01:57:42
|
version 1.295, 2009/10/26 21:19:22
|
Line 225 sub secondary_menu {
|
Line 225 sub secondary_menu {
|
&& $env{'environment.remotenavmap'} ne 'on'; |
&& $env{'environment.remotenavmap'} ne 'on'; |
next if $$menuitem[4] =~ /noremotenav/ |
next if $$menuitem[4] =~ /noremotenav/ |
&& $env{'environment.remotenavmap'} eq 'on'; |
&& $env{'environment.remotenavmap'} eq 'on'; |
|
next if $$menuitem[4] =~ /^(no|)remotenav$/ |
|
&& $crstype eq 'Community'; |
|
next if $$menuitem[4] =~ /^(no|)remotenavCommunity$/ |
|
&& $crstype ne 'Community'; |
next if $$menuitem[4] =~ /showgroups$/ |
next if $$menuitem[4] =~ /showgroups$/ |
&& $canviewgrps |
&& $canviewgrps |
&& !%groups; |
&& !%groups; |
Line 769 $menuitems.="Make notes and annotations
|
Line 773 $menuitems.="Make notes and annotations
|
} |
} |
} |
} |
unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) { |
unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) { |
if (!$env{'request.enc'}) { |
if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/})) { |
$menuitems.=(<<ENDREALRES); |
$menuitems.=(<<ENDREALRES); |
s&6&3&catalog.gif&catalog[_2]&info[_1]&catalog_info()&Show Metadata |
s&6&3&catalog.gif&catalog[_2]&info[_1]&catalog_info()&Show Metadata |
ENDREALRES |
ENDREALRES |
Line 1320 sub rawconfig {
|
Line 1324 sub rawconfig {
|
my $show_course=&Apache::loncommon::show_course(); |
my $show_course=&Apache::loncommon::show_course(); |
my $author=$env{'user.author'}; |
my $author=$env{'user.author'}; |
my $crs=''; |
my $crs=''; |
|
my $crstype=''; |
if ($env{'request.course.id'}) { |
if ($env{'request.course.id'}) { |
$crs='/'.$env{'request.course.id'}; |
$crs='/'.$env{'request.course.id'}; |
if ($env{'request.course.sec'}) { |
if ($env{'request.course.sec'}) { |
$crs.='_'.$env{'request.course.sec'}; |
$crs.='_'.$env{'request.course.sec'}; |
} |
} |
$crs=~s/\_/\//g; |
$crs=~s/\_/\//g; |
|
$crstype = &Apache::loncommon::course_type(); |
} |
} |
my $pub=($env{'request.state'} eq 'published'); |
my $pub=($env{'request.state'} eq 'published'); |
my $con=($env{'request.state'} eq 'construct'); |
my $con=($env{'request.state'} eq 'construct'); |
Line 1335 sub rawconfig {
|
Line 1341 sub rawconfig {
|
my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc,$cat)=split(/\:/,$line); |
my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc,$cat)=split(/\:/,$line); |
$prt=~s/\$uname/$uname/g; |
$prt=~s/\$uname/$uname/g; |
$prt=~s/\$udom/$udom/g; |
$prt=~s/\$udom/$udom/g; |
$prt=~s/\$crs/$crs/g; |
if ($prt =~ /\$crs/) { |
|
next unless ($env{'request.course.id'}); |
|
next if ($crstype eq 'Community'); |
|
$prt=~s/\$crs/$crs/g; |
|
} elsif ($prt =~ /\$cmty/) { |
|
next unless ($env{'request.course.id'}); |
|
next if ($crstype ne 'Community'); |
|
$prt=~s/\$cmty/$crs/g; |
|
} |
$prt=~s/\$requested_domain/$requested_domain/g; |
$prt=~s/\$requested_domain/$requested_domain/g; |
if ($category_names{$cat}!~/\w/) { $cat='oth'; } |
if ($category_names{$cat}!~/\w/) { $cat='oth'; } |
my $type = &Apache::loncommon::course_type(); |
|
if ($pro eq 'clear') { |
if ($pro eq 'clear') { |
$output.=&clear($row,$col); |
$output.=&clear($row,$col); |
} elsif ($pro eq 'any') { |
} elsif ($pro eq 'any') { |
Line 1365 sub rawconfig {
|
Line 1378 sub rawconfig {
|
$uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat); |
$uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat); |
} |
} |
} elsif (($pro=~/^p(\w+)/) && ($prt)) { |
} elsif (($pro=~/^p(\w+)/) && ($prt)) { |
if (&Apache::lonnet::allowed($1,$prt)) { |
my $priv = $1; |
|
if ($priv =~ /^mdc(Course|Community)/) { |
|
if ($crstype eq $1) { |
|
$priv = 'mdc'; |
|
} else { |
|
next; |
|
} |
|
} |
|
if (&Apache::lonnet::allowed($priv,$prt)) { |
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); |
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); |
} |
} |
} elsif ($pro eq 'course') { |
} elsif ($pro eq 'course') { |
if ($env{'request.course.fn'}) { |
if (($env{'request.course.fn'}) && ($crstype ne 'Community')) { |
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); |
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); |
} |
} |
|
} elsif ($pro eq 'community') { |
|
if (($env{'request.course.fn'}) && ($crstype eq 'Community')) { |
|
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); |
|
} |
} elsif ($pro =~ /^courseenv_(.*)$/) { |
} elsif ($pro =~ /^courseenv_(.*)$/) { |
my $key = $1; |
my $key = $1; |
if ($env{'course.'.$env{'request.course.id'}.'.'.$key}) { |
if (($env{'course.'.$env{'request.course.id'}.'.'.$key}) && |
|
($crstype ne 'Community')) { |
|
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); |
|
} |
|
} elsif ($pro =~ /^communityenv_(.*)$/) { |
|
my $key = $1; |
|
if (($env{'course.'.$env{'request.course.id'}.'.'.$key}) && |
|
($crstype eq 'Community')) { |
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); |
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); |
} |
} |
} elsif ($pro =~ /^course_(.*)$/) { |
} elsif ($pro =~ /^course_(.*)$/) { |
# Check for permissions inside of a course |
# Check for permissions inside of a course |
if (($env{'request.course.id'}) && |
if (($env{'request.course.id'}) && ($crstype ne 'Community') && |
(&Apache::lonnet::allowed($1,$env{'request.course.id'}. |
(&Apache::lonnet::allowed($1,$env{'request.course.id'}. |
($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')) |
($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')) |
)) { |
)) { |
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); |
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); |
} |
} |
|
} elsif ($pro =~ /^community_(.*)$/) { |
|
# Check for permissions inside of a community |
|
if (($env{'request.course.id'}) && ($crstype eq 'Community') && |
|
(&Apache::lonnet::allowed($1,$env{'request.course.id'}. |
|
($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')) |
|
)) { |
|
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); |
|
} |
} elsif ($pro eq 'author') { |
} elsif ($pro eq 'author') { |
if ($author) { |
if ($author) { |
if ((($prt eq 'rca') && ($env{'request.role'}=~/^ca/)) || |
if ((($prt eq 'rca') && ($env{'request.role'}=~/^ca/)) || |