--- loncom/interface/lonmenu.pm 2020/01/19 00:54:47 1.369.2.79.2.1 +++ loncom/interface/lonmenu.pm 2013/01/07 22:36:11 1.409 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.369.2.79.2.1 2020/01/19 00:54:47 raeburn Exp $ +# $Id: lonmenu.pm,v 1.409 2013/01/07 22:36:11 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -106,11 +106,10 @@ secondary_menu(). =item primary_menu() -This routine evaluates @primary_menu and returns a two item array, -with the array elements containing XHTML for the left and right sides of -the menu that contains the following links: About, Message, Roles, Help, Logout +This routine evaluates @primary_menu and returns XHTML for the menu +that contains following links: About, Message, Roles, Help, Logout @primary_menu is filled within the BEGIN block of this module with -entries from mydesk.tab +entries from mydesk.tab =item secondary_menu() @@ -118,72 +117,20 @@ Same as primary_menu() but operates on @ =item create_submenu() -Creates XHTML for unordered list of sub-menu items which belong to a +Creates XHTML for unordered list of sub-menu items which belong to a particular top-level menu item. Uses hover pseudo class in css to display -dropdown list when mouse hovers over top-level item. Support for IE6 +dropdown list when mouse hovers over top-level item. Support for IE6 (no hover psuedo class) via LC_hoverable class for
  • tag for top- level item, which employs jQuery to handle behavior on mouseover. -Inputs: 6 - (a) link and (b) target for anchor href in top level item, +Inputs: 4 - (a) link and (b) target for anchor href in top level item, (c) title for text wrapped by anchor tag in top level item. (d) reference to array of arrays of sub-menu items. - (e) boolean to indicate whether to call &mt() to translate - name of menu item, - (f) optional class for
  • element in primary menu, for which - sub menu is being generated. - -The underlying datastructure used in (d) contains data from mydesk.tab. -It consists of an array which has an array for each item appearing in -the menu (e.g. [["link", "title", "condition"]] for a single-item menu). -create_submenu() supports also the creation of XHTML for nested dropdown -menus represented by unordered lists. This is done by replacing the -scalar used for the link with an arrayreference containing the menuitems -for the nested menu. This can be done recursively so that the next menu -may also contain nested submenus. - - Example: - [ # begin of datastructure - ["/home/", "Home", "condition1"], # 1st item of the 1st layer menu - [ # 2nd item of the 1st layer menu - [ # anon. array for nested menu - ["/path1", "Path1", undef], # 1st item of the 2nd layer menu - ["/path2", "Path2", undef], # 2nd item of the 2nd layer menu - [ # 3rd item of the 2nd layer menu - [[...], [...], ..., [...]], # containing another menu layer - "Sub-Sub-Menu", # title for this container - undef - ] - ], # end of array/nested menu - "Sub-Menu", # title for the container item - undef - ] # end of 2nd item of the 1st layer menu -] - =item innerregister() This gets called in order to register a URL in the body of the document -=item loadevents() - -=item unloadevents() - -=item startupremote() - -=item setflags() - -=item maincall() - -=item load_remote_msg() - -=item get_menu_name() - -=item reopenmenu() - -=item open() - -Open the menu - =item clear() =item switch() @@ -235,7 +182,7 @@ use HTML::Entities(); use Apache::lonwishlist(); use vars qw(@desklines %category_names %category_members %category_positions - $readdesk @primary_menu %primary_submenu @secondary_menu %secondary_submenu); + $readdesk @primary_menu %primary_submenu @secondary_menu); my @inlineremote; @@ -256,16 +203,15 @@ sub prep_menuitem { . qq| href="$$menuitem[0]" target="_top">$link
    • |; } -# primary_menu() evaluates @primary_menu and returns a two item array, -# with the array elements containing XHTML for the left and right sides of -# the menu that contains the following links: -# Personal, About, Message, Roles, Help, Logout +# primary_menu() evaluates @primary_menu and returns XHTML for the menu +# that contains following links: +# About, Message, Personal, Roles, Help, Logout # @primary_menu is filled within the BEGIN block of this module with # entries from mydesk.tab sub primary_menu { - my %menu; + my $menu; # each element of @primary contains following array: - # (link url, icon path, alt text, link text, condition, position) + # (link url, icon path, alt text, link text, condition) my $public; if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) || (($env{'user.name'} eq '') && ($env{'user.domain'} eq ''))) { @@ -290,10 +236,6 @@ sub primary_menu { && !&Apache::loncommon::show_course(); ## my $title = $menuitem->[3]; - my $position = $menuitem->[5]; - if ($position eq '') { - $position = 'right'; - } if (defined($primary_submenu{$title})) { my ($link,$target); if ($menuitem->[0] ne '') { @@ -305,22 +247,17 @@ sub primary_menu { my @primsub; if (ref($primary_submenu{$title}) eq 'ARRAY') { foreach my $item (@{$primary_submenu{$title}}) { - next if (($item->[2] eq 'wishlist') && (!$env{'user.adv'})); - next if ((($item->[2] eq 'portfolio') || - ($item->[2] eq 'blog')) && + next if (($item->[2] eq 'wishlist') && (!$env{'user.adv'})); + next if ((($item->[2] eq 'portfolio') || + ($item->[2] eq 'blog')) && (!&Apache::lonnet::usertools_access('','',$item->[2], undef,'tools'))); push(@primsub,$item); } 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); + $menu .= &create_submenu($link,$target,$title,\@primsub); } elsif ($link) { - $menu{$position} .= '
  • '.&mt($title).'
    • '; + $menu .= '
  • '.&mt($title).'
    • '; } } } elsif ($$menuitem[3] eq 'Help') { # special treatment for helplink @@ -331,23 +268,19 @@ sub primary_menu { 'helpdeskmail', $defdom,$origmail); if ($to ne '') { - $menu{$position} .= &prep_menuitem($menuitem); + $menu .= &prep_menuitem($menuitem); } } else { - $menu{$position} .= '
  • '.&Apache::loncommon::top_nav_help('Help').'
    • '; + $menu .= '
  • '.&Apache::loncommon::top_nav_help('Help').'
    • '; } } else { - $menu{$position} .= prep_menuitem($menuitem); + $menu .= prep_menuitem($menuitem); } } - my @output = ('',''); - if ($menu{'left'} ne '') { - $output[0] = "
      $menu{'left'}
    "; - } - if ($menu{'right'} ne '') { - $output[1] = "
      $menu{'right'}
    "; - } - return @output; + $menu =~ s/\[domain\]/$env{'user.domain'}/g; + $menu =~ s/\[user\]/$env{'user.name'}/g; + + return "
      $menu
    "; } #returns hashref {user=>'',dom=>''} containing: @@ -376,7 +309,6 @@ sub getauthor{ } sub secondary_menu { - my ($httphost) = @_; my $menu; my $crstype = &Apache::loncommon::course_type(); @@ -384,58 +316,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 $canviewgrps = &Apache::lonnet::allowed('vcg', $crs_sec); + my $canmodifyuser = &Apache::lonnet::allowed('cst', $crs_sec); + my $canviewwnew = &Apache::lonnet::allowed('whn', $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); + my $canmgr = &Apache::lonnet::allowed('mgr', $crs_sec); my $author = &getauthor(); - my ($cdom,$cnum,$showsyllabus,$showfeeds,$showresv,$grouptools); - $grouptools = 0; - if ($env{'request.course.id'}) { - $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; - $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; - 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'}) || - ($env{'course.'.$env{'request.course.id'}.'.updatedsyllabus'}) || - ($env{'request.course.syllabustime'})) { - $showsyllabus = 1; - } - } - if ($env{'request.course.feeds'}) { - $showfeeds = 1; - } - } - unless ($canmgr || $canvgr) { - my %slots = &Apache::lonnet::get_course_slots($cnum,$cdom); - if (keys(%slots) > 0) { - $showresv = 1; - } - } - if ($env{'request.course.groups'} ne '') { - foreach my $group (split(/:/,$env{'request.course.groups'})) { - next unless ($group =~ /^\w+$/); - my @privs = split(/:/,$env{"user.priv.$env{'request.role'}./$cdom/$cnum/$group"}); - shift(@privs); - if (@privs) { - $grouptools ++; - } - } - } - } - - my ($canmodifycoauthor); + my ($canmodifycoauthor); if ($env{'request.role'} eq "au./$env{'user.domain'}/") { my $extent = "$env{'user.domain'}/$env{'user.name'}"; if ((&Apache::lonnet::allowed('cca',$extent)) || @@ -444,113 +334,54 @@ sub secondary_menu { } } + my %groups = &Apache::lonnet::get_active_groups( + $env{'user.domain'}, $env{'user.name'}, + $env{'course.' . $env{'request.course.id'} . '.domain'}, + $env{'course.' . $env{'request.course.id'} . '.num'}); + my ($roleswitcher_js,$roleswitcher_form); foreach my $menuitem (@secondary_menu) { # evaluate conditions next if ref($menuitem) ne 'ARRAY'; next if $$menuitem[4] ne 'always' - && ($$menuitem[4] ne 'author' && $$menuitem[4] ne 'cca') + && ($$menuitem[4] ne 'author' && $$menuitem[4] ne 'cca') && !$env{'request.course.id'}; - next if $$menuitem[4] =~ /^crsedit/ - && (!$canedit && !$canvieweditor); - next if $$menuitem[4] eq 'crseditCourse' - && ($crstype eq 'Community'); - next if $$menuitem[4] eq 'crseditCommunity' - && ($crstype eq 'Course'); + next if $$menuitem[4] =~ /^mdc/ + && !$canedit; next if $$menuitem[4] eq 'nvgr' && $canvgr; next if $$menuitem[4] eq 'vgr' && !$canvgr; - next if $$menuitem[4] eq 'viewusers' - && !$canmodifyuser && !$canviewusers; - next if $$menuitem[4] eq 'noviewusers' - && ($canmodifyuser || $canviewusers || !$canviewroster); + next if $$menuitem[4] eq 'cst' + && !$canmodifyuser; + next if $$menuitem[4] eq 'ncst' + && ($canmodifyuser || !$canviewroster); next if $$menuitem[4] eq 'mgr' && !$canmgr; - next if $$menuitem[4] eq 'showresv' - && !$showresv; + next if $$menuitem[4] eq 'nmgr' + && $canmgr; next if $$menuitem[4] eq 'whn' && !$canviewwnew; - next if $$menuitem[4] eq 'params' - && (!$canmodpara && !$canviewpara); - next if $$menuitem[4] eq 'nvcg' - && ($canviewgrps || !$grouptools); - next if $$menuitem[4] eq 'showsyllabus' - && !$showsyllabus; - next if $$menuitem[4] eq 'showfeeds' - && !$showfeeds; + next if $$menuitem[4] eq 'opa' + && !$canmodpara; + next if $$menuitem[4] =~ /showgroups$/ + && !$canviewgrps + && !%groups; next if $$menuitem[4] eq 'author' && !$author; next if $$menuitem[4] eq 'cca' && !$canmodifycoauthor; - my $title = $menuitem->[3]; - if (defined($secondary_submenu{$title})) { - my ($link,$target); - if ($menuitem->[0] ne '') { - $link = $menuitem->[0]; - $target = '_top'; - } else { - $link = '#'; - } - my @scndsub; - if (ref($secondary_submenu{$title}) eq 'ARRAY') { - foreach my $item (@{$secondary_submenu{$title}}) { - if (ref($item) eq 'ARRAY') { - next if ($item->[2] eq 'vgr' && !$canvgr); - next if ($item->[2] eq 'opa' && !$canmodpara); - 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 'crsedit' && !$canedit && !$canvieweditor); - next if ($item->[2] eq 'params' && !$canmodpara && !$canviewpara); - next if ($item->[2] eq 'author' && !$author); - next if ($item->[2] eq 'cca' && !$canmodifycoauthor); - push(@scndsub,$item); - } - } - if (@scndsub > 0) { - $menu .= &create_submenu($link,$target,$title,\@scndsub,1); - } elsif ($link ne '#') { - $menu .= '
  • '.&mt($title).'
    • '; - } - } - } elsif ($$menuitem[3] eq 'Roles' && $env{'request.course.id'}) { + if ($$menuitem[3] eq 'Roles' && $env{'request.course.id'}) { # special treatment for role selector ($roleswitcher_js,$roleswitcher_form,my $switcher) = &roles_selector( $env{'course.' . $env{'request.course.id'} . '.domain'}, - $env{'course.' . $env{'request.course.id'} . '.num'}, - $httphost + $env{'course.' . $env{'request.course.id'} . '.num'} ); $menu .= $switcher; } else { - if ($$menuitem[3] eq 'Syllabus' && $env{'request.course.id'}) { - my $url = $$menuitem[0]; - $url =~ s{\[cdom\]/\[cnum\]}{$cdom/$cnum}; - if (&Apache::lonnet::is_on_map($url)) { - unless ($$menuitem[0] =~ /(\?|\&)register=1/) { - $$menuitem[0] .= (($$menuitem[0]=~/\?/)? '&' : '?').'register=1'; - } - } else { - $$menuitem[0] =~ s{\&?register=1}{}; - } - if ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://}) { - if (($ENV{'SERVER_PORT'} == 443) || ($env{'request.use_absolute'} =~ m{^https://})) { - unless (&Apache::lonnet::uses_sts()) { - unless ($$menuitem[0] =~ m{^https?://}) { - $$menuitem[0] = 'http://'.$ENV{'SERVER_NAME'}.$$menuitem[0]; - } - unless ($$menuitem[0] =~ /(\&|\?)usehttp=1/) { - $$menuitem[0] .= (($$menuitem[0]=~/\?/) ? '&' : '?').'usehttp=1'; - } - } - } - } - $$menuitem[0] = &HTML::Entities::encode($$menuitem[0],'&<>"'); - } $menu .= &prep_menuitem(\@$menuitem); } } @@ -568,16 +399,12 @@ sub secondary_menu { my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; ($escurl = $env{'request.filename'}) =~ s{^\Q$londocroot\E}{}; $escurl = &escape($escurl); - } + } $menu =~ s/\[url\]/$escurl/g; $menu =~ s/\[symb\]/$escsymb/g; } $menu =~ s/\[uname\]/$$author{user}/g; $menu =~ s/\[udom\]/$$author{dom}/g; - if ($env{'request.course.id'}) { - $menu =~ s/\[cnum\]/$cnum/g; - $menu =~ s/\[cdom\]/$cdom/g; - } if ($menu) { $menu = ""; } @@ -588,133 +415,38 @@ sub secondary_menu { } sub create_submenu { - my ($link,$target,$title,$submenu,$translate,$addclass) = @_; + my ($link,$target,$title,$submenu) = @_; return unless (ref($submenu) eq 'ARRAY'); my $disptarget; if ($target ne '') { $disptarget = ' target="'.$target.'"'; } - my $menu = '
  • '. + my $menu = '
  • '. ''. - ''.$title. + ''.&mt($title). ''. ' ▼'. '
    • '; - - return $menu; -} - -# helper routine for create_submenu -# build the dropdown (and nested submenus) recursively -# see perldoc create_submenu documentation for further information -sub build_submenu { - my ($target, $submenu, $translate, $first_level) = @_; - unless (@{$submenu}) { - return ''; - } - - my $menu = ''; my $count = 0; my $numsub = scalar(@{$submenu}); foreach my $item (@{$submenu}) { $count ++; if (ref($item) eq 'ARRAY') { - my $href = $item->[0]; - my $bordertop; my $borderbot; - my $title; - - if ($translate) { - $title = &mt($item->[1]); - } else { - $title = $item->[1]; - } - - if ($count == 1 && !$first_level) { - $bordertop = 'border-top: 1px solid black;'; - } if ($count == $numsub) { - $borderbot = 'border-bottom: 1px solid black;'; - } - - # href is a reference to another submenu - if (ref($href) eq 'ARRAY') { - $menu .= '
  • '; - $menu .= '

    ' - . $title . '▶

    '; - $menu .= ''; - $menu .= '
    • '; - } else { # href is the actual hyperlink and does not represent another submenu - # for the current menu title - if ($href =~ /(aboutme|rss\.html)$/) { - next unless (($env{'user.name'} ne '') && ($env{'user.domain'} ne '')); - $href =~ s/\[domain\]/$env{'user.domain'}/g; - $href =~ s/\[user\]/$env{'user.name'}/g; - } elsif (($href =~ m{^/adm/preferences\?}) && ($href =~ /\[returnurl\]/)) { - my $returnurl = $ENV{'REQUEST_URI'}; - if ($ENV{'REQUEST_URI'} =~ m{/adm/preferences\?action=(?:changedomcoord|authorsettings)\&returnurl=([^\&]+)$}) { - $returnurl = $1; - } - if (($returnurl =~ m{^/adm/createuser($|\?action=)}) || - ($returnurl =~ m{^/priv/$match_domain/$match_username}) || - ($returnurl =~ m{^/res(/?$|/$match_domain/$match_username)})) { - $returnurl =~ s{\?.*$}{}; - $returnurl = '&returnurl='.&HTML::Entities::encode($returnurl,'"<>&\''); - } else { - undef($returnurl); - } - $href =~ s/\[returnurl\]/$returnurl/; - } - unless (($href eq '') || ($href =~ /^\#/)) { - $target = ' target="_top"'; - } - - $menu .= '
  • '; - $menu .= '' . $title . ''; - $menu .= '
    • '; + $borderbot = 'border-bottom:1px solid black;'; } + $menu .= '
  • '. + &mt($item->[1]).'
    • '; } } + $menu .= ''; return $menu; } -sub registerurl { - my ($forcereg) = @_; - my $result = ''; - if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; } - my $force_title=''; - if ($env{'request.state'} eq 'construct') { - $force_title=&Apache::lonxml::display_title(); - } - if (($env{'environment.remote'} ne 'on') || - ((($env{'request.publicaccess'}) || - (!&Apache::lonnet::is_on_map( - &unescape($env{'request.noversionuri'})))) && - (!$forcereg))) { - return - $result - .'' - .$force_title; - } -# Graphical display after login only - if ($env{'request.registered'} && !$forcereg) { return ''; } - $result.=&innerregister($forcereg); - return $result.$force_title; -} - sub innerregister { - my ($forcereg,$bread_crumbs,$group,$pagebuttonshide,$hostname) = @_; + my ($forcereg,$bread_crumbs,$group) = @_; my $const_space = ($env{'request.state'} eq 'construct'); my $is_const_dir = 0; @@ -722,84 +454,45 @@ sub innerregister { $env{'request.registered'} = 1; - my $noremote = ($env{'environment.remote'} ne 'on'); - undef(@inlineremote); - my $reopen=&Apache::lonmenu::reopenmenu(); - - my $newmail=''; - - if (&Apache::lonmsg::newmail() && !$noremote) { - # We have new mail and remote is up - $newmail= 'swmenu.setstatus("you have","messages");'; - } - - my ($mapurl,$resurl,$crstype,$navmap); + my ($mapurl,$resurl); if ($env{'request.course.id'}) { -# -#course_type: Course or Community -# - $crstype = &Apache::loncommon::course_type(); if ($env{'request.symb'}) { - my $ignorenull; - unless ($env{'request.noversionuri'} eq '/adm/navmaps') { - $ignorenull = 1; - } - my $symb = &Apache::lonnet::symbread('','',$ignorenull); - ($mapurl, my $rid, $resurl) = &Apache::lonnet::decode_symb($symb); + ($mapurl, my $rid, $resurl) = &Apache::lonnet::decode_symb(&Apache::lonnet::symbread()); my $coursetitle = $env{'course.'.$env{'request.course.id'}.'.description'}; my $maptitle = &Apache::lonnet::gettitle($mapurl); - my $restitle = &Apache::lonnet::gettitle($symb); + my $restitle = &Apache::lonnet::gettitle(&Apache::lonnet::symbread()); - my (@crumbs,@mapcrumbs); - if (($env{'request.noversionuri'} ne '/adm/navmaps') && ($mapurl ne '') && - ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'})) { - $navmap = Apache::lonnavmaps::navmap->new(); - if (ref($navmap)) { - @mapcrumbs = $navmap->recursed_crumbs($mapurl,$restitle); - } - } - unless (($forcereg) && +#SD +#course_type only Course and Community? +# + my @crumbs; + unless (($forcereg) && ($env{'request.noversionuri'} eq '/adm/navmaps') && ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'})) { - @crumbs = ({text => $crstype.' Contents', + @crumbs = ({text => Apache::loncommon::course_type() + . ' Contents', href => "Javascript:gopost('/adm/navmaps','')"}); } if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) { - if (@mapcrumbs) { - push(@crumbs,@mapcrumbs); - } else { - push(@crumbs, {text => '...', - no_mt => 1}); - } + push(@crumbs, {text => '...', + no_mt => 1}); } - unless ((@mapcrumbs) || (!$maptitle) || ($maptitle eq 'default.sequence') || - ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'})) { - push @crumbs, {text => $maptitle, no_mt => 1, - href => &Apache::lonnet::clutter($mapurl).'?navmap=1'}; - } - if ($restitle && !@mapcrumbs) { - push(@crumbs,{text => $restitle, no_mt => 1}); - } - my @tools; - if ($env{'request.filename'} =~ /\.page$/) { - my %breadcrumb_tools = &Apache::lonhtmlcommon::current_breadcrumb_tools(); - if (ref($breadcrumb_tools{'tools'}) eq 'ARRAY') { - @tools = @{$breadcrumb_tools{'tools'}}; - } - } + push @crumbs, {text => $maptitle, no_mt => 1} if ($maptitle + && $maptitle ne 'default.sequence' + && $maptitle ne $coursetitle); + + push @crumbs, {text => $restitle, no_mt => 1} if $restitle; &Apache::lonhtmlcommon::clear_breadcrumbs(); &Apache::lonhtmlcommon::add_breadcrumb(@crumbs); - if (@tools) { - &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',@tools); - } } else { $resurl = $env{'request.noversionuri'}; my $courseurl = &Apache::lonnet::courseid_to_courseurl($env{'request.course.id'}); + my $crstype = &Apache::loncommon::course_type(); my $title = &mt('View Resource'); if ($resurl =~ m{^\Q/uploaded$courseurl/supplemental/\E(default|\d+)/}) { &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['folderpath','title']); @@ -809,7 +502,7 @@ sub innerregister { } my $trail; if ($env{'form.folderpath'}) { - &prepare_functions($resurl,$forcereg,$group,undef,undef,1,$hostname); + &prepare_functions($resurl,$forcereg,$group,undef,undef,1); ($trail) = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); } else { @@ -817,18 +510,10 @@ sub innerregister { {text => "Supplemental $crstype Content", href => "javascript:gopost('/adm/supplemental','')"}); $title = &mt('View Resource'); - ($trail) = + ($trail) = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); } return $trail; - } elsif ($resurl =~ m{^\Q/uploaded$courseurl/portfolio/syllabus/}) { - &Apache::lonhtmlcommon::clear_breadcrumbs(); - &prepare_functions('/public'.$courseurl."/syllabus", - $forcereg,$group,undef,undef,1,$hostname); - $title = &mt('Syllabus File'); - my ($trail) = - &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,$hostname); - return $trail; } unless ($env{'request.state'} eq 'construct') { &Apache::lonhtmlcommon::clear_breadcrumbs(); @@ -843,99 +528,83 @@ sub innerregister { &Apache::lonhtmlcommon::add_breadcrumb({text => 'View Resource'}); } } - my $timesync = ( $noremote ? '' : 'swmenu.syncclock(1000*'.time.');' ); # ============================================================================= # ============================ This is for URLs that actually can be registered - if ( ($env{'request.noversionuri'}!~m{^/(res/)*adm/}) - || ($forcereg)) { - - my %swtext; - if ($noremote) { - %swtext = &get_inline_text(); - } else { - %swtext = &get_rc_text(); - } - my $hwkadd=''; - - my ($cdom,$cnum,%perms,$cfile,$switchserver,$home,$forceedit, - $forceview,$editbutton); - if (($resurl =~ m{^/adm/($match_domain)/($match_username)/aboutme$}) || - ($env{'request.role'} !~/^(aa|ca|au)/)) { - if (($env{'environment.remote'} eq 'on') && ($env{'request.symb'})) { - &Apache::lonhtmlcommon::clear_breadcrumbs(); - } - $editbutton = &prepare_functions($resurl,$forcereg,$group,'','','',$hostname); - } - if ($editbutton eq '') { - $editbutton = &clear(6,1); - } + return '' unless ( ($env{'request.noversionuri'}!~m{^/(res/)*adm/}) + || $forcereg ); + my ($cdom,$cnum,%perms,$cfile,$switchserver,$home,$forceedit, + $forceview,$editbutton); + if (($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) || + ($env{'request.role'} !~/^(aa|ca|au)/)) { + $editbutton = &prepare_functions($resurl,$forcereg,$group); + } + if ($editbutton eq '') { + $editbutton = &clear(6,1); + } # # This applies in course context # - if ($env{'request.course.id'}) { - $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','vpa')); - } - foreach my $priv (@privs) { - $perms{$priv} = &Apache::lonnet::allowed($priv,$env{'request.course.id'}); - if (!$perms{$priv} && $env{'request.course.sec'} ne '') { - $perms{$priv} = - &Apache::lonnet::allowed($priv,"$env{'request.course.id'}/$env{'request.course.sec'}"); - } + if ($env{'request.course.id'}) { + $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'}); + my @privs; + if ($env{'request.symb'} ne '') { + if ($env{'request.filename'}=~/$LONCAPA::assess_re/) { + push(@privs,('mgr','vgr')); + } + push(@privs,'opa'); + } + foreach my $priv (@privs) { + $perms{$priv} = &Apache::lonnet::allowed($priv,$env{'request.course.id'}); + if (!$perms{$priv} && $env{'request.course.sec'} ne '') { + $perms{$priv} = + &Apache::lonnet::allowed($priv,"$env{'request.course.id'}/$env{'request.course.sec'}"); } + } # # Determine whether or not to show Grades and Submissions buttons # - if ($env{'request.symb'} ne '' && - $env{'request.filename'}=~/$LONCAPA::assess_re/) { - if ($perms{'mgr'}) { - $hwkadd.= &switch('','',7,2,'pgrd.png','Content Grades', - 'grades[_4]', - "gocmd('/adm/grades','gradingmenu')", - 'Content Grades'); - } elsif ($perms{'vgr'}) { - $hwkadd .= &switch('','',7,2,'subm.png','Content Submissions', - 'missions[_1]', - "gocmd('/adm/grades','submission')", - 'Content Submissions'); - } - } - 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'); - } + if ($env{'request.symb'} ne '' && + $env{'request.filename'}=~/$LONCAPA::assess_re/) { + if ($perms{'mgr'}) { + &switch('','',7,2,'pgrd.png','Content Grades','grades[_4]', + "gocmd('/adm/grades','gradingmenu')", + 'Content Grades'); + } elsif ($perms{'vgr'}) { + &switch('','',7,2,'subm.png','Content Submissions','missions[_1]', + "gocmd('/adm/grades','submission')", + 'Content Submissions'); + } + } + if (($env{'request.symb'} ne '') && ($perms{'opa'})) { + &switch('','',7,3,'pparm.png','Content Settings','parms[_2]', + "gocmd('/adm/parmset','set')", + 'Content Settings'); + } # End grades/submissions check # # This applies to items inside a folder/page modifiable in the course. # - if (($env{'request.symb'}=~/^uploaded/) && (($perms{'mdc'}) || ($perms{'cev'}))) { - my $text = 'Edit Folder'; - if (($mapurl =~ /\.page$/) || - ($env{'request.symb'}=~ - m{uploaded/$cdom/$cnum/default_\d+\.page$})) { - $text = 'Edit Page'; - } - $hwkadd .= &switch('','',7,4,'docs-22x22.png',$text,'parms[_2]', - "gocmd('/adm/coursedocs','direct')", - 'Folder/Page Content'); - } -# End modifiable folder/page container check + if (($env{'request.symb'}=~/^uploaded/) && ($perms{'mdc'})) { + my $text = 'Edit Folder'; + if (($mapurl =~ /\.page$/) || + ($env{'request.symb'}=~ + m{uploaded/$cdom/$cnum/default_\d+\.page$})) { + $text = 'Edit Page'; + } + &switch('','',7,4,'docs-22x22.png',$text,'parms[_2]', + "gocmd('/adm/coursedocs','direct')", + 'Folder/Page Content'); } +# End modifiable folder/page container check + } # End course context # Prepare the rest of the buttons - my ($menuitems,$got_prt,$got_wishlist,$cstritems); + my ($menuitems,$got_prt,$got_wishlist); if ($const_space) { # # We are in construction space @@ -947,9 +616,6 @@ sub innerregister { my $currdir = '/priv/'.$udom.'/'.$uname.'/'.$thisdisfn; if ($currdir =~ m-/$-) { $is_const_dir = 1; - if ($thisdisfn eq '') { - $is_const_dir = 2; - } } else { $currdir =~ s|[^/]+$||; my $cleandisfn = &Apache::loncommon::escape_single($thisdisfn); @@ -964,32 +630,27 @@ s&6&3&pub.png&Publish&resource[_3]&gocst s&7&1&del.png&Delete&resource[_2]&gocstr('/adm/cfile?action=delete','/priv/$udom/$uname/$cleandisfn')&Delete this resource s&7&2&prt.png&Print&printout[_1]&gocstr('/adm/printout','/priv/$udom/$uname/$cleandisfn')&Prepare a printable document ENDMENUITEMS - unless ($noremote) { - $cstritems = $menuitems; - undef($menuitems); - } } - if (ref($bread_crumbs) eq 'ARRAY') { - &Apache::lonhtmlcommon::clear_breadcrumbs(); - foreach my $crumb (@{$bread_crumbs}){ - &Apache::lonhtmlcommon::add_breadcrumb($crumb); + if (ref($bread_crumbs) eq 'ARRAY') { + &Apache::lonhtmlcommon::clear_breadcrumbs(); + foreach my $crumb (@{$bread_crumbs}){ + &Apache::lonhtmlcommon::add_breadcrumb($crumb); + } } - } } elsif ( defined($env{'request.course.id'}) && $env{'request.symb'} ne '' ) { # # We are in a course and looking at a registered URL # Should probably be in mydesk.tab # - $menuitems=(< 0){ }else{ $menuitems.="anot.png"; } -$menuitems.="&$swtext{'anot'}&tations[_1]&annotate()&"; +$menuitems.="&Notes&&annotate()&"; $menuitems.="Make notes and annotations about this resource&&1\n"; -my $is_mobile; -if ($env{'browser.mobile'}) { - $is_mobile = 1; -} - unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio|ext\.tool)(\?|$)/) { + unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio)(\?|$)/) { if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) && ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/docs/})) { $menuitems.=(<[0]; - } - $buttonshide = $pagebuttonshide; - } else { - $countdown = &countdown_timer(); - $buttonshide = &hidden_button_check(); - } - - &Apache::lonhtmlcommon::clear_breadcrumb_tools(); + if ($addremote) { - &Apache::lonhtmlcommon::add_breadcrumb_tool( - 'navigation', @inlineremote[21,23]); + &Apache::lonhtmlcommon::clear_breadcrumb_tools(); - if ($buttonshide eq 'yes') { - if ($countdown) { - &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$countdown); - } - } else { - my @tools = @inlineremote[93,91,81,82,83]; - if ($countdown) { - unshift(@tools,$countdown); - } - &Apache::lonhtmlcommon::add_breadcrumb_tool( - 'tools',@tools); + &Apache::lonhtmlcommon::add_breadcrumb_tool( + 'navigation', @inlineremote[21,23]); - #publish button in construction space - if ($env{'request.state'} eq 'construct'){ - &Apache::lonhtmlcommon::add_breadcrumb_tool( - 'advtools', $inlineremote[63]); - } else { - &Apache::lonhtmlcommon::add_breadcrumb_tool( - 'tools', $inlineremote[63]); - } - &advtools_crumbs(@inlineremote); - } + my $countdown = &countdown_timer(); + if (&hidden_button_check() eq 'yes') { + if ($countdown) { + &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$countdown); } - my ($topic_help,$topic_help_text); - if ($is_const_dir == 2) { - if ((($ENV{'SERVER_PORT'} == 443) || - ($Apache::lonnet::protocol{$Apache::lonnet::perlvar{'lonHostID'}} eq 'https')) && - (&Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'},'webdav'))) { - $topic_help = 'Authoring_WebDAV,Authoring_WebDAV_Mac_10v6,Authoring_WebDAV_Mac_10v10,'. - 'Authoring_WebDAV_Windows_v7,Authoring_WebDAV_Linux_Centos'; - $topic_help_text = 'About WebDAV access'; - } - } - return &Apache::lonhtmlcommon::scripttag('', 'start') - . &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'','','','',$topic_help,$topic_help_text) - . &Apache::lonhtmlcommon::scripttag('', 'end'); - } else { - my $cstrcrumbs; - if ($const_space) { - foreach (split(/\n/,$cstritems)) { - my ($command,@rest)=split(/\&/,$_); - my $idx=10*$rest[0]+$rest[1]; - &switch('','',@rest); - } - &Apache::lonhtmlcommon::add_breadcrumb_tool('advtools', - @inlineremote[63,61,71,72]); - - $cstrcrumbs = &Apache::lonhtmlcommon::scripttag('', 'start') - .&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0) - .&Apache::lonhtmlcommon::scripttag('', 'end'); - } - my $requri=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0])); - $requri=&Apache::lonenc::check_encrypt(&unescape($requri)); - my $cursymb=&Apache::lonenc::check_encrypt($env{'request.symb'}); - my $navstatus=&get_nav_status(); - my $clearcstr; - - if ($env{'user.adv'}) { $clearcstr='clearbut(6,1)'; } - return < -// - - -$cstrcrumbs -ENDREGTHIS - } - } else { - unless ($noremote) { -# Not registered, graphical - return (< -// - -ENDDONOTREGTHIS + my @tools = @inlineremote[93,91,81,82,83]; + if ($countdown) { + unshift(@tools,$countdown); + } + &Apache::lonhtmlcommon::add_breadcrumb_tool( + 'tools',@tools); + #publish button in construction space + if ($env{'request.state'} eq 'construct'){ + &Apache::lonhtmlcommon::add_breadcrumb_tool( + 'advtools', $inlineremote[63]); + } else { + &Apache::lonhtmlcommon::add_breadcrumb_tool( + 'tools', $inlineremote[63]); + } + &advtools_crumbs(@inlineremote); } - return ''; - } -} - -sub get_inline_text { - my %text = ( - pgrd => 'Content Grades', - subm => 'Content Submissions', - pparm => 'Content Settings', - docs => 'Folder/Page Content', - pcstr => 'Edit', - prt => 'Print', - alnk => 'Stored Links', - anot => 'Notes', - catalog => 'Info', - eval => 'Evaluate', - fdbk => 'Feedback', - ); - return %text; -} - -sub get_rc_text { - my %text = ( - pgrd => 'problem[_1]', - subm => 'view sub-[_1]', - pparm => 'problem[_2]', - pcstr => 'edit[_1]', - prt => 'prepare[_1]', - back => 'backward[_1]', - forw => 'forward[_1]', - alnk => 'add to[_1]', - anot => 'anno-[_1]', - catalog => 'catalog[_2]', - eval => 'evaluate[_1]', - fdbk => 'feedback[_1]', - ); - return %text; -} - -sub loadevents() { - if ($env{'request.state'} eq 'construct' || - $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; } - return 'LONCAPAreg();'; -} - -sub unloadevents() { - if ($env{'request.state'} eq 'construct' || - $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; } - return 'LONCAPAstale();'; -} - -sub startupremote { - my ($lowerurl)=@_; - unless ($env{'environment.remote'} eq 'on') { - return (''); } -# -# The Remote actually gets launched! -# - my $configmenu=&rawconfig(); - my $esclowerurl=&escape($lowerurl); - my $message=&mt('"Waiting for Remote Control window to load: "+[_1]','waited'); - return(< -// - -ENDREMOTESTARTUP -} - -sub setflags() { - return(< -// - -ENDSETFLAGS -} - -sub maincall() { - unless ($env{'environment.remote'} eq 'on') { return ''; } - return(< -// - -ENDMAINCALL -} - -sub load_remote_msg { - my ($lowerurl)=@_; - - unless ($env{'environment.remote'} eq 'on') { return ''; } - - my $esclowerurl=&escape($lowerurl); - my $link=&mt('[_1]Continue[_2] on in Inline Menu mode' - ,'' - ,''); - return(< -
    - -
    -

    -

    $link

    -ENDREMOTEFORM -} - -sub get_menu_name { - my $hostid = $Apache::lonnet::perlvar{'lonHostID'}; - $hostid =~ s/\W//g; - return 'LCmenu'.$hostid; -} - - -sub reopenmenu { - unless ($env{'environment.remote'} eq 'on') { return ''; } - my $menuname = &get_menu_name(); - my $nothing = &Apache::lonhtmlcommon::javascript_nothing(); - return('window.open('.$nothing.',"'.$menuname.'","",false);'); -} - - -sub open { - my $returnval=''; - unless ($env{'environment.remote'} eq 'on') { - return - ''; - } - my $menuname = &get_menu_name(); - -# unless (shift eq 'unix') { -# resizing does not work on linux because of virtual desktop sizes -# $returnval.=(< -ENDOPEN - return ''; + return &Apache::lonhtmlcommon::scripttag('', 'start') + . &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0) + . &Apache::lonhtmlcommon::scripttag('', 'end'); } sub get_editbutton { - my ($cfile,$home,$switchserver,$forceedit,$forceview,$forcereg,$hostname) = @_; + my ($cfile,$home,$switchserver,$forceedit,$forceview,$forcereg) = @_; my $jscall; if (($forceview) && ($env{'form.todocs'})) { - my ($folderpath,$command,$navmap); + my ($folderpath,$command); if ($env{'request.symb'}) { - $folderpath = &Apache::loncommon::symb_to_docspath($env{'request.symb'},\$navmap); + $folderpath = &Apache::loncommon::symb_to_docspath($env{'request.symb'}); } elsif ($env{'form.folderpath'} =~ /^supplemental/) { $folderpath = $env{'form.folderpath'}; $command = '&forcesupplement=1'; @@ -1466,16 +780,11 @@ 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'}),$hostname, - $env{'form.idx'},&escape($env{'form.suppurl'}), - $env{'form.todocs'},$suppanchor); + &escape($env{'form.title'}),$env{'form.idx'}, + &escape($env{'form.suppurl'},$env{'form.todocs'})); } if ($jscall) { my $icon = 'pcstr.png'; @@ -1484,31 +793,15 @@ sub get_editbutton { $icon = 'tolastloc.png'; $label = 'Exit Editing'; } - my $infunc = 1; - my $clearbutton; - if ($env{'environment.remote'} eq 'on') { - if ($cfile =~ m{^/priv/}) { - undef($infunc); - $label = 'edit'; - } else { - $clearbutton = 1; - } - } - my $editor = &switch('','',6,1,$icon,$label,'resource[_2]', - $jscall,"Edit this resource",'','',$infunc); - if ($infunc) { - return 1; - } elsif ($clearbutton) { - return &clear(6,1); - } else { - return $editor; - } + &switch('','',6,1,$icon,$label,'resource[_2]', + $jscall,"Edit this resource"); + return 1; } return; } sub prepare_functions { - my ($resurl,$forcereg,$group,$bread_crumbs,$advtools,$docscrumbs,$hostname,$forbodytag) = @_; + my ($resurl,$forcereg,$group,$bread_crumbs,$advtools,$docscrumbs) = @_; unless ($env{'request.registered'}) { undef(@inlineremote); } @@ -1522,9 +815,8 @@ sub prepare_functions { } my $editbutton = ''; - my $viewsrcbutton = ''; # -# Determine whether or not to display 'Edit' or 'View Source' icon/button +# Determine whether or not to display 'Edit' icon/button # if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) { my $file=&Apache::lonnet::declutter($env{'request.filename'}); @@ -1554,31 +846,23 @@ sub prepare_functions { # # This applies in course context # - if (($perms{'mdc'}) && - (($resurl =~ m{^/?public/$cdom/$cnum/syllabus}) || - ($resurl =~ m{^/?uploaded/$cdom/$cnum/portfolio/syllabus/}) || - (($resurl =~ m{^/?uploaded/$cdom/$cnum/default_\d+\.sequence$}) && ($env{'form.navmap'})))) { - if ($resurl =~ m{^/}) { - $cfile = $resurl; - } else { - $cfile = "/$resurl"; - } - $home = &Apache::lonnet::homeserver($cnum,$cdom); - if ($env{'form.forceedit'}) { - $forceview = 1; - } else { - $forceedit = 1; - } - if ($cfile =~ m{^/uploaded/$cdom/$cnum/default_\d+\.sequence$}) { - my $text = 'Edit Folder'; - &switch('','',7,4,'docs-22x22.png','Edit Folder','parms[_2]', - "gocmd('/adm/coursedocs','direct')", - 'Folder/Page Content'); + if (($resurl eq "/public/$cdom/$cnum/syllabus") && ($perms{'mdc'})) { + if ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ /\w/) { + &switch('','',6,1,'pcstr.png','Edit', + 'resource[_2]', + "go('/adm/courseprefs?phase=display&actions=courseinfo')", + 'Edit this resource'); $editbutton = 1; } else { + $cfile = $resurl; + $home = &Apache::lonnet::homeserver($cnum,$cdom); + if ($env{'form.forceedit'}) { + $forceview = 1; + } else { + $forceedit = 1; + } $editbutton = &get_editbutton($cfile,$home,$switchserver, - $forceedit,$forceview,$forcereg, - $hostname); + $forceedit,$forceview,$forcereg); } } elsif (($resurl eq '/adm/extresedit') && (($env{'form.symb'}) || ($env{'form.folderpath'}))) { @@ -1608,29 +892,6 @@ sub prepare_functions { $editbutton = &get_editbutton($cfile,$home,$switchserver, $forceedit,$forceview,$forcereg); } - if ((($cfile eq '') || (!$editbutton)) && - ($resurl =~ /$LONCAPA::assess_re/)) { - my $showurl = &Apache::lonnet::clutter($resurl); - if ((&Apache::lonnet::allowed('cre','/')) && - (&Apache::lonnet::metadata($resurl,'sourceavail') eq 'open')) { - $viewsrcbutton = 1; - } elsif (&Apache::lonnet::allowed('vxc',$env{'request.course.id'})) { - if ($showurl =~ m{^\Q/res/$cdom/\E($match_username)/}) { - my $auname = $1; - if (($env{'request.course.adhocsrcaccess'} ne '') && - (grep(/^\Q$auname\E$/,split(/,/,$env{'request.course.adhocsrcaccess'})))) { - $viewsrcbutton = 1; - } elsif ((&Apache::lonnet::metadata($resurl,'sourceavail') eq 'open') && - (&Apache::lonnet::allowed('bre','/'))) { - $viewsrcbutton = 1; - } - } - } - if ($viewsrcbutton) { - &switch('','',6,1,'pcstr.png','View Source','resource[_2]','open_source()', - 'View source code'); - } - } } } } @@ -1643,8 +904,8 @@ sub prepare_functions { unless (&Apache::lonnet::is_course($sdom,$sname)) { &switch('','',6,4,'mail-message-new-22x22.png','Message to user', '', - "go('/adm/email?compose=individual&recname=$sname&recdom=$sdom')", - 'Send message to specific user','','',1); + "go('/adm/email?compose=individual&recname=$sname&recdom=$sdom')", + 'Send message to specific user'); } my $hideprivileged = 1; if (&Apache::lonnet::in_course($sdom,$sname,$cdom,$cnum,undef, @@ -1660,44 +921,35 @@ sub prepare_functions { &switch('','',6,5,'trck-22x22.png','Activity', '', "go('/adm/trackstudent?selected_student=$sname:$sdom')", - 'View recent activity by this person','','',1); + 'View recent activity by this person'); } if ($perms{'vgr'}) { &switch('','',6,6,'rsrv-22x22.png','Reservations', '', - "go('/adm/slotrequest?command=showresv&origin=aboutme&uname=$sname&udom=$sdom')", - 'Slot reservation history','','',1); + "go('/adm/slotrequest?command=showresv&origin=aboutme&uname=$sname&udom=$sdom')", + 'Slot reservation history'); } if ($perms{'srm'}) { &switch('','',6,7,'contact-new-22x22.png','Records', '', - "go('/adm/email?recordftf=retrieve&recname=$sname&recdom=$sdom')", - 'Add records','','',1); + "go('/adm/email?recordftf=retrieve&recname=$sname&recdom=$sdom')", + 'Add records'); } } } if (($env{'form.folderpath'} =~ /^supplemental/) && (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) && (($resurl =~ m{^/adm/wrapper/ext/}) || - ($resurl =~ m{^/adm/$cdom/$cnum/\d+/ext\.tool$}) || ($resurl =~ m{^/uploaded/$cdom/$cnum/supplemental/}) || ($resurl eq '/adm/supplemental') || ($resurl =~ m{^/public/$cdom/$cnum/syllabus$}) || ($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'}),'<>&"')); - my $link = '/adm/coursedocs?command=direct&forcesupplement=1&supppath='. - "$esc_path&anchor=$suppanchor"; - if ($env{'request.use_absolute'} ne '') { - $link = $env{'request.use_absolute'}.$link; - } &switch('','',7,4,'docs-22x22.png','Edit Folder','parms[_2]', - "location.href='$link'",'Folder/Page Content'); + "location.href='/adm/coursedocs?command=direct&forcesupplement=1&supppath=$esc_path'", + 'Folder/Page Content'); } } } @@ -1707,8 +959,8 @@ sub prepare_functions { &Apache::lonhtmlcommon::clear_breadcrumb_tools(); &advtools_crumbs(@inlineremote); return $editbutton; - } elsif (($env{'request.registered'}) && (!ref($forbodytag))) { - return $editbutton || $viewsrcbutton; + } elsif ($env{'request.registered'}) { + return $editbutton; } else { if (ref($bread_crumbs) eq 'ARRAY') { if (@inlineremote > 0) { @@ -1720,13 +972,9 @@ sub prepare_functions { } elsif (@inlineremote > 0) { &Apache::lonhtmlcommon::clear_breadcrumb_tools(); &advtools_crumbs(@inlineremote); - if (ref($forbodytag)) { - $$forbodytag = - &Apache::lonhtmlcommon::scripttag('', 'start') - .&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0) - .&Apache::lonhtmlcommon::scripttag('', 'end'); - } - return; + return &Apache::lonhtmlcommon::scripttag('', 'start') + . &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0) + . &Apache::lonhtmlcommon::scripttag('', 'end'); } } } @@ -1749,13 +997,8 @@ sub advtools_crumbs { sub clear { my ($row,$col)=@_; - if ($env{'environment.remote'} eq 'on') { - if (($row<1) || ($row>13)) { return ''; } - return "\n".qq(window.status+='.';swmenu.clearbut($row,$col);); - } else { - $inlineremote[10*$row+$col]=''; - return ''; - } + $inlineremote[10*$row+$col]=''; + return ''; } # ============================================ Switch a button or create a link @@ -1763,7 +1006,7 @@ sub clear { # The javascript is usually similar to "go('/adm/roles')" or "cstrgo(..)". sub switch { - my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat,$nobreak,$infunc)=@_; + my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat,$nobreak)=@_; $act=~s/\$uname/$uname/g; $act=~s/\$udom/$udom/g; $top=&mt($top); @@ -1772,24 +1015,6 @@ sub switch { my $idx=10*$row+$col; $category_members{$cat}.=':'.$idx; - if (($env{'environment.remote'} eq 'on') && (!$infunc)) { - if (($row<1) || ($row>13)) { return ''; } - if ($env{'request.state'} eq 'construct') { - my $text = $top.' '.$bot; - $text=~s/\s*\-\s*//gs; - my $pic = ''.$text.''; - $inlineremote[$idx] = - ''. - $pic.''.$top.' '; - } -# Remote - $img=~s/\.png$/\.gif/; - return "\n". - qq(window.status+='.';swmenu.switchbutton($row,$col,"$img","$top","$bot","$act","$desc");); - } - # Inline Menu if ($nobreak==2) { return ''; } my $text=$top.' '.$bot; @@ -1824,7 +1049,7 @@ sub switch { unless ($env{'request.state'} eq 'construct') { push(@tools,63); } - if (($env{'environment.icons'} eq 'iconsonly') && + if (($env{'environment.icons'} eq 'iconsonly') && (grep(/^$idx$/,@tools))) { $inlineremote[$idx] = ''.$pic.''; @@ -1851,13 +1076,6 @@ sub secondlevel { return $output; } -sub openmenu { - my $menuname = &get_menu_name(); - unless ($env{'environment.remote'} eq 'on') { return ''; } - my $nothing = &Apache::lonhtmlcommon::javascript_nothing(); - return "window.open(".$nothing.",'".$menuname."');"; -} - sub inlinemenu { undef(@inlineremote); undef(%category_members); @@ -1900,13 +1118,7 @@ sub rawconfig { # my $textualoverride=shift; my $output=''; - if ($env{'environment.remote'} eq 'on') { - $output.= - "window.status='Opening Remote Control';var swmenu=".&openmenu(). -"\nwindow.status='Configuring Remote Control ';"; - } else { - unless ($textualoverride) { return ''; } - } + return '' unless $textualoverride; my $uname=$env{'user.name'}; my $udom=$env{'user.domain'}; my $adv=$env{'user.adv'}; @@ -1925,10 +1137,7 @@ sub rawconfig { my $pub=($env{'request.state'} eq 'published'); my $con=($env{'request.state'} eq 'construct'); my $rol=$env{'request.role'}; - my $requested_domain; - if ($rol) { - $requested_domain = $env{'request.role.domain'}; - } + my $requested_domain = $env{'request.role.domain'}; foreach my $line (@desklines) { my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc,$cat)=split(/\:/,$line); $prt=~s/\$uname/$uname/g; @@ -1942,13 +1151,7 @@ sub rawconfig { next if ($crstype ne 'Community'); $prt=~s/\$cmty/$crs/g; } - if ($prt =~ m/\$requested_domain/) { - if ((!$requested_domain) && ($pro eq 'pbre') && ($env{'user.adv'})) { - $prt=~s/\$requested_domain/$env{'user.domain'}/g; - } else { - $prt=~s/\$requested_domain/$requested_domain/g; - } - } + $prt=~s/\$requested_domain/$requested_domain/g; if ($category_names{$cat}!~/\w/) { $cat='oth'; } if ($pro eq 'clear') { $output.=&clear($row,$col); @@ -1984,9 +1187,8 @@ sub rawconfig { next; } } - if ((($priv eq 'bre') && (&Apache::lonnet::allowed($priv,$prt) eq 'F')) || - (($priv ne 'bre') && (&Apache::lonnet::allowed($priv,$prt)))) { - $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); + if (&Apache::lonnet::allowed($priv,$prt)) { + $output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); } } elsif ($pro eq 'course') { if (($env{'request.course.fn'}) && ($crstype ne 'Community')) { @@ -2091,18 +1293,12 @@ sub rawconfig { $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat); } } - if ($env{'environment.remote'} eq 'on') { - $output.="\nwindow.status='Synchronizing Time';swmenu.syncclock(1000*".time.");\nwindow.status='Remote Control Configured.';"; - if (&Apache::lonmsg::newmail()) { - $output.='swmenu.setstatus("you have","messages");'; - } - } return $output; } sub check_for_rcrs { my $showreqcrs = 0; - my @reqtypes = ('official','unofficial','community','textbook'); + my @reqtypes = ('official','unofficial','community'); foreach my $type (@reqtypes) { if (&Apache::lonnet::usertools_access($env{'user.name'}, $env{'user.domain'}, @@ -2122,28 +1318,6 @@ sub check_for_rcrs { return $showreqcrs; } -# ======================================================================= Close - -sub close { - unless ($env{'environment.remote'} eq 'on') { return ''; } - my $menuname = &get_menu_name(); - return(< -// - -ENDCLOSE -} - sub dc_popup_js { my %lt = &Apache::lonlocal::texthash( more => '(More ...)', @@ -2190,232 +1364,16 @@ function toggleCountdown() { END } -# This creates a "done button" for timed events. The confirmation box is a jQuery -# dialog widget. If the interval parameter requires a proctor key for the timed -# event to be marked done, there will also be a textbox where that can be entered. -# Clicking OK will set the value of LC_interval_done to 'true', and, if needed will -# set the value of LC_interval_done_proctorpass to the text entered in that box, -# and submit the corresponding form. -# -# The &zero_time() routine in lonhomework.pm is called when a page is rendered if -# LC_interval_done is true. -# -sub done_button_js { - my ($type,$width,$height,$proctor,$donebuttontext) = @_; - return unless (($type eq 'map') || ($type eq 'resource')); - my %lt = &Apache::lonlocal::texthash( - title => 'WARNING!', - preamble => 'You are trying to end this timed event early.', - map => 'Confirming that you are done will cause the time to expire and prevent you from changing any answers in the current folder.', - resource => 'Confirming that you are done will cause the time to expire for this question, and prevent you from changing your answer(s).', - okdone => 'Click "OK" if you are completely finished.', - cancel => 'Click "Cancel" to continue working.', - proctor => 'Ask a proctor to enter the key, then click "OK" if you are completely finished.', - ok => 'OK', - exit => 'Cancel', - key => 'Key:', - nokey => 'A proctor key is required', - ); - my $navmap = Apache::lonnavmaps::navmap->new(); - my ($missing,$tried) = (0,0); - if (ref($navmap)) { - my @resources=(); - if ($type eq 'map') { - my ($mapurl,$rid,$resurl)=&Apache::lonnet::decode_symb($env{'request.symb'}); - if ($env{'request.symb'} =~ /\.page$/) { - @resources=$navmap->retrieveResources($resurl,sub { $_[0]->is_problem() }); - } else { - @resources=$navmap->retrieveResources($mapurl,sub { $_[0]->is_problem() }); - } - } else { - my $res = $navmap->getBySymb($env{'request.symb'}); - if (ref($res)) { - if ($res->is_problem()) { - push(@resources,$res); - } - } - } - foreach my $res (@resources) { - if (ref($res->parts()) eq 'ARRAY') { - foreach my $part (@{$res->parts()}) { - if (!$res->tries($part)) { - $missing++; - } else { - $tried++; - } - } - } - } - } - if ($missing) { - $lt{'miss'} .= '

    '; - if ($type eq 'map') { - $lt{'miss'} .= &mt('Submissions are missing for [quant,_1,question part,question parts] in this folder.',$missing); - } else { - $lt{'miss'} .= &mt('Submissions are missing for [quant,_1,part] in this question.',$missing); - } - if ($missing > 1) { - $lt{'miss'} .= ' '.&mt('If you confirm you are done you will be unable to submit answers for them.').''; - } else { - $lt{'miss'} .= ' '.&mt('If you confirm you are done you will be unable to submit an answer for it.').'

    '; - } - } - $donebuttontext = &HTML::Entities::encode($donebuttontext,'<>&"'); - if ($proctor) { - if ($height !~ /^\d+$/) { - $height = 400; - if ($missing) { - $height += 60; - } - } - if ($width !~ /^\d+$/) { - $width = 400; - if ($missing) { - $width += 60; - } - } - return < - - - - - -
    -

    $lt{'preamble'} $lt{$type}

    - $lt{'miss'} -

    $lt{'proctor'}

    -
    - - -
    -

    $lt{'cancel'}

    -
    - - - -END - } else { - if ($height !~ /^\d+$/) { - $height = 320; - if ($missing) { - $height += 60; - } - } - if ($width !~ /^\d+$/) { - $width = 320; - if ($missing) { - $width += 60; - } - } - if ($missing) { - $lt{'miss'} = '

    '.$lt{'miss'}.'

    '; - } - return < - - - - -

    -

    $lt{'preamble'} $lt{$type} $lt{'miss'} $lt{'okdone'} $lt{'cancel'}

    -
    - - - -END - } -} - sub utilityfunctions { - my ($httphost) = @_; my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0])); - my $currentsymb=&Apache::lonenc::check_encrypt($env{'request.symb'}); - if ($currenturl =~ m{^/adm/wrapper/ext/}) { - if ($env{'request.external.querystring'}) { + if ($currenturl =~ m{^/adm/wrapper/ext/} + && $env{'request.external.querystring'} ) { $currenturl .= ($currenturl=~/\?/)?'&':'?'.$env{'request.external.querystring'}; - } - my ($anchor) = ($env{'request.symb'} =~ /(\#[^\#]+)$/); - if (($anchor) && ($currenturl !~ /\Q$anchor\E$/)) { - $currenturl .= $1; - } } $currenturl=&Apache::lonenc::check_encrypt(&unescape($currenturl)); + my $currentsymb=&Apache::lonenc::check_encrypt($env{'request.symb'}); + my $dc_popup_cid; if ($env{'user.adv'} && exists($env{'user.role.dc./'. $env{'course.'.$env{'request.course.id'}. @@ -2441,30 +1399,8 @@ sub utilityfunctions { my $countdown = &countdown_toggle_js(); - my $annotateurl = '/adm/annotation'; - if ($httphost) { - $annotateurl = '/adm/annotations'; - } - my $hostvar = ' -function setLCHost() { - var lcHostname=""; -'; - if ($httphost =~ m{^https?\://}) { - $hostvar .= ' var lcServer="'.$httphost.'";'."\n". - ' var hostReg = /^https?:\/\/([^\/]+)$/i;'."\n". - ' var match = hostReg.exec(lcServer);'."\n". - ' if (match.length) {'."\n". - ' if (match[1] == location.hostname) {'."\n". - ' lcHostname=lcServer;'."\n". - ' }'."\n". - ' }'."\n"; - } - - $hostvar .= ' return lcHostname;'."\n". -'}'."\n"; - return (<" + +"action='/adm/annotations'>" +"" +"<\\/form>" +'$end_page_annotate'); @@ -2582,23 +1509,17 @@ function annotate() { function open_StoredLinks_Import(rat) { var newWin; - var lcHostname = setLCHost(); if (rat) { - newWin = window.open(lcHostname+'/adm/wishlist?inhibitmenu=yes&mode=import&rat='+rat, + newWin = window.open('/adm/wishlist?inhibitmenu=yes&mode=import&rat='+rat, 'wishlistImport','scrollbars=1,resizable=1,menubar=0'); } else { - newWin = window.open(lcHostname+'/adm/wishlist?inhibitmenu=yes&mode=import', + newWin = window.open('/adm/wishlist?inhibitmenu=yes&mode=import', 'wishlistImport','scrollbars=1,resizable=1,menubar=0'); } newWin.focus(); } -function open_source() { - sourcewin=window.open('/adm/source?inhibitmenu=yes&viewonly=1&filename='+currentURL,'LONsource', - 'height=500,width=600,resizable=yes,location=no,menubar=no,toolbar=no,scrollbars=yes'); -} - (function (\$) { \$(document).ready(function () { \$.single=function(a){return function(b){a[0]=b;return a}}(\$([1])); @@ -2647,16 +1568,6 @@ sub constspaceform { ENDCONSTSPACEFORM } -sub get_nav_status { - my $navstatus="swmenu.w_loncapanav_flag="; - if ($env{'environment.remotenavmap'} eq 'on') { - $navstatus.="1"; - } else { - $navstatus.="-1"; - } - return $navstatus; -} - sub hidden_button_check { if ( $env{'request.course.id'} eq '' || $env{'request.role.adv'} ) { @@ -2668,25 +1579,25 @@ sub hidden_button_check { } sub roles_selector { - my ($cdom,$cnum,$httphost) = @_; + my ($cdom,$cnum) = @_; my $crstype = &Apache::loncommon::course_type(); my $now = time; - my (%courseroles,%seccount,%courseprivs,%roledesc); + my (%courseroles,%seccount,%courseprivs); my $is_cc; - my ($js,$form,$switcher); + my ($js,$form,$switcher,$switchtext); my $ccrole; if ($crstype eq 'Community') { $ccrole = 'co'; } else { $ccrole = 'cc'; } - my ($privref,$gotsymb,$destsymb); + my ($priv,$gotsymb,$destsymb); my $destinationurl = $ENV{'REQUEST_URI'}; - if ($destinationurl =~ /(\?|\&)symb=/) { + if ($destinationurl =~ /\?symb=/) { $gotsymb = 1; } elsif ($destinationurl =~ m{^/enc/}) { my $plainurl = &Apache::lonenc::unencrypted($destinationurl); - if ($plainurl =~ /(\?|\&)symb=/) { + if ($plainurl =~ /\?symb=/) { $gotsymb = 1; } } @@ -2701,15 +1612,12 @@ sub roles_selector { my $destination = $destinationurl; $destination =~ s/(\?.*)$//; if (exists($reqprivs->{$destination})) { - if ($reqprivs->{$destination} =~ /,/) { - @{$privref} = split(/,/,$reqprivs->{$destination}); - } else { - $privref = [$reqprivs->{$destination}]; - } + $priv = $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))) { @@ -2719,9 +1627,7 @@ sub roles_selector { } } if ($is_cc) { - &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); + &get_all_courseroles($cdom,$cnum,\%courseroles,\%seccount,\%courseprivs,$priv); } else { my %gotnosection; foreach my $item (keys(%env)) { @@ -2737,7 +1643,7 @@ sub roles_selector { $gotnosection{$role} = 1; } } - if ((ref($privref) eq 'ARRAY') && (@{$privref} > 0)) { + if ($priv ne '') { my $cnumsec = $cnum; if ($sec ne '') { $cnumsec .= "/$sec"; @@ -2766,6 +1672,7 @@ sub roles_selector { } } } + $switchtext = &mt('Switch role'); my @roles_order = ($ccrole,'in','ta','ep','ad','st'); my $numdiffsec; if (keys(%seccount) == 1) { @@ -2775,17 +1682,17 @@ sub roles_selector { } if ((keys(%seccount) > 1) || ($numdiffsec > 1)) { my @submenu; - $js = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,\%roledesc,$privref); + $js = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,$priv); $form = - '
    '."\n". + ''."\n". ' '."\n". ' '."\n". ' '."\n". ' '."\n"; if ($destsymb ne '') { - $form .= ' '."\n"; + $form .= ' '."\n"; } $form .= '
    '."\n"; foreach my $role (@roles_order) { @@ -2812,25 +1719,16 @@ sub roles_selector { $include = 1; } } else { - $include = 1; + $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'".')', - $rolename]); + &Apache::lonnet::plaintext($role)]); } } } if (@submenu > 0) { - $switcher = &create_submenu('','',&mt('Switch role'),\@submenu); + $switcher = &create_submenu('','',$switchtext,\@submenu); } } return ($js,$form,$switcher); @@ -2896,7 +1794,6 @@ sub get_all_courseroles { push(@{$courseroles->{'st'}},keys(%sections_count)); $seccount->{'st'} = scalar(keys(%sections_count)); } - $seccount->{'st'} ++; # Increment for a section-less student role. my $rolehash = { 'roles' => $courseroles, 'seccount' => $seccount, @@ -2906,101 +1803,8 @@ 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; - } - my $is_helpdesk = 0; - my $now = time; - foreach my $role ('dh','da') { - if ($env{"user.role.$role./$cdom/"}) { - my ($start,$end)=split(/\./,$env{"user.role.$role./$cdom/"}); - if (!($start && ($now<$start)) && !($end && ($now>$end))) { - $is_helpdesk = 1; - last; - } - } - } - if ($is_helpdesk) { - 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,$roledesc,$privref) = @_; + my ($cdom,$cnum,$seccount,$courseroles,$courseprivs,$priv) = @_; my %lt = &Apache::lonlocal::texthash( this => 'This role has section(s) associated with it.', ente => 'Enter a specific section.', @@ -3033,26 +1837,29 @@ sub jump_to_role { } } my $checkroles = 0; - if ((ref($privref) eq 'ARRAY') && (@{$privref} > 0) && (ref($courseprivs) eq 'HASH')) { - my %disallowed; + if ($priv && ref($courseprivs) eq 'HASH') { + my (%disallowed,%allowed,@disallow); foreach my $role (sort(keys(%{$courseprivs}))) { my $trole; if ($role =~ m{^(.+?)\Q./$cdom/$cnum\E}) { $trole = $1; } if (($trole ne '') && ($trole ne 'cm')) { - $disallowed{$trole} = 1; - foreach my $priv (@{$privref}) { - if ($courseprivs->{$role} =~ /\Q:$priv\E($|:|\&\w+)/) { - delete($disallowed{$trole}); - last; - } + if ($courseprivs->{$role} =~ /\Q:$priv\E($|:|\&\w+)/) { + $allowed{$trole} = 1; + } else { + $disallowed{$trole} = 1; } } } - if (keys(%disallowed) > 0) { + foreach my $trole (keys(%disallowed)) { + unless ($allowed{$trole}) { + push(@disallow,$trole); + } + } + if (@disallow > 0) { $checkroles = 1; - $js .= " var disallow = new Array('".join("','",keys(%disallowed))."');\n". + $js .= " var disallow = new Array('".join("','",@disallow)."');\n". " var rolecheck = 1;\n"; } } @@ -3116,7 +1923,6 @@ function adhocRole(newrole) { fullrole += '/'+secchoice; } } else { - document.rolechooser.elements[roleitem].selectedIndex = 0; if (secchoice != null) { alert("$lt{'youe'} \\""+secchoice+"\\".\\n $lt{'plst'}"); } @@ -3150,13 +1956,13 @@ END sub required_privs { my $privs = { - '/adm/parmset' => 'opa,vpa', - '/adm/courseprefs' => 'opa,vpa', + '/adm/parmset' => 'opa', + '/adm/courseprefs' => 'opa', '/adm/whatsnew' => 'whn', - '/adm/populate' => 'cst,vpa,vcl', + '/adm/populate' => 'cst', '/adm/trackstudent' => 'vsa', - '/adm/statistics' => 'mgr,vgr', - '/adm/setblock' => 'dcm,vcb', + '/adm/statistics' => 'vgr', + '/adm/setblock' => 'dcm', '/adm/coursedocs' => 'mdc', }; unless ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'spreadsheet') { @@ -3192,20 +1998,10 @@ sub countdown_timer { } my $duedate = &Apache::lonnet::EXT("resource.0.duedate"); my @interval=&Apache::lonnet::EXT("resource.0.interval"); - my ($timelimit,$usesdone,$donebuttontext,$proctor,$secret); if (@interval > 1) { - ($timelimit,my $donesuffix) = split(/_/,$interval[0],2); - if ($donesuffix =~ /^done\:([^\:]+)\:(.*)$/) { - $usesdone = 'done'; - $donebuttontext = $1; - (undef,$proctor,$secret) = split(/_/,$2); - } elsif ($donesuffix =~ /^done(|_.+)$/) { - $donebuttontext = &mt('Done'); - ($usesdone,$proctor,$secret) = split(/_/,$donesuffix); - } my $first_access=&Apache::lonnet::get_first_access($interval[1]); if ($first_access > 0) { - if ($first_access+$timelimit > time) { + if ($first_access+$interval[0] > time) { $hastimeleft = 1; } } @@ -3213,16 +2009,11 @@ sub countdown_timer { if (($duedate && $duedate > time) || (!$duedate && $hastimeleft) || ($slot_name ne '' && $slothastime)) { - my ($collapse,$expand,$alttxt,$title,$currdisp,$donebutton); + my ($collapse,$expand,$alttxt,$title,$currdisp); if ((@interval > 1 && $hastimeleft) || ($type eq 'Task' && $slothastime)) { $currdisp = 'inline'; $collapse = '► '; - if ((@interval > 1) && ($hastimeleft)) { - if ($usesdone eq 'done') { - $donebutton = &done_button_js($interval[1],'','',$proctor,$donebuttontext); - } - } } else { $currdisp = 'none'; $expand = '◄ '; @@ -3233,7 +2024,7 @@ sub countdown_timer { } my $desc = &mt('Countdown to due date/time'); return < $collapse @@ -3264,7 +2055,7 @@ BEGIN { $category_positions{$entries[2]}=$entries[1]; $category_names{$entries[2]}=$entries[3]; } elsif ($configline=~/^prim\:/) { - my @entries = (split(/\:/, $configline))[1..6]; + my @entries = (split(/\:/, $configline))[1..5]; push(@primary_menu,\@entries); } elsif ($configline=~/^primsub\:/) { my ($parent,@entries) = (split(/\:/, $configline))[1..4]; @@ -3272,9 +2063,6 @@ BEGIN { } elsif ($configline=~/^scnd\:/) { my @entries = (split(/\:/, $configline))[1..5]; push(@secondary_menu,\@entries); - } elsif ($configline=~/^scndsub\:/) { - my ($parent,@entries) = (split(/\:/, $configline))[1..4]; - push(@{$secondary_submenu{$parent}},\@entries); } elsif ($configline) { push(@desklines,$configline); }