--- loncom/interface/lonmenu.pm	2008/12/04 08:56:28	1.246
+++ 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.246 2008/12/04 08:56:28 tempelho 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,31 +148,15 @@ 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',
-                                       'exit' => 'Exit',
+                                       'exit' => 'Logout',
                                        'login' => 'Log In',
 				       'launch' => 'Launch Remote Control',
                                        'groups' => 'Groups',
@@ -206,8 +188,8 @@ sub menubuttons {
     my $escsymb=&escape(&Apache::lonenc::check_encrypt($env{'request.symb'}));
 
     my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
-    $logo = '<td class="LC_top_nav_logo"><a href="/adm/about.html"><img src="'.
-	$logo.'" alt="LON-CAPA Logo" /></a></td>';
+    $logo = '<a href="/adm/about.html"><img src="'.
+	$logo.'" alt="LON-CAPA Logo" class="LC_noBorder" /></a>';
 
     if ($env{'request.state'} eq 'construct') {
         if (($env{'request.noversionuri'} eq '') || (!defined($env{'request.noversionuri'}))) {
@@ -292,7 +274,7 @@ ENDMAINMENU
 	    return (<<ENDINLINEMENU);
    <table id="LC_top_nav">
     <tr>
-      $logo
+      <td>$logo</td>
       <td></td>
       <td class="LC_top_nav_login">
         <a href="/adm/roles" target="_top">$lt{'login'}</a>
@@ -301,7 +283,7 @@ ENDMAINMENU
   </table>
 ENDINLINEMENU
         }
-        $roles = '<td><a href="/adm/roles" target="_top">'.$lt{'roles'}.'</a></td>';
+        $roles = '<a href="/adm/roles" target="_top">'.$lt{'roles'}.'</a>';
 # Do we have a NAV link?
         if ($env{'request.course.id'}) {
 	    my $link='/adm/navmaps?postdata='.$escurl.'&amp;postsymb='.
@@ -310,34 +292,35 @@ ENDINLINEMENU
 		$link="javascript:gonav('".$link."')";
 	    }
 	    $navmaps=(<<ENDNAV);
-<td><a href="$link" target="_top">$lt{'nav'}</a></td>
+<li><a href="$link" target="_top">$lt{'nav'}</a></li>
 ENDNAV
             my $is_group = (&Apache::loncommon::course_type() eq 'Group');
 	    if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
                 my $text = ($is_group) ? $lt{'gdoc'} : $lt{'docs'};
 		$docs=(<<ENDDOCS);
-<td><a href="/adm/coursedocs" target="_top">$text</a></td>
+<li><a href="/adm/coursedocs" target="_top">$text</a></li>
 ENDDOCS
             }
             if ($showgroups) {
                 $groups =(<<ENDGROUPS);
-<td><a href="/adm/coursegroups" target="_top">$lt{'groups'}</a></td>
+<li><a href="/adm/coursegroups" target="_top">$lt{'groups'}</a></li>
 ENDGROUPS
             }
 	    if (&show_return_link()) {
                 my $escreload=&escape('return:');
                 $reloadlink=(<<ENDRELOAD);
-<td><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></td>
+<li><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></li>
 ENDRELOAD
             }
             if ($role_selector) {
-                $roles = '<td>'.$role_selector.'</td><td><a href="/adm/roles" target="_top">'.$lt{'other'}.'</a></td>';
+            	#$roles = '<td>'.$role_selector.'</td><td><a href="/adm/roles" target="_top">'.$lt{'other'}.'</a></td>';
+				$role_selector = '<li>'.$role_selector.'</li>';
             }
         }
 	if (($env{'request.state'} eq 'construct') && ($env{'request.course.id'})) {
 	    my $escreload=&escape('return:');
 	    $reloadlink=(<<ENDCRELOAD);
-<td><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></td>
+<li><a href="/adm/flip?postdata=$escreload" target="_top">$lt{'ret'}</a></li>
 ENDCRELOAD
         }
         my $reg='';
