--- loncom/interface/lonmenu.pm 2022/05/28 15:55:34 1.519 +++ loncom/interface/lonmenu.pm 2023/10/06 02:04:47 1.540 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines to control the menu # -# $Id: lonmenu.pm,v 1.519 2022/05/28 15:55:34 raeburn Exp $ +# $Id: lonmenu.pm,v 1.540 2023/10/06 02:04:47 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -99,7 +99,7 @@ It gets filled in the BEGIN block of thi =over -=item prep_menuitems(\@menuitem,$ltitarget,$deeplinktarget,$listclass,$linkattr) +=item prep_menuitems(\@menuitem,$target,$listclass,$linkattr) This routine wraps a menuitem in proper HTML. It is used by primary_menu() and secondary_menu(). @@ -210,7 +210,6 @@ use Apache::lonenc(); use Apache::lonlocal; use Apache::lonmsg(); use LONCAPA qw(:DEFAULT :match); -use LONCAPA::ltiutils; use HTML::Entities(); use Apache::lonwishlist(); @@ -220,9 +219,9 @@ use vars qw(@desklines %category_names % my @inlineremote; sub prep_menuitem { - my ($menuitem,$ltitarget,$deeplinktarget,$listclass,$linkattr) = @_; + my ($menuitem,$target,$listclass,$linkattr) = @_; return '' unless(ref($menuitem) eq 'ARRAY'); - my $link; + my ($link,$targetattr); if ($$menuitem[1]) { # graphical Link $link = "<img class=\"LC_noBorder\"" . " src=\"" . &Apache::loncommon::lonhttpdurl($$menuitem[1]) . "\"" @@ -230,16 +229,13 @@ sub prep_menuitem { } else { # textual Link $link = &mt($$menuitem[3]); } - my $target = ' target="_top"'; - if ($ltitarget eq 'iframe') { - $target =''; - } elsif ($deeplinktarget eq '_self') { - $target = ' target="'.$deeplinktarget.'"'; + if ($target ne '') { + $targetattr = ' target="'.$target.'"'; } return ($listclass?'<li class="'.$listclass.'">':'<li>').'<a' # highlighting for new messages . ( $$menuitem[4] eq 'newmsg' ? ' class="LC_new_message"' : '') - . qq| href="$$menuitem[0]"$target $linkattr>$link</a></li>|; + . qq| href="$$menuitem[0]"$targetattr $linkattr>$link</a></li>|; } # primary_menu() evaluates @primary_menu and returns a two item array, @@ -249,7 +245,7 @@ sub prep_menuitem { # @primary_menu is filled within the BEGIN block of this module with # entries from mydesk.tab sub primary_menu { - my ($crstype,$ltimenu,$menucoll,$menuref,$links_disabled) = @_; + my ($crstype,$ltimenu,$menucoll,$menuref,$links_disabled,$links_target) = @_; my (%menu,%ltiexc,%menuopts); # each element of @primary contains following array: # (link url, icon path, alt text, link text, condition, position) @@ -267,10 +263,9 @@ sub primary_menu { my %roles_in_env; $rolecount = &Apache::lonroles::roles_from_env(\%roles_in_env,$update); } - my ($lti,$ltitarget,$deeplinktarget); + my $lti; if ($env{'request.lti.login'}) { $lti = 1; - $ltitarget = $env{'request.lti.target'}; if (ref($ltimenu) eq 'HASH') { foreach my $item ('fullname','logout') { unless ($ltimenu->{$item}) { @@ -279,8 +274,26 @@ sub primary_menu { } } } - if ($env{'request.deeplink.login'}) { - $deeplinktarget = $env{'request.deeplink.target'}; + my ($listclass,$linkattr,$target); + if ($links_disabled) { + $listclass = 'LCisDisabled'; + $linkattr = 'aria-disabled="true"'; + } + if ($links_target ne '') { + $target = $links_target; + } else { + my ($ltitarget,$deeplinktarget); + if ($env{'request.lti.login'}) { + $ltitarget = $env{'request.lti.target'}; + } + if ($env{'request.deeplink.login'}) { + $deeplinktarget = $env{'request.deeplink.target'}; + } + if (($ltitarget eq 'iframe') || ($deeplinktarget eq '_self')) { + $target = '_self'; + } else { + $target = '_top'; + } } if (($menucoll) && (ref($menuref) eq 'HASH')) { %menuopts = %{$menuref}; @@ -337,18 +350,10 @@ sub primary_menu { } } } - my ($listclass,$linkattr); - if ($links_disabled) { - $listclass = 'LCisDisabled'; - $linkattr = 'aria-disabled="true"'; - } if (defined($primary_submenu{$title})) { - my ($link,$target); + my $link; if ($menuitem->[0] ne '') { $link = $menuitem->[0]; - unless (($ltitarget eq 'iframe') || ($deeplinktarget eq '_self')) { - $target = '_top'; - } } else { $link = '#'; } @@ -396,7 +401,7 @@ sub primary_menu { 'helpdeskmail', $defdom,$origmail); if ($to ne '') { - $menu{$position} .= &prep_menuitem($menuitem,$ltitarget,$deeplinktarget,$listclass,$linkattr); + $menu{$position} .= &prep_menuitem($menuitem,$target,$listclass,$linkattr); } } else { $menu{$position} .= ($listclass?'<li class="'.$listclass.'">':'<li>'). @@ -409,9 +414,9 @@ sub primary_menu { $$menuitem[0] = '/adm/login'; } } - $menu{$position} .= prep_menuitem($menuitem,$ltitarget,$deeplinktarget,$listclass,$linkattr); + $menu{$position} .= prep_menuitem($menuitem,$target,$listclass,$linkattr); } else { - $menu{$position} .= prep_menuitem($menuitem,$ltitarget,$deeplinktarget,$listclass,$linkattr); + $menu{$position} .= prep_menuitem($menuitem,$target,$listclass,$linkattr); } } my @output = ('',''); @@ -450,7 +455,8 @@ sub getauthor{ } sub secondary_menu { - my ($httphost,$ltiscope,$ltimenu,$noprimary,$menucoll,$menuref,$links_disabled) = @_; + my ($httphost,$ltiscope,$ltimenu,$noprimary,$menucoll,$menuref, + $links_disabled,$links_target) = @_; my $menu; my $crstype = &Apache::loncommon::course_type(); @@ -527,7 +533,7 @@ sub secondary_menu { %menuopts = %{$menuref}; } - my ($listclass,$linkattr); + my ($listclass,$linkattr,$target); if ($links_disabled) { $listclass = 'LCisDisabled'; $linkattr = 'aria-disabled="true"'; @@ -542,12 +548,22 @@ sub secondary_menu { } } - my ($roleswitcher_js,$roleswitcher_form,$ltitarget,$deeplinktarget); - if ($env{'request.lti.login'}) { - $ltitarget = $env{'request.lti.target'}; - } - if ($env{'request.deeplink.login'}) { - $deeplinktarget = $env{'request.deeplink.target'}; + my ($roleswitcher_js,$roleswitcher_form); + if ($links_target ne '') { + $target = $links_target; + } else { + my ($ltitarget,$deeplinktarget); + if ($env{'request.lti.login'}) { + $ltitarget = $env{'request.lti.target'}; + } + if ($env{'request.deeplink.login'}) { + $deeplinktarget = $env{'request.deeplink.target'}; + } + if (($ltitarget eq 'iframe') || ($deeplinktarget eq '_self')) { + $target = '_self'; + } else { + $target = '_top'; + } } foreach my $menuitem (@secondary_menu) { @@ -603,12 +619,9 @@ sub secondary_menu { } } if (defined($secondary_submenu{$title})) { - my ($link,$target); + my $link; if ($menuitem->[0] ne '') { $link = $menuitem->[0]; - unless (($ltitarget eq 'iframe') || ($deeplinktarget eq '_self')) { - $target = '_top'; - } } else { $link = '#'; } @@ -657,7 +670,7 @@ sub secondary_menu { &roles_selector( $env{'course.' . $env{'request.course.id'} . '.domain'}, $env{'course.' . $env{'request.course.id'} . '.num'}, - $httphost,$menucoll,$menuref + $httphost,$target,$menucoll,$menuref ); if (($$menuitem[5]) && (!$menuopts{$$menuitem[5]})) { next unless ($has_opa_priv); @@ -691,7 +704,7 @@ sub secondary_menu { } $$menuitem[0] = &HTML::Entities::encode($$menuitem[0],'&<>"'); } - $menu .= &prep_menuitem(\@$menuitem,$ltitarget,$deeplinktarget,$listclass,$linkattr); + $menu .= &prep_menuitem(\@$menuitem,$target,$listclass,$linkattr); } } if ($menu =~ /\[url\].*\[symb\]/) { @@ -731,12 +744,12 @@ sub secondary_menu { sub create_submenu { my ($link,$target,$title,$submenu,$translate,$addclass,$listclass,$linkattr) = @_; return unless (ref($submenu) eq 'ARRAY'); - my $disptarget; - if ($target ne '') { - $disptarget = ' target="'.$target.'"'; + my $targetattr; + if (($target ne '') && ($link ne '#')) { + $targetattr = ' target="'.$target.'"'; } my $menu = '<li class="LC_hoverable '.$addclass.'">'. - '<a href="'.$link.'"'.$disptarget.'>'. + '<a href="'.$link.'"'.$targetattr.'>'. '<span class="LC_nobreak">'.$title. '<span class="LC_fontsize_small" style="font-weight:normal;">'. ' ▼</span></span></a>'. @@ -813,16 +826,17 @@ sub build_submenu { } $href =~ s/\[returnurl\]/$returnurl/; } + my $targetattr; unless (($href eq '') || ($href =~ /^\#/)) { - if ($target eq '_top') { - $target = ' target="_top"'; + if ($target ne '') { + $targetattr = ' target="'.$target.'"'; } } $menu .= '<li '; $menu .= ($listclass?'class="'.$listclass.'" ':''); $menu .= 'style="margin:0;padding:0;'. $bordertop . $borderbot .'">'; - $menu .= '<a href="'.$href.'"'.$target.' '.$linkattr.'>' . $title . '</a>'; + $menu .= '<a href="'.$href.'"'.$targetattr.' '.$linkattr.'>' . $title . '</a>'; $menu .= '</li>'; } } @@ -831,7 +845,8 @@ sub build_submenu { } sub innerregister { - my ($forcereg,$bread_crumbs,$group,$pagebuttonshide,$hostname,$ltiscope,$ltiuri) = @_; + my ($forcereg,$bread_crumbs,$group,$pagebuttonshide,$hostname, + $ltiscope,$ltiuri,$showncrumbsref) = @_; my $const_space = ($env{'request.state'} eq 'construct'); my $is_const_dir = 0; @@ -872,10 +887,7 @@ sub innerregister { } } } - unless (($forcereg) && - ($env{'request.noversionuri'} eq '/adm/navmaps') && - ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'}) || - (($crstype eq 'Placement') && (!$env{'request.role.adv'})) || + unless ((($crstype eq 'Placement') && (!$env{'request.role.adv'})) || ($ltiscope eq 'map') || ($ltiscope eq 'resource')) { @crumbs = ({text => $crstype.' Contents', href => "Javascript:gopost('/adm/navmaps','')"}); @@ -922,27 +934,51 @@ sub innerregister { if ($env{'form.title'}) { $title = $env{'form.title'}; } - my $trail; + my ($trail,$cnum,$cdom); + if ($env{'form.folderpath'}) { + $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + &Apache::loncommon::validate_folderpath(1,'',$cnum,$cdom); + } if ($env{'form.folderpath'}) { &prepare_functions($resurl,$forcereg,$group,undef,undef,1,$hostname); + $title = &HTML::Entities::encode($title,'\'"<>&'); ($trail) = - &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); + &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,1); } else { &Apache::lonhtmlcommon::add_breadcrumb( {text => "Supplemental $crstype Content", href => "javascript:gopost('/adm/supplemental','')"}); - $title = &mt('View Resource'); + $title = &HTML::Entities::encode(&mt('View Resource'),'\'"<>&'); ($trail) = - &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); + &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,1); + } + if (ref($showncrumbsref)) { + $$showncrumbsref = 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'); + $title = &HTML::Entities::encode(&mt('Syllabus File'),'\'"<>&'); + my ($trail) = + &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,1); + if (ref($showncrumbsref)) { + $$showncrumbsref = 1; + } + return $trail; + } elsif (($resurl eq '/public'.$courseurl.'/syllabus') && + ($env{'form.folderpath'})) { + if ($env{'form.title'}) { + $title = $env{'form.title'}; + } else { + $title = 'Syllabus'; + } + &prepare_functions($resurl,$forcereg,$group,undef,undef,1,$hostname); + $title = &HTML::Entities::encode($title,'\'"<>&'); my ($trail) = - &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,$hostname); + &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,1); return $trail; } unless ($env{'request.state'} eq 'construct') { @@ -1037,11 +1073,107 @@ sub innerregister { 'Folder/Page Content'); } # End modifiable folder/page container check + +# +# Determine whether to show View As button for shortcut to display problem, answer, and submissions +# + + if (($env{'request.symb'} ne '') && + ($env{'request.filename'}=~/$LONCAPA::assess_re/) && + (($perms{'mgr'}) || ($perms{'vgr'}))) { + my ($viewas,$text,$change,$visibility,$vuname,$vudom,$vid,$leftvis,$defdom, + $domselector,$righticon); + my %lt = &Apache::lonlocal::texthash( + view => 'View', + upda => 'Update', + ); + my $possdomstr = $env{'course.'.$env{'request.course.id'}.'.internal.userdomains'}; + if ($possdomstr =~ /,/) { + my @possdoms = split(/,/,$possdomstr); + if ($env{'request.user_in_effect'} =~ /^$match_username:($match_domain)$/) { + $defdom = $1; + } elsif (grep(/^\Q$cdom\E$/,@possdoms)) { + $defdom = $cdom; + } elsif (&Apache::lonnet::domain($possdoms[0]) ne '') { + $defdom = $possdoms[0]; + } + $domselector = &Apache::loncommon::select_dom_form($defdom,'vudom','','','',\@possdoms); + } elsif (($possdomstr ne '') && (&Apache::lonnet::domain($possdomstr) ne '')) { + if ($env{'request.user_in_effect'} =~ /^$match_username:($match_domain)$/) { + $defdom = $1; + } else { + $defdom = $possdomstr; + } + } + if ($env{'request.user_in_effect'} =~ /^($match_username):($match_domain)$/) { + ($vuname,$vudom) = ($1,$2); + unless (&Apache::lonnet::is_advanced_user($vudom,$vuname)) { + $vid = (&Apache::lonnet::idrget($vudom,$vuname))[1]; + } + $viewas = $env{'request.user_in_effect'}; + $text = $lt{'upda'}; + $change = 'off'; + $visibility = 'inline'; + $leftvis = 'none'; + $defdom = $vudom; + $righticon = '✖'; + } else { + $text = $lt{'view'}; + $change = 'on'; + $visibility = 'none'; + $leftvis = 'inline'; + if ($defdom eq '') { + $defdom = $cdom; + } + } + my $sellink = &Apache::loncommon::selectstudent_link('userview','vuname','vudom','','','vuidentifier'); + my $selscript=&Apache::loncommon::studentbrowser_javascript(); + my $shownsymb = &HTML::Entities::encode(&Apache::lonenc::check_encrypt($env{'request.symb'}),'<>&"'); + my $input; + my @items = ( + '<label><input type="radio" name="vuidentifier" value="uname" checked="checked" onclick="javascript:toggleIdentifier(this.form);" />', + '</label><input name="vuname" type="text" size="6" value="'.$vuname.'" id="LC_vuname" />', + '<label><input type="radio" name="vuidentifier" value="uid" onclick="javascript:toggleIdentifier(this.form);" />', + '</label><input name="vid" type="hidden" size="6" value="'.$vid.'" id="LC_vid" />' + ); + if ($domselector) { + push(@items,$domselector); + $input = &mt('[_1]User:[_2] or [_3]ID:[_4] at [_5] | ',@items); + } else { + $input = &mt('[_1]Username:[_2] or [_3]ID:[_4] | ',@items). + '<input name="vudom" type="hidden" value="'.$defdom.'" />'; + } + $input .= '<input name="LC_viewas" type="hidden" value="'.$viewas.'" />', + '<input name="symb" type="hidden" value="'.$shownsymb.'" />'; + my $chooser = <<END; +$selscript +<a href="javascript:toggleViewAsUser('$change');" class="LC_menubuttons_link"> +<span id="usexpand" class="LC_menubuttons_inline_text" style="display:$leftvis">► </span> +</a> +<fieldset id="LC_selectuser" style="display:$visibility"> +<form name="userview" action="" method="post" onsubmit="event.preventDefault(); return validCourseUser(this,'$change');"> +<span class="LC_menubuttons_inline_text LC_nobreak"> +$input +$sellink +</span> + <input type="submit" value="$text" /> +</form> +</fieldset> +<a href="javascript:toggleViewAsUser('$change');" class="LC_menubuttons_link"> +<span id="uscollapse" class="LC_menubuttons_inline_text">$righticon</span> +</a> +END + &switch('','',7,5,'viewuser.png','View As','user[_1]', + 'toggleViewAsUser('."'$change'".')', + 'View As','','',$chooser); + } +# End view as user check + } # End course context # Prepare the rest of the buttons - my ($menuitems,$got_prt,$got_wishlist); + my ($menuitems,$got_prt,$got_wishlist,$crsauthor); if ($const_space) { # # We are in construction space @@ -1050,16 +1182,25 @@ sub innerregister { my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'}; my ($udom,$uname,$thisdisfn) = ($env{'request.filename'}=~m{^\Q$londocroot/priv/\E([^/]+)/([^/]+)/(.*)$}); + my $crsauthor; + if (($env{'request.course.id'}) && + ($env{'course.'.$env{'request.course.id'}.'.num'} eq $uname) && + ($env{'course.'.$env{'request.course.id'}.'.domain'} eq $udom)) { + $crsauthor = 1; + } my $currdir = '/priv/'.$udom.'/'.$uname.'/'.$thisdisfn; if ($currdir =~ m-/$-) { $is_const_dir = 1; - if ($thisdisfn eq '') { - unless (($env{'request.course.id'}) && - ($env{'course.'.$env{'request.course.id'}.'.num'} eq $uname) && - ($env{'course.'.$env{'request.course.id'}.'.domain'} eq $udom)) { - $is_const_dir = 2; - } + if (($thisdisfn eq '') && ($crsauthor)) { + $is_const_dir = 2; } + my $esc_currdir = &Apache::loncommon::escape_single($currdir); + $menuitems=(<<ENDMENUITEMS); +s&6&3&pub.png&Publish&dir[_2]&gocstr('/adm/publish','$esc_currdir')&Publish this Directory +s&7&4&docs-22x22.png&Edit Metadata&defaults[_1]&gopost('${esc_currdir}default.meta','')&Edit metadata for this Directory +s&7&2&prt.png&Print&printout[_1]&gocstr('/adm/printout','$esc_currdir')&Print contents of directory +s&7&1&del.png&Delete&dir[_3]&gocstr('/adm/cfile?action=delete','$esc_currdir')&Delete this Directory +ENDMENUITEMS } else { $currdir =~ s|[^/]+$||; my $cleandisfn = &Apache::loncommon::escape_single($thisdisfn); @@ -1074,12 +1215,19 @@ sub innerregister { # # Probably should be in mydesk.tab # - $menuitems=(<<ENDMENUITEMS); + if (($crsauthor) && ($pubfile eq "/res/$udom/$uname/default.rights")) { + $menuitems=(<<ENDMENUITEMS); +s&6&1&list.png&Directory&dir[_1]&golist('$esc_currdir')&List current directory +s&6&3&pub.png&Publish&resource[_3]&gocstr('/adm/publish','/priv/$udom/$uname/$cleandisfn')&Publish this resource +ENDMENUITEMS + } else { + $menuitems=(<<ENDMENUITEMS); s&6&1&list.png&Directory&dir[_1]&golist('$esc_currdir')&List current directory s&6&2&rtrv.png&Retrieve&version[_1]&gocstr('/adm/retrieve','/priv/$udom/$uname/$cleandisfn')&Retrieve old version s&6&3&pub.png&Publish&resource[_3]&gocstr('/adm/publish','/priv/$udom/$uname/$cleandisfn')&Publish this resource s&7&3©.png&Copy&resource[_4]&gocstr('/adm/cfile?action=copy','/priv/$udom/$uname/$cleandisfn')&Copy this resource ENDMENUITEMS + } # # Rename and Delete only available if obsolete or unpublished # @@ -1165,8 +1313,12 @@ ENDMENUITEMS $got_prt = 1; if (($env{'user.adv'}) && ($env{'request.uri'} =~ /^\/res/) && (!$env{'request.enc'})) { - my ($cnum,$cdom) = &Apache::loncommon::crsauthor_url($env{'request.uri'}); - unless ($cnum) { + my $privurl = $env{'request.uri'}; + $privurl =~ s{^/res/}{/priv/}; + my ($cnum,$cdom) = &Apache::loncommon::crsauthor_url($privurl); + if ($cnum) { + $crsauthor = 1; + } else { # wishlist is only available for users with access to resource-pool # and links can only be set for resources within the resource-pool $menuitems .= (<<ENDMENUITEMS); @@ -1221,7 +1373,7 @@ s&8&3&prt.png&Print&printout[_1]&gopost( ENDMENUITEMS $got_prt = 1; } - unless ($got_wishlist) { + unless (($got_wishlist) || ($crsauthor)) { if (($env{'user.adv'}) && (!$env{'request.enc'})) { # wishlist is only available for users with access to resource-pool $menuitems .= (<<ENDMENUITEMS); @@ -1249,10 +1401,13 @@ ENDMENUITEMS } } } - my $showprogress; + my ($showprogress,$linkprotout); if (($crstype eq 'Placement') && (!$env{'request.role.adv'})) { $showprogress = &placement_progress(); } + if ($env{'request.deeplink.login'}) { + $linkprotout = &linkprot_exit(); + } my $addremote=0; foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} } @@ -1278,6 +1433,9 @@ ENDMENUITEMS if ($countdown) { &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$countdown); } + if ($linkprotout) { + &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$linkprotout); + } if ($showprogress) { &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$showprogress); } @@ -1286,6 +1444,9 @@ ENDMENUITEMS if ($countdown) { unshift(@tools,$countdown); } + if ($linkprotout) { + unshift(@tools,$linkprotout); + } &Apache::lonhtmlcommon::add_breadcrumb_tool( 'tools',@tools); @@ -1303,6 +1464,9 @@ ENDMENUITEMS if ($showprogress) { &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$showprogress); } + if ($linkprotout) { + &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$linkprotout); + } } my ($topic_help,$topic_help_text); if ($is_const_dir == 2) { @@ -1314,6 +1478,9 @@ ENDMENUITEMS $topic_help_text = 'About WebDAV access'; } } + if (ref($showncrumbsref)) { + $$showncrumbsref = 1; + } return &Apache::lonhtmlcommon::scripttag('', 'start') . &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'','','','',$topic_help,$topic_help_text) . &Apache::lonhtmlcommon::scripttag('', 'end'); @@ -1337,8 +1504,12 @@ sub get_editbutton { if ($env{'form.folderpath'}) { $suppanchor = $env{'form.anchor'}; } + my $shownsymb; + if ($env{'request.symb'}) { + $shownsymb = &Apache::lonenc::check_encrypt($env{'request.symb'}); + } $jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver, - $forceedit,$forcereg,$env{'request.symb'}, + $forceedit,$forcereg,$env{'request.symb'},$shownsymb, &escape($env{'form.folderpath'}), &escape($env{'form.title'}),$hostname, $env{'form.idx'},&escape($env{'form.suppurl'}), @@ -1597,7 +1768,7 @@ sub advtools_crumbs { 'advtools', @funcs[61,73,74,71,72]); } else { &Apache::lonhtmlcommon::add_breadcrumb_tool( - 'advtools', @funcs[61,71,72,73,74,92]); + 'advtools', @funcs[61,71,72,73,74,75,92]); } } elsif ($env{'request.noversionuri'} eq '/adm/viewclasslist') { &Apache::lonhtmlcommon::add_breadcrumb_tool( @@ -1619,7 +1790,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)=@_; + my ($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat,$nobreak,$form)=@_; $act=~s/\$uname/$uname/g; $act=~s/\$udom/$udom/g; $top=&mt($top); @@ -1670,7 +1841,7 @@ sub switch { } else { $inlineremote[$idx] = '<a title="'.$desc.'" class="LC_menubuttons_link" href="javascript:'.$act.';">'.$pic. - '<span class="LC_menubuttons_inline_text">'.$top.' </span></a>'; + '<span class="LC_menubuttons_inline_text">'.$top.' </span></a>'.$form; } } return ''; @@ -1934,8 +2105,17 @@ sub check_for_rcrs { if (!$showreqcrs) { foreach my $type (@reqtypes) { if ($env{'environment.reqcrsotherdom.'.$type} ne '') { - $showreqcrs = 1; - last; + my @domains = split(',',$env{'environment.reqcrsotherdom.'.$type}); + foreach my $entry (@domains) { + my ($extdom,$extopt) = split(':',$entry); + if (&Apache::lonnet::will_trust('reqcrs',$env{'user.domain'},$extdom)) { + $showreqcrs = 1; + last; + } + } + if ($showreqcrs) { + last; + } } } } @@ -2202,6 +2382,114 @@ END } } +sub view_as_js { + my ($url,$symb) = @_; + my %lt = &Apache::lonlocal::texthash( + ente => 'Enter a username or a student/employee ID', + info => 'Information you entered does not match a valid course user', + ); + &js_escape(\%lt); + return <<"END"; + +function toggleViewAsUser(change) { + if (document.getElementById('LC_selectuser')) { + var seluserid = document.getElementById('LC_selectuser'); + var currstyle = seluserid.style.display; + if (change == 'off') { + document.userview.elements['LC_viewas'].value = ''; + document.userview.elements['vuname'].value = ''; + document.userview.elements['vid'].value = ''; + document.userview.submit(); + return; + } + if ((document.getElementById('usexpand')) && (document.getElementById('uscollapse'))) { + if (currstyle == 'inline') { + seluserid.style.display = 'none'; + document.getElementById('usexpand').innerHTML='► '; + document.getElementById('uscollapse').innerHTML=''; + } else { + seluserid.style.display = 'inline'; + document.getElementById('usexpand').innerHTML=''; + document.getElementById('uscollapse').innerHTML='◄ '; + toggleIdentifier(document.userview); + } + } + } + return; +} + +function validCourseUser(form,change) { + var possuname = form.elements['vuname'].value; + var possuid = form.elements['vid'].value; + var domelem = form.elements['vudom']; + var possudom = ''; + if ((domelem.tagName === 'INPUT') && ((domelem.type === 'text') || (domelem.type === 'hidden'))) { + possudom = domelem.value; + } else if (domelem.tagName === 'SELECT') { + possudom = domelem.options[domelem.selectedIndex].value; + } + if ((possuname == '') && (possuid == '')) { + if (change == 'off') { + form.elements['LC_viewas'].value = ''; + form.submit(); + } else { + alert("$lt{'ente'}"); + } + return; + } + var http = new XMLHttpRequest(); + var url = "/adm/courseuser"; + var params = "uname="+possuname+"&uid="+possuid+"&udom="+possudom; + http.open("POST", url, true); + http.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); + http.onreadystatechange = function() { + if (http.readyState == 4 && http.status == 200) { + var data = JSON.parse(http.responseText); + if (Array.isArray(data.match)) { + var len = data.match.length; + if (len == 2) { + if (data.match[0] != '' && data.match[1] != '') { + form.elements['LC_viewas'].value = data.match[0]+':'+data.match[1]; + form.submit(); + } + } else { + alert("$lt{'info'}"); + } + } + } + return; + } + http.send(params); + return false; +} + +function toggleIdentifier(form) { + if ((document.getElementById('LC_vuname')) && (document.getElementById('LC_vid'))) { + var radioelem = form.elements['vuidentifier']; + if (radioelem.length > 0) { + var i; + for (i=0; i<radioelem.length; i++) { + if (radioelem[i].checked == true) { + if (radioelem[i].value == 'uname') { + document.getElementById('LC_vuname').type = 'text'; + document.getElementById('LC_vid').type = 'hidden'; + document.getElementById('LC_vid').value = ''; + } else { + document.getElementById('LC_vuname').type = 'hidden'; + document.getElementById('LC_vuname').value = ''; + document.getElementById('LC_vid').type = 'text'; + } + break; + } + } + } + } + return; +} + +END +} + sub utilityfunctions { my ($httphost) = @_; my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0])); @@ -2243,6 +2531,24 @@ sub utilityfunctions { my $countdown = &countdown_toggle_js(); + my $viewuser; + if (($env{'request.course.id'}) && + ($env{'request.symb'} ne '') && + ($env{'request.filename'}=~/$LONCAPA::assess_re/)) { + my $canview; + foreach my $priv ('msg','vgr') { + $canview = &Apache::lonnet::allowed($priv,$env{'request.course.id'}); + if (!$canview && $env{'request.course.sec'} ne '') { + $canview = + &Apache::lonnet::allowed($priv,"$env{'request.course.id'}/$env{'request.course.sec'}"); + } + last if ($canview); + } + if ($canview) { + $viewuser = &view_as_js($esc_url,$esc_symb); + } + } + my ($ltitarget,$deeplinktarget); if ($env{'request.lti.login'}) { $ltitarget = $env{'request.lti.target'}; @@ -2459,6 +2765,8 @@ function open_aboutLC() { $countdown +$viewuser + ENDUTILITY } @@ -2490,7 +2798,7 @@ sub constspaceform { unless ((($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) || (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self'))) { $target = ' target="_top"'; - $printtarget = ' target="_parent"'; + $printtarget = ' target="_top"'; } } return(<<ENDCONSTSPACEFORM); @@ -2526,7 +2834,7 @@ sub hidden_button_check { } sub roles_selector { - my ($cdom,$cnum,$httphost,$menucoll,$menuref) = @_; + my ($cdom,$cnum,$httphost,$target,$menucoll,$menuref) = @_; my $crstype = &Apache::loncommon::course_type(); my $now = time; my (%courseroles,%seccount,%courseprivs,%roledesc); @@ -2632,11 +2940,15 @@ sub roles_selector { } } if ((keys(%seccount) > 1) || ($numdiffsec > 1)) { + my $targetattr; + if ($target ne '') { + $targetattr = ' target="'.$target.'"'; + } my @submenu; $js = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs, \%roledesc,$privref,$menucoll,$menuref); $form = - '<form name="rolechooser" method="post" action="'.$httphost.'/adm/roles">'."\n". + '<form name="rolechooser" method="post" action="'.$httphost.'/adm/roles"'.$targetattr.'>'."\n". ' <input type="hidden" name="destinationurl" value="'. &HTML::Entities::encode($destinationurl).'" />'."\n". ' <input type="hidden" name="gotorole" value="1" />'."\n". @@ -2699,7 +3011,7 @@ sub roles_selector { } } if (@submenu > 0) { - $switcher = &create_submenu('','',&mt('Switch role'),\@submenu); + $switcher = &create_submenu('#',$target,&mt('Switch role'),\@submenu); } } return ($js,$form,$switcher,$has_opa_priv); @@ -3152,6 +3464,94 @@ sub placement_progress { &mt('Test is [_1]% complete',$complete).'</span>'; } +sub linkprot_exit { + if (($env{'request.course.id'}) && ($env{'request.deeplink.login'})) { + my ($deeplink_symb,$deeplink); + my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; + my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; + if (($cnum ne '') && ($cdom ne '')) { + $deeplink_symb = &Apache::loncommon::deeplink_login_symb($cnum,$cdom); + if ($deeplink_symb) { + if ($deeplink_symb =~ /\.(page|sequence)$/) { + my $mapname = &Apache::lonnet::deversion((&Apache::lonnet::decode_symb($deeplink_symb))[2]); + my $navmap = Apache::lonnavmaps::navmap->new(); + if (ref($navmap)) { + $deeplink = $navmap->get_mapparam(undef,$mapname,'0.deeplink'); + } + } else { + $deeplink = &Apache::lonnet::EXT('resource.0.deeplink',$deeplink_symb); + } + if ($deeplink ne '') { + my ($state,$others,$listed,$scope,$protect,$display,$target,$exit) = split(/,/,$deeplink); + my %lt = &Apache::lonlocal::texthash( + title => 'Exit Tool', + okdone => 'Click "OK" to exit embedded tool', + cancel => 'Click "Cancel" to continue working.', + ok => 'OK', + exit => 'Cancel', + ); + if ($exit) { + my ($show,$text) = split(/:/,$exit); + unless ($show eq 'no') { + my $height = 250; + my $width = 300; + my $exitbuttontext; + if ($text eq '') { + $exitbuttontext = &mt('Exit Tool'); + } else { + $exitbuttontext = $text; + } + return <<END; +<form method="post" name="LCexitButton" action="/adm/linkexit"> + <input type="hidden" name="LC_deeplink_exit" value="" /> + <button id="LC_exit-confirm-opener" type="button">$exitbuttontext</button> +</form> + +<div id="LC_exit-confirm" title="$lt{'title'}"> + <p>$lt{'okdone'} $lt{'cancel'}</p> +</div> + +<script type="text/javascript"> +// <![CDATA[ +\$( "#LC_exit-confirm" ).dialog({ autoOpen: false }); +\$( "#LC_exit-confirm-opener" ).click(function() { + \$( "#LC_exit-confirm" ).dialog( "open" ); + \$( "#LC_exit-confirm" ).dialog({ + resizable: false, + height: $height, + width: $width, + modal: true, + buttons: [ + { + text: "$lt{'ok'}", + click: function() { + \$( this ).dialog( "close" ); + \$( '[name="LC_deeplink_exit"]' )[0].value = 'true'; + \$( '[name="LCexitButton"]' )[0].submit(); + }, + }, + { + text: "$lt{'exit'}", + click: function() { + \$( this ).dialog( "close" ); + }, + }, + ], + }); +}); +// ]]> +</script> + +END + } + } + } + } + } + } + return; +} + # ================================================================ Main Program BEGIN {