--- loncom/interface/lonmenu.pm 2009/05/08 16:08:56 1.263
+++ loncom/interface/lonmenu.pm 2009/05/18 16:29:55 1.266
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.263 2009/05/08 16:08:56 droeschl Exp $
+# $Id: lonmenu.pm,v 1.266 2009/05/18 16:29:55 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -51,8 +51,6 @@ described at http://www.lon-capa.org.
=over
-=item show_course()
-
Little texts
=item initlittle()
@@ -150,27 +148,11 @@ use vars qw(@desklines %category_names %
my @inlineremote;
-
-
-sub show_course {
- my $course = !$env{'user.adv'};
- if (!$env{'user.adv'}) {
- foreach my $env (keys(%env)) {
- next if ($env !~ m/^user\.priv\./);
- if ($env !~ m/^user\.priv\.(?:st|cm)/) {
- $course = 0;
- last;
- }
- }
- }
- return $course;
-}
-
sub initlittle {
return &Apache::lonlocal::texthash('ret' => 'Return to Last Location',
'nav' => 'Navigate Contents',
'main' => 'Main Menu',
- 'roles' => (&show_course()?
+ 'roles' => (&Apache::loncommon::show_course()?
'Courses':'Roles'),
'other' => 'Other Roles',
'docs' => 'Edit Course',
@@ -381,7 +363,6 @@ $form
-
$reg
ENDINLINEMENU
} else {
@@ -1207,7 +1188,7 @@ sub rawconfig {
my $uname=$env{'user.name'};
my $udom=$env{'user.domain'};
my $adv=$env{'user.adv'};
- my $show_course=&show_course();
+ my $show_course=&Apache::loncommon::show_course();
my $author=$env{'user.author'};
my $crs='';
if ($env{'request.course.id'}) {
@@ -1644,7 +1625,7 @@ sub roles_selector {
}
}
if ($is_cc) {
- &get_all_courseroles($cdom,$cnum,\%courseroles,\%seccount);
+ &get_all_courseroles($cdom,$cnum,\%courseroles,\%seccount);
} else {
my %gotnosection;
foreach my $item (keys(%env)) {
@@ -1662,7 +1643,7 @@ sub roles_selector {
}
if (ref($courseroles{$role}) eq 'ARRAY') {
if ($sec ne '') {
- if (!grep(/^Q$sec\E$/,@{$courseroles{$role}})) {
+ if (!grep(/^\Q$sec\E$/,@{$courseroles{$role}})) {
push(@{$courseroles{$role}},$sec);
$seccount{$role} ++;
}