@@ -347,6 +330,12 @@ ENDCRELOAD
         my $form=&serverform();
 	my $utility=&utilityfunctions();
 
+	my $messagelink = "";
+	if(&Apache::lonmsg::mynewmail()){
+		$messagelink = '<a href="javascript:go(\'/adm/communicate\');">Message(new)</a>'
+	}else{
+		$messagelink = '<a href="javascript:go(\'/adm/communicate\');">Message</a>'
+	}
         my $helplink=&Apache::loncommon::top_nav_help('Help');
 	return (<<ENDINLINEMENU);
 <script type="text/javascript">
@@ -355,19 +344,21 @@ ENDCRELOAD
 $utility
 // ]]>
 </script>
-<table id="LC_top_nav">
-<tr>
-$logo
-<td><a href="/adm/menu" target="_top">$lt{'main'}</a></td>
+<ol class="LC_smallMenu LC_right">
+	<li>$logo</li>
+	<li>$messagelink</li>
+	<li>$roles</li>
+	<li>$helplink</li>
+	<li><a href="/adm/logout" target="_top">$lt{'exit'}</a></li>
+</ol>
+<ul id="LC_TabMainMenuContent">
+<li><a href="/adm/menu" target="_top">$lt{'main'}</a></li>
 $reloadlink
 $navmaps
 $docs
 $groups
-$roles
-<td style="width: 2.0em;">$helplink</td>
-<td style="width: 2.0em;"><a href="/adm/logout" target="_top">$lt{'exit'}</a></td>
-</tr>
-</table>
+$role_selector
+</ul>
 $form
 <script type="text/javascript">
 // END LON-CAPA Internal
