--- loncom/interface/lonmenu.pm	2016/09/15 02:25:12	1.369.2.58
+++ loncom/interface/lonmenu.pm	2017/01/22 17:10:28	1.369.2.68
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.369.2.58 2016/09/15 02:25:12 raeburn Exp $
+# $Id: lonmenu.pm,v 1.369.2.68 2017/01/22 17:10:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -312,12 +312,12 @@ sub primary_menu {
                                                            undef,'tools')));
                     push(@primsub,$item);
                 }
-                if ($title eq 'Personal' && $env{'user.name'} && $env{'user.domain'} ) {
-                    $title = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
-                } else {
-                    $title = &mt($title);
-                }
                 if (@primsub > 0) {
+                    if ($title eq 'Personal' && $env{'user.name'} && $env{'user.domain'} ) {
+                        $title = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
+                    } else {
+                        $title = &mt($title);
+                    }
                     $menu{$position} .= &create_submenu($link,$target,$title,\@primsub,1);
                 } elsif ($link) {
                     $menu{$position} .= '<li><a href="'.$link.'" target="'.$target.'">'.&mt($title).'</a></li>';
@@ -384,13 +384,16 @@ sub secondary_menu {
                                                ? "/$env{'request.course.sec'}"
                                                : '');
     my $canedit       = &Apache::lonnet::allowed('mdc', $env{'request.course.id'});
+    my $canvieweditor = &Apache::lonnet::allowed('cev', $env{'request.course.id'}); 
     my $canviewroster = $env{'course.'.$env{'request.course.id'}.'.student_classlist_view'};
     if ($canviewroster eq 'disabled') {
         undef($canviewroster);
     }
     my $canviewgrps   = &Apache::lonnet::allowed('vcg', $crs_sec);
     my $canmodifyuser = &Apache::lonnet::allowed('cst', $crs_sec);
+    my $canviewusers  = &Apache::lonnet::allowed('vcl', $crs_sec);
     my $canviewwnew   = &Apache::lonnet::allowed('whn', $crs_sec);
+    my $canviewpara   = &Apache::lonnet::allowed('vpa', $crs_sec);
     my $canmodpara    = &Apache::lonnet::allowed('opa', $crs_sec);
     my $canvgr        = &Apache::lonnet::allowed('vgr', $crs_sec);
     my $canmgr        = &Apache::lonnet::allowed('mgr', $crs_sec);
@@ -400,7 +403,7 @@ sub secondary_menu {
     if ($env{'request.course.id'}) {
         $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
         $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
-        unless ($canedit) {
+        unless ($canedit || $canvieweditor) {
             unless (&Apache::lonnet::is_on_map("public/$cdom/$cnum/syllabus")) {
                 if (($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'}) ||
                     ($env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) ||
@@ -413,7 +416,7 @@ sub secondary_menu {
                 $showfeeds = 1;
             }
         }
-        unless ($canmgr) {
+        unless ($canmgr || $canvgr) {
             my %slots = &Apache::lonnet::get_course_slots($cnum,$cdom);
             if (keys(%slots) > 0) {
                 $showresv = 1;
@@ -443,28 +446,28 @@ sub secondary_menu {
         next if    $$menuitem[4]   ne 'always'
                 && ($$menuitem[4]  ne 'author' && $$menuitem[4] ne 'cca')
                 && !$env{'request.course.id'};
-        next if    $$menuitem[4]   =~ /^mdc/
-                && !$canedit;
-        next if    $$menuitem[4]  eq 'mdcCourse'
+        next if    $$menuitem[4]   =~ /^crsedit/
+                && (!$canedit && !$canvieweditor);
+        next if    $$menuitem[4]  eq 'crseditCourse'
                 && ($crstype eq 'Community');
-        next if    $$menuitem[4]  eq 'mdcCommunity'
+        next if    $$menuitem[4]  eq 'crseditCommunity'
                 && ($crstype eq 'Course');
         next if    $$menuitem[4]  eq 'nvgr'
                 && $canvgr;
         next if    $$menuitem[4]  eq 'vgr'
                 && !$canvgr;
-        next if    $$menuitem[4]   eq 'cst'
-                && !$canmodifyuser;
-        next if    $$menuitem[4]   eq 'ncst'
-                && ($canmodifyuser || !$canviewroster);
+        next if    $$menuitem[4]   eq 'viewusers'
+                && !$canmodifyuser && !$canviewusers;
+        next if    $$menuitem[4]   eq 'noviewusers'
+                && ($canmodifyuser || $canviewusers || !$canviewroster);
         next if    $$menuitem[4]   eq 'mgr'
                 && !$canmgr;
         next if    $$menuitem[4]   eq 'showresv'
                 && !$showresv;
         next if    $$menuitem[4]   eq 'whn'
                 && !$canviewwnew;
-        next if    $$menuitem[4]   eq 'opa'
-                && !$canmodpara;
+        next if    $$menuitem[4]   eq 'params'
+                && (!$canmodpara && !$canviewpara);
         next if    $$menuitem[4]   eq 'nvcg'
                 && ($canviewgrps || !%groups);
         next if    $$menuitem[4]   eq 'showsyllabus'
@@ -491,10 +494,11 @@ sub secondary_menu {
                     if (ref($item) eq 'ARRAY') {
                         next if ($item->[2] eq 'vgr' && !$canvgr);
                         next if ($item->[2] eq 'opa' && !$canmodpara);
-                        next if ($item->[2] eq 'cst' && !$canmodifyuser);
+                        next if ($item->[2] eq 'vpa' && !$canviewpara);
+                        next if ($item->[2] eq 'viewusers' && !($canmodifyuser || $canviewusers));
                         next if ($item->[2] eq 'mgr' && !$canmgr);
                         next if ($item->[2] eq 'vcg' && !$canviewgrps);
-                        next if ($item->[2] eq 'mdc' && !$canedit);
+                        next if ($item->[2] eq 'crsedit' && !$canedit && !$canvieweditor);
                         push(@scndsub,$item); 
                     }
                 }
@@ -674,7 +678,7 @@ sub registerurl {
 }
 
 sub innerregister {
-    my ($forcereg,$bread_crumbs,$group) = @_;
+    my ($forcereg,$bread_crumbs,$group,$pagebuttonshide) = @_;
     my $const_space = ($env{'request.state'} eq 'construct');
     my $is_const_dir = 0;
 
@@ -820,12 +824,13 @@ sub innerregister {
             $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
             $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
             $perms{'mdc'} = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
+            $perms{'cev'} = &Apache::lonnet::allowed('cev',$env{'request.course.id'});
             my @privs;
             if ($env{'request.symb'} ne '') {
                 if ($env{'request.filename'}=~/$LONCAPA::assess_re/) {
                     push(@privs,('mgr','vgr'));
                 }
-                push(@privs,'opa');
+                push(@privs,('opa','vpa'));
             }
             foreach my $priv (@privs) {
                 $perms{$priv} = &Apache::lonnet::allowed($priv,$env{'request.course.id'});
@@ -851,7 +856,7 @@ sub innerregister {
                                        'Content Submissions');
                 }
             }
-            if (($env{'request.symb'} ne '') && ($perms{'opa'})) {
+            if (($env{'request.symb'} ne '') && (($perms{'opa'}) || ($perms{'vpa'}))) {
                 $hwkadd .= &switch('','',7,3,'pparm.png','Content Settings',
                                    'parms[_2]',"gocmd('/adm/parmset','set')",
                                    'Content Settings');
@@ -861,7 +866,7 @@ sub innerregister {
 #
 # This applies to items inside a folder/page modifiable in the course.
 #
-            if (($env{'request.symb'}=~/^uploaded/) && ($perms{'mdc'})) {
+            if (($env{'request.symb'}=~/^uploaded/) && (($perms{'mdc'}) || ($perms{'cev'}))) {
                 my $text = 'Edit Folder';
                 if (($mapurl =~ /\.page$/) ||
                     ($env{'request.symb'}=~
@@ -1028,22 +1033,24 @@ ENDMENUITEMS
 	    my $addremote=0;
 	    foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} }
             if ($addremote) {
-
-                &Apache::lonhtmlcommon::clear_breadcrumb_tools();
-
-                &Apache::lonhtmlcommon::add_breadcrumb_tool(
-                    'navigation', @inlineremote[21,23]);
-
-                my $countdown;
+                my ($countdown,$buttonshide);
                 if ($env{'request.filename'} =~ /\.page$/) {
                     my %breadcrumb_tools = &Apache::lonhtmlcommon::current_breadcrumb_tools();
                     if (ref($breadcrumb_tools{'tools'}) eq 'ARRAY') {
-                        $countdown = $breadcrumb_tools{'tools'}[0];
+                        $countdown = $breadcrumb_tools{'tools'}->[0];
                     }
+                    $buttonshide = $pagebuttonshide;
                 } else {
                     $countdown = &countdown_timer();
+                    $buttonshide = &hidden_button_check();
                 }
-                if (&hidden_button_check() eq 'yes') {
+
+                &Apache::lonhtmlcommon::clear_breadcrumb_tools();
+
+                &Apache::lonhtmlcommon::add_breadcrumb_tool(
+                    'navigation', @inlineremote[21,23]);
+
+                if ($buttonshide eq 'yes') {
                     if ($countdown) {
                         &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$countdown);
                     }
@@ -1396,9 +1403,9 @@ sub get_editbutton {
     my ($cfile,$home,$switchserver,$forceedit,$forceview,$forcereg) = @_;
     my $jscall;
     if (($forceview) && ($env{'form.todocs'})) {
-        my ($folderpath,$command);
+        my ($folderpath,$command,$navmap);
         if ($env{'request.symb'}) {
-            $folderpath = &Apache::loncommon::symb_to_docspath($env{'request.symb'});
+            $folderpath = &Apache::loncommon::symb_to_docspath($env{'request.symb'},\$navmap);
         } elsif ($env{'form.folderpath'} =~ /^supplemental/) {
             $folderpath = $env{'form.folderpath'};
             $command = '&forcesupplement=1';
@@ -1406,11 +1413,16 @@ sub get_editbutton {
         $folderpath = &escape(&HTML::Entities::encode(&escape($folderpath),'<>&"'));
         $jscall = "go('/adm/coursedocs?folderpath=$folderpath$command')";
     } else {
+        my $suppanchor;
+        if ($env{'form.folderpath'}) {
+            $suppanchor = $env{'form.anchor'};
+        }
         $jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver,
                                                 $forceedit,$forcereg,$env{'request.symb'},
                                                 &escape($env{'form.folderpath'}),
                                                 &escape($env{'form.title'}),$env{'form.idx'},
-                                                &escape($env{'form.suppurl'},$env{'form.todocs'}));
+                                                &escape($env{'form.suppurl'}),$env{'form.todocs'},
+                                                $suppanchor);
     }
     if ($jscall) {
         my $icon = 'pcstr.png';
@@ -1582,9 +1594,13 @@ sub prepare_functions {
              ($resurl =~ m{^/adm/$match_domain/$match_username/aboutme$}))) {
             my @folders=split('&',$env{'form.folderpath'});
             if ((@folders > 2) || ($resurl ne '/adm/supplemental')) {
+                my $suppanchor;
+                if ($resurl =~ m{^/adm/wrapper/ext/}) {
+                    $suppanchor = $env{'form.anchor'};
+                }
                 my $esc_path=&escape(&HTML::Entities::encode(&escape($env{'form.folderpath'}),'<>&"'));
                 &switch('','',7,4,'docs-22x22.png','Edit Folder','parms[_2]',
-                        "location.href='/adm/coursedocs?command=direct&amp;forcesupplement=1&amp;supppath=$esc_path'",
+                        "location.href='/adm/coursedocs?command=direct&amp;forcesupplement=1&amp;supppath=$esc_path&amp;anchor=$suppanchor'",
                         'Folder/Page Content','','',1);
             }
         }
@@ -2344,7 +2360,7 @@ sub roles_selector {
     my ($cdom,$cnum,$httphost) = @_;
     my $crstype = &Apache::loncommon::course_type();
     my $now = time;
-    my (%courseroles,%seccount,%courseprivs);
+    my (%courseroles,%seccount,%courseprivs,%roledesc);
     my $is_cc;
     my ($js,$form,$switcher);
     my $ccrole;
@@ -2353,7 +2369,7 @@ sub roles_selector {
     } else {
         $ccrole = 'cc';
     }
-    my ($priv,$gotsymb,$destsymb);
+    my ($privref,$gotsymb,$destsymb);
     my $destinationurl = $ENV{'REQUEST_URI'};
     if ($destinationurl =~ /\?symb=/) {
         $gotsymb = 1;
@@ -2374,12 +2390,15 @@ sub roles_selector {
         my $destination = $destinationurl;
         $destination =~ s/(\?.*)$//;
         if (exists($reqprivs->{$destination})) {
-            $priv = $reqprivs->{$destination};
+            if ($reqprivs->{$destination} =~ /,/) {
+                @{$privref} = split(/,/,$reqprivs->{$destination});
+            } else {
+                $privref = [$reqprivs->{$destination}];
+            }
         }
     }
     if ($env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum}) {
         my ($start,$end) = split(/\./,$env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum});
-        
         if ((($start) && ($start<0)) || 
             (($end) && ($end<$now))  ||
             (($start) && ($now<$start))) {
@@ -2389,7 +2408,9 @@ sub roles_selector {
         }
     }
     if ($is_cc) {
-        &get_all_courseroles($cdom,$cnum,\%courseroles,\%seccount,\%courseprivs,$priv);
+        &get_all_courseroles($cdom,$cnum,\%courseroles,\%seccount,\%courseprivs);
+    } elsif ($env{'request.role'} =~ m{^\Qcr/$cdom/$cdom-domainconfig/\E(\w+)\.\Q/$cdom/$cnum\E}) {
+        &get_customadhoc_roles($cdom,$cnum,\%courseroles,\%seccount,\%courseprivs,\%roledesc,$privref);
     } else {
         my %gotnosection;
         foreach my $item (keys(%env)) {
@@ -2405,7 +2426,7 @@ sub roles_selector {
                         $gotnosection{$role} = 1;
                     }
                 }
-                if ($priv ne '') {
+                if ((ref($privref) eq 'ARRAY') && (@{$privref} > 0)) {
                     my $cnumsec = $cnum;
                     if ($sec ne '') {
                         $cnumsec .= "/$sec";
@@ -2443,7 +2464,7 @@ sub roles_selector {
     }
     if ((keys(%seccount) > 1) || ($numdiffsec > 1)) {
         my @submenu;
-        $js = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,$priv);
+        $js = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,\%roledesc,$privref);
         $form = 
             '<form name="rolechooser" method="post" action="'.$httphost.'/adm/roles">'."\n".
             '  <input type="hidden" name="destinationurl" value="'.
@@ -2483,8 +2504,17 @@ sub roles_selector {
                     $include = 1;
                 }
                 if ($include) {
+                    my $rolename;
+                    if ($role =~ m{^cr/$cdom/$cdom\-domainconfig/(\w+)(?:/\w+|$)}) {
+                        $rolename = $roledesc{$role};
+                        if ($rolename eq '') {
+                            $rolename = &mt('Helpdesk [_1]',$1);
+                        }
+                    } else {
+                        $rolename = &Apache::lonnet::plaintext($role);
+                    }
                     push(@submenu,['javascript:adhocRole('."'$role'".')',
-                                   &Apache::lonnet::plaintext($role)]);
+                                   $rolename]);
                 }
             }
         }
@@ -2565,8 +2595,94 @@ sub get_all_courseroles {
     return;
 }
 
+sub get_customadhoc_roles {
+    my ($cdom,$cnum,$courseroles,$seccount,$courseprivs,$roledesc,$privref) = @_;
+    unless ((ref($courseroles) eq 'HASH') && (ref($seccount) eq 'HASH') &&
+            (ref($courseprivs) eq 'HASH') && (ref($roledesc) eq 'HASH')) {
+        return;
+    }
+    if ($env{"user.role.dh./$cdom/"}) {
+        my ($start,$end)=split(/\./,$env{"user.role.dh./$cdom/"});
+        my $now = time;
+        if (!($start && ($now<$start)) && !($end && ($now>$end))) {
+            my ($possroles,$description) = &Apache::lonnet::get_my_adhocroles($cdom.'_'.$cnum);
+            my %available;
+            if (ref($possroles) eq 'ARRAY') {
+                map { $available{$_} = 1; } @{$possroles};
+            }
+            my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom);
+            if (ref($domdefaults{'adhocroles'}) eq 'HASH') {
+                if (keys(%{$domdefaults{'adhocroles'}})) {
+                    my $numsec = 1;
+                    my @sections;
+                    my ($allseclist,$cached) =
+                        &Apache::lonnet::is_cached_new('courseseclist',$cdom.'_'.$cnum);
+                    if (defined($cached)) {
+                        if ($allseclist ne '') {
+                            @sections = split(/,/,$allseclist);
+                            $numsec += scalar(@sections);
+                        }
+                    } else {
+                        my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum);
+                        @sections = sort(keys(%sections_count));
+                        $numsec += scalar(@sections);
+                        $allseclist = join(',',@sections);
+                        &Apache::lonnet::do_cache_new('courseseclist',$cdom.'_'.$cnum,$allseclist);
+                    }
+                    my (%adhoc,$gotprivs);
+                    my $prefix = "cr/$cdom/$cdom".'-domainconfig';
+                    foreach my $role (keys(%{$domdefaults{'adhocroles'}})) {
+                        next if (($role eq '') || ($role =~ /\W/));
+                        $seccount->{"$prefix/$role"} = $numsec;
+                        $roledesc->{"$prefix/$role"} = $description->{$role};  
+                        if ((ref($privref) eq 'ARRAY') && (@{$privref} > 0)) {
+                            if (exists($env{"user.priv.$prefix/$role./$cdom/$cnum./"})) {
+                                $courseprivs->{"$prefix/$role./$cdom/$cnum./"} =
+                                    $env{"user.priv.$prefix/$role./$cdom/$cnum./"};
+                                $courseprivs->{"$prefix/$role./$cdom/$cnum./$cdom/"} =
+                                    $env{"user.priv.$prefix/$role./$cdom/$cnum./$cdom/"};
+                                $courseprivs->{"$prefix/$role./$cdom/$cnum./$cdom/$cnum"} =
+                                    $env{"user.priv.$prefix/$role./$cdom/$cnum./$cdom/$cnum"};
+                            } else {
+                                unless ($gotprivs) {
+                                    my ($adhocroles,$privscached) =
+                                        &Apache::lonnet::is_cached_new('adhocroles',$cdom);
+                                    if ((defined($privscached)) && (ref($adhocroles) eq 'HASH')) {
+                                        %adhoc = %{$adhocroles};
+                                    } else {
+                                        my $confname = &Apache::lonnet::get_domainconfiguser($cdom);
+                                        my %roledefs = &Apache::lonnet::dump('roles',$cdom,$confname,'rolesdef_');
+                                        foreach my $key (keys(%roledefs)) {
+                                            (undef,my $rolename) = split(/_/,$key);
+                                            if ($rolename ne '') {
+                                                my ($systempriv,$domainpriv,$coursepriv) = split(/\_/,$roledefs{$key});
+                                                $coursepriv = &Apache::lonnet::course_adhocrole_privs($rolename,$cdom,$cnum,$coursepriv);
+                                                $adhoc{$rolename} = join('_',($systempriv,$domainpriv,$coursepriv));
+                                            }
+                                        }
+                                        &Apache::lonnet::do_cache_new('adhocroles',$cdom,\%adhoc);
+                                    }
+                                    $gotprivs = 1;
+                                }
+                                ($courseprivs->{"$prefix/$role./$cdom/$cnum./"},
+                                 $courseprivs->{"$prefix/$role./$cdom/$cnum./$cdom/"},
+                                 $courseprivs->{"$prefix/$role./$cdom/$cnum./$cdom/$cnum"}) =
+                                     split(/\_/,$adhoc{$role});
+                            }
+                        }
+                        if ($available{$role}) {
+                            $courseroles->{"$prefix/$role"} = \@sections;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
 sub jump_to_role {
-    my ($cdom,$cnum,$seccount,$courseroles,$courseprivs,$priv) = @_;
+    my ($cdom,$cnum,$seccount,$courseroles,$courseprivs,$roledesc,$privref) = @_;
     my %lt = &Apache::lonlocal::texthash(
                 this => 'This role has section(s) associated with it.',
                 ente => 'Enter a specific section.',
@@ -2599,29 +2715,26 @@ sub jump_to_role {
         }
     }
     my $checkroles = 0;
-    if ($priv && ref($courseprivs) eq 'HASH') {
-        my (%disallowed,%allowed,@disallow);
+    if ((ref($privref) eq 'ARRAY') && (@{$privref} > 0) && (ref($courseprivs) eq 'HASH')) {
+        my %disallowed;
         foreach my $role (sort(keys(%{$courseprivs}))) {
             my $trole;
             if ($role =~ m{^(.+?)\Q./$cdom/$cnum\E}) {
                 $trole = $1;
             }
             if (($trole ne '') && ($trole ne 'cm')) {
-                if ($courseprivs->{$role} =~ /\Q:$priv\E($|:|\&\w+)/) {
-                    $allowed{$trole} = 1;
-                } else {
-                    $disallowed{$trole} = 1;
+                $disallowed{$trole} = 1;
+                foreach my $priv (@{$privref}) { 
+                    if ($courseprivs->{$role} =~ /\Q:$priv\E($|:|\&\w+)/) {
+                        delete($disallowed{$trole});
+                        last;
+                    }
                 }
             }
         }
-        foreach my $trole (keys(%disallowed)) {
-            unless ($allowed{$trole}) {
-                push(@disallow,$trole);
-            }
-        }
-        if (@disallow > 0) {
+        if (keys(%disallowed) > 0) {
             $checkroles = 1;
-            $js .= "    var disallow = new Array('".join("','",@disallow)."');\n".
+            $js .= "    var disallow = new Array('".join("','",keys(%disallowed))."');\n".
                    "    var rolecheck = 1;\n";
         }
     }
@@ -2719,13 +2832,13 @@ END
 
 sub required_privs {
     my $privs =  {
-             '/adm/parmset'      => 'opa',
-             '/adm/courseprefs'  => 'opa',
+             '/adm/parmset'      => 'opa,vpa',
+             '/adm/courseprefs'  => 'opa,vpa',
              '/adm/whatsnew'     => 'whn',
-             '/adm/populate'     => 'cst',
+             '/adm/populate'     => 'cst,vpa,vcl',
              '/adm/trackstudent' => 'vsa',
-             '/adm/statistics'   => 'vgr',
-             '/adm/setblock'     => 'dcm',
+             '/adm/statistics'   => 'mgr,vgr',
+             '/adm/setblock'     => 'dcm,vcb',
              '/adm/coursedocs'   => 'mdc',
            };
     unless ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'spreadsheet') {