@@ -492,7 +483,7 @@ sub innerregister {
         if ($env{'request.symb'} ne '' &&
 	    $env{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form|task)$/) {
 	    if (&Apache::lonnet::allowed('mgr',$crs)) {
-		$hwkadd.=&switch('','',7,2,'pgrd.gif','problem[_1]','grades[_3]',
+		$hwkadd.=&switch('','',7,2,'pgrd.gif','problem[_1]','grades[_4]',
                        "gocmd('/adm/grades','gradingmenu')",
                        'Modify user grades for this assessment resource');
             } elsif (&Apache::lonnet::allowed('vgr',$crs)) {
@@ -513,6 +504,12 @@ sub innerregister {
         ### resource
         ###
         my $editbutton = '';
+        my $noeditbutton = 1;
+        my ($cnum,$cdom);
+        if ($env{'request.course.id'}) {
+            $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+            $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+        }
         if ($env{'user.author'}) {
             if ($env{'request.role'}=~/^(aa|ca|au)/) {
                 # Set defaults for authors
@@ -540,6 +537,7 @@ sub innerregister {
 		foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
 		if (!$allowed) {
 		    $editbutton=&switch('','',6,1,$top,,$bottom,$action,$desc);
+                    $noeditbutton = 0;
                 }
             }
             ##
@@ -548,30 +546,53 @@ sub innerregister {
             my $cfile='';
             my $cfuname='';
             my $cfudom='';
+            my $uploaded;
             if ($env{'request.filename'}) {
                 my $file=&Apache::lonnet::declutter($env{'request.filename'});
-                $file=~s/^($match_domain)\/($match_username)/\/priv\/$2/;
-                # Check that the user has permission to edit this resource
-                ($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$1);
-                if (defined($cfudom)) {
-		    my $home=&Apache::lonnet::homeserver($cfuname,$cfudom);
-		    my $allowed=0;
-		    my @ids=&Apache::lonnet::current_machine_ids();
-		    foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
-		    if ($allowed) {
-                        $cfile=$file;
+                if (defined($cnum) && defined($cdom)) {
+                    $uploaded = &is_course_upload($file,$cnum,$cdom);
+                }
+                if (!$uploaded) {
+                    $file=~s/^($match_domain)\/($match_username)/\/priv\/$2/;
+                    # Check that the user has permission to edit this resource
+                    ($cfuname,$cfudom)=&Apache::loncacc::constructaccess($file,$1);
+                    if (defined($cfudom)) {
+		        my $home=&Apache::lonnet::homeserver($cfuname,$cfudom);
+		        my $allowed=0;
+		        my @ids=&Apache::lonnet::current_machine_ids();
+		        foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
+		        if ($allowed) {
+                            $cfile=$file;
+                        }
                     }
                 }
-            }        
+            }
             # Finally, turn the button on or off
             if ($cfile && !$const_space) {
                 $editbutton=&switch
                     ('','',6,1,'pcstr.gif','edit[_1]','resource[_2]',
                      "go('".$cfile."');","Edit this resource");
+                $noeditbutton = 0;
             } elsif ($editbutton eq '') {
                 $editbutton=&clear(6,1);
             }
         }
+        if (($noeditbutton) && ($env{'request.filename'})) { 
+            if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
+                my $file=&Apache::lonnet::declutter($env{'request.filename'});
+                if (defined($cnum) && defined($cdom)) {
+                    if (&is_course_upload($file,$cnum,$cdom)) {
+                        my $cfile = &edit_course_upload($file,$cnum,$cdom);
+                        if ($cfile) {
+                            $editbutton=&switch
+                                        ('','',6,1,'pcstr.gif','edit[_1]',
+                                         'resource[_2]',"go('".$cfile."');",
+                                         'Edit this resource');
+                        }
+                    }
+                }
+            }
+        }
         ###
         ###
 # Prepare the rest of the buttons
@@ -589,7 +610,7 @@ sub innerregister {
                 $menuitems=(<<ENDMENUITEMS);
 s&6&1&list.gif&list[_1]&dir[_1]&golist('$esc_currdir')&List current directory
 s&6&2&rtrv.gif&retrieve[_1]&version[_1]&gocstr('/adm/retrieve','/~$uname/$cleandisfn')&Retrieve old version
-s&6&3&pub.gif&publish[_1]&resource[_1]&gocstr('/adm/publish','/~$uname/$cleandisfn')&Publish this resource
+s&6&3&pub.gif&publish[_1]&resource[_3]&gocstr('/adm/publish','/~$uname/$cleandisfn')&Publish this resource
 s&7&1&del.gif&delete[_1]&resource[_2]&gocstr('/adm/cfile?action=delete','/~$uname/$cleandisfn')&Delete this resource
 s&7&2&prt.gif&prepare[_1]&printout[_1]&gocstr('/adm/printout','/~$uname/$cleandisfn')&Prepare a printable document
 ENDMENUITEMS
@@ -622,7 +643,7 @@ $menuitems.="Make notes and annotations
             unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
 		if (!$env{'request.enc'}) {
 		    $menuitems.=(<<ENDREALRES);
-s&6&3&catalog.gif&catalog[_1]&info[_1]&catalog_info()&Show catalog information
+s&6&3&catalog.gif&catalog[_2]&info[_1]&catalog_info()&Show Metadata
 ENDREALRES
                 }
 	        $menuitems.=(<<ENDREALRES);
@@ -806,6 +827,42 @@ ENDDONOTREGTHIS
     return $result;
 }
 
+sub is_course_upload {
+    my ($file,$cnum,$cdom) = @_;
+    my $uploadpath = &LONCAPA::propath($cdom,$cnum);
+    $uploadpath =~ s{^\/}{};
+    if (($file =~ m{^\Q$uploadpath\E/userfiles/docs/}) ||
+        ($file =~ m{^userfiles/\Q$cdom\E/\Q$cnum\E/docs/})) {
+        return 1;
+    }
+    return;
+}
+
+sub edit_course_upload {
+    my ($file,$cnum,$cdom) = @_;
+    my $cfile;
+    if ($file =~/\.(htm|html|css|js|txt)$/) {
+        my $ext = $1;
+        my $url = &Apache::lonnet::hreflocation('',$file);
+        my $home = &Apache::lonnet::homeserver($cnum,$cdom);
+        my @ids=&Apache::lonnet::current_machine_ids();
+        my $dest;
+        if ($home && grep(/^\Q$home\E$/,@ids)) {
+            $dest = $url.'?forceedit=1';
+        } else {
+            unless (&Apache::lonnet::get_locks()) {
+                $dest = '/adm/switchserver?otherserver='.
+                        $home.'&role='.$env{'request.role'}.
+                        '&url='.$url.'&forceedit=1';
+            }
+        }
+        if ($dest) {
+            $cfile = &HTML::Entities::encode($dest,'"<>&');
+        }
+    }
+    return $cfile;
+}
+
 sub loadevents() {
     if ($env{'request.state'} eq 'construct' ||
 	$env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
@@ -913,8 +970,9 @@ sub load_remote_msg {
         ($env{'environment.remote'} eq 'off')) { return ''; }
 
     my $esclowerurl=&escape($lowerurl);
-    my $link=&mt('<a href="[_1]">Continue</a> on in Inline Menu mode',
-		 "/adm/remote?action=collapse&amp;url=$esclowerurl");
+    my $link=&mt('[_1]Continue[_2] on in Inline Menu mode'
+                ,'<a href="/adm/remote?action=collapse&amp;url='.$esclowerurl.'">'
+                ,'</a>');
     return(<<ENDREMOTEFORM);
 <p>
 <form name="wheel">
@@ -1027,22 +1085,22 @@ sub switch {
        my $pic=
 	   '<img alt="'.$text.'" src="'.
 	   &Apache::loncommon::lonhttpdurl('/res/adm/pages/'.$img).
-	   '" align="'.($nobreak==3?'right':'left').'" />';
+	   '" align="'.($nobreak==3?'right':'left').'" class="LC_noBorder" />';
        if ($env{'browser.interface'} eq 'faketextual') {
 # Accessibility
 	   if ($nobreak==3) {
 	       $inlineremote[$idx]="\n".
 		   '<td class="LC_menubuttons_text" align="right">'.$text.
-		   '</td><td class="LC_menubuttons_img" align="left">'.
+		   '</td><td align="left">'.
 		   '<a href="javascript:'.$act.';">'.$pic.'</a></td></tr>';
 	   } elsif ($nobreak) {
 	       $inlineremote[$idx]="\n<tr>".
-		   '<td class="LC_menubuttons_img" align="left">'.
+		   '<td align="left">'.
 		   '<a href="javascript:'.$act.';">'.$pic.'</a></td>
                     <td class="LC_menubuttons_text" align="left"><a class="LC_menubuttons_link" href="javascript:'.$act.';"><span class="LC_menubuttons_inline_text">'.$text.'</span></a></td>';
 	   } else {
 	       $inlineremote[$idx]="\n<tr>".
-		   '<td class="LC_menubuttons_img" align="left">'.
+		   '<td align="left">'.
 		   '<a href="javascript:'.$act.';">'.$pic.
 		   '</a></td><td class="LC_menubuttons_text" colspan="3">'.
 		   '<a class="LC_menubuttons_link" href="javascript:'.$act.';"><span class="LC_menubuttons_inline_text">'.$desc.'</span></a></td></tr>';
@@ -1093,10 +1151,10 @@ sub inlinemenu {
         for (my $row=1; $row<=8; $row++) {
             foreach my $cat (keys(%category_members)) {
                if ($category_positions{$cat} ne "$col,$row") { next; }
-               #$output.='<table id="LC_menubuttons_mainmenu"><tr><td colspan="4" class="LC_menubuttons_category">'.&mt($category_names{$cat}).'</td></tr>';
-               $output.='<div class="ContentBoxSpecial">';
-	       $output.='<h4 class="hcell">'.&mt($category_names{$cat}).'</h4>';
-               $output.='<table id="LC_menubuttons_mainmenu">';
+               #$output.='<table><tr><td colspan="4" class="LC_menubuttons_category">'.&mt($category_names{$cat}).'</td></tr>';
+               $output.='<div class="LC_ContentBoxSpecial">';
+	       $output.='<h4 class="LC_hcell">'.&mt($category_names{$cat}).'</h4>';
+               $output.='<table>';
                my %active=();
                foreach my $menu_item (split(/\:/,$category_members{$cat})) {
                   if ($inlineremote[$menu_item]) {
@@ -1105,7 +1163,6 @@ sub inlinemenu {
                }  
                foreach my $item (sort(keys(%active))) {
                   $output.=$inlineremote[$item];
-		&Apache::lonnet::logthis("item=$item output=$inlineremote[$item]");
                }
                $output.='</table>';
                $output.='</div>';
@@ -1131,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'}) {
@@ -1225,6 +1282,33 @@ sub rawconfig {
                     }
                 }
             }
+        } elsif ($pro eq 'tools') {
+            my @tools = ('aboutme','blog','portfolio');
+            if (grep(/^\Q$prt\E$/,@tools)) {
+                if (!&Apache::lonnet::usertools_access($env{'user.name'},
+                                                       $env{'user.domain'},
+                                                       $prt,undef,'tools')) {
+                    $output.=&clear($row,$col);
+                    next;
+                }
+            } elsif ($prt eq 'reqcrs') {
+                my $showreqcrs = 0;
+                foreach my $type ('official','unofficial') {
+                    if (&Apache::lonnet::usertools_access($env{'user.name'},
+                                                    $env{'user.domain'},
+                                                    $type,undef,'requestcourses')) {
+                        $showreqcrs = 1;
+                        last;
+                    }
+                }
+                if (!$showreqcrs) {
+                    $output.=&clear($row,$col);
+                    next;
+                }
+            }
+            $prt='any';
+            $output.=&secondlevel(
+          $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat);
         }
     }
     unless (($env{'browser.interface'} eq 'textual') ||
@@ -1441,16 +1525,16 @@ function set_bookmark() {
    bmquery=window.open('','bmquery','width=365,height=165,scrollbars=0');
    bmquery.document.write(
    '$start_page_bookmark'
-   +"<center><form method='post'"
-   +" name='newlink' action='/adm/bookmarks' target='bmquery' "
-   +">\\n <table width=340 height=150 "
-   +"bgcolor='ffffff' align=center><tr><td>Link Name:<br /><input "
-   +"type='text' name='title' size=45 value='"+clienttitle+"' />"
-   +"<br />Address:<br /><input type='text' name='address' size='45' "
-   +"value='"+clienthref+"' /><br /><center><input type='submit' "
-   +"value='Save' /> <input type='button' value='Close (no save)' "
-   +"onclick='javascript:window.close();' /><\\/center><\\/td>"
-   +"<\\/tr><\\/table><\\/form><\\/center>"
+   +'<center><form method="post"'
+   +' name="newlink" action="/adm/bookmarks" target="bmquery" '
+   +'> <table width="340" height="150" '
+   +'bgcolor="#FFFFFF" align="center"><tr><td>Link Name:<br /><input '
+   +'type="text" name="title" size="45" value="'+clienttitle+'" />'
+   +'<br />Address:<br /><input type="text" name="address" size="45" '
+   +'value="'+clienthref+'" /><br /><center><input type="submit" '
+   +'value="Save" /> <input type="button" value="Close" '
+   +'onclick="javascript:window.close();" /></center></td>'
+   +'</tr></table></form></center>'
    +'$end_page_bookmark' );
    bmquery.document.close();
 }
@@ -1526,7 +1610,7 @@ sub hidden_button_check {
 sub roles_selector {
     my ($cdom,$cnum) = @_;
     my $now = time;
-    my (%courseroles,%seccount,%gotnosection);
+    my (%courseroles,%seccount);
     my $is_cc;
     my $role_selector;
     if ($env{'user.role.cc./'.$cdom.'/'.$cnum}) {
@@ -1541,35 +1625,9 @@ sub roles_selector {
         }
     }
     if ($is_cc) {
-        my %adv_roles =
-             &Apache::lonnet::get_course_adv_roles($env{'request.course.id'},1);
-        foreach my $role (keys(%adv_roles)) {
-            my ($urole,$usec) = split(/:/,$role);
-            if (!$gotnosection{$urole}) {
-                $seccount{$urole} ++;
-                $gotnosection{$urole} = 1;
-            }
-            if (ref($courseroles{$urole}) eq 'ARRAY') {
-                if ($usec ne '') {
-                    if (!grep(/^Q$usec\E$/,@{$courseroles{$urole}})) {
-                        push(@{$courseroles{$urole}},$usec);
-                        $seccount{$urole} ++;
-                    }
-                }
-            } else {
-                @{$courseroles{$urole}} = ();
-                if ($usec ne '') {
-                    $seccount{$urole} ++;
-                    push(@{$courseroles{$urole}},$usec);
-                }
-            }
-        }
-        my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum);
-        @{$courseroles{'st'}} = ();
-        if (keys(%sections_count) > 0) {
-            push(@{$courseroles{'st'}},keys(%sections_count));
-        }
+        &get_all_courseroles($cdom,$cnum,\%courseroles,\%seccount);
     } else {
+        my %gotnosection;
         foreach my $item (keys(%env)) {
             if ($item =~ m-^user\.role\.([^.]+)\./\Q$cdom\E/\Q$cnum\E/?(\w*)$-) {
                 my $role = $1;
@@ -1585,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} ++;
                         }
@@ -1627,6 +1685,61 @@ sub roles_selector {
     return $role_selector;
 }
 
+sub get_all_courseroles {
+    my ($cdom,$cnum,$courseroles,$seccount) = @_;
+    unless ((ref($courseroles) eq 'HASH') && (ref($seccount) eq 'HASH')) {
+        return;
+    }
+    my ($result,$cached) = 
+        &Apache::lonnet::is_cached_new('getcourseroles',$cdom.'_'.$cnum);
+    if (defined($cached)) {
+        if (ref($result) eq 'HASH') {
+            if ((ref($result->{'roles'}) eq 'HASH') && 
+                (ref($result->{'seccount'}) eq 'HASH')) {
+                %{$courseroles} = %{$result->{'roles'}};
+                %{$seccount} = %{$result->{'seccount'}};
+                return;
+            }
+        }
+    }
+    my %gotnosection;
+    my %adv_roles =
+         &Apache::lonnet::get_course_adv_roles($env{'request.course.id'},1);
+    foreach my $role (keys(%adv_roles)) {
+        my ($urole,$usec) = split(/:/,$role);
+        if (!$gotnosection{$urole}) {
+            $seccount->{$urole} ++;
+            $gotnosection{$urole} = 1;
+        }
+        if (ref($courseroles->{$urole}) eq 'ARRAY') {
+            if ($usec ne '') {
+                if (!grep(/^Q$usec\E$/,@{$courseroles->{$urole}})) {
+                    push(@{$courseroles->{$urole}},$usec);
+                    $seccount->{$urole} ++;
+                }
+            }
+        } else {
+            @{$courseroles->{$urole}} = ();
+            if ($usec ne '') {
+                $seccount->{$urole} ++;
+                push(@{$courseroles->{$urole}},$usec);
+            }
+        }
+    }
+    my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum,['st']);
+    @{$courseroles->{'st'}} = ();
+    if (keys(%sections_count) > 0) {
+        push(@{$courseroles->{'st'}},keys(%sections_count));
+        $seccount->{'st'} = scalar(keys(%sections_count)); 
+    }
+    my $rolehash = {
+                     'roles'    => $courseroles,
+                     'seccount' => $seccount,
+                   };
+    &Apache::lonnet::do_cache_new('getcourseroles',$cdom.'_'.$cnum,$rolehash);
+    return;
+}
+
 sub jump_to_role {
     my ($cdom,$cnum,$seccount,$courseroles) = @_;
     my %lt = &Apache::lonlocal::texthash(