loncom/interface/lonmenu.pm - diff

Return to lonmenu.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonmenu.pm between versions 1.512 and 1.529

version 1.512, 2021/11/15 23:29:20	version 1.529, 2022/10/29 14:47:00
Line 99 It gets filled in the BEGIN block of thi	Line 99 It gets filled in the BEGIN block of thi

=over	=over

=item prep_menuitems(\@menuitem,$ltitarget)	=item prep_menuitems(\@menuitem,$target,$listclass,$linkattr)

This routine wraps a menuitem in proper HTML. It is used by primary_menu() and	This routine wraps a menuitem in proper HTML. It is used by primary_menu() and
secondary_menu().	secondary_menu().
Line 220 use vars qw(@desklines %category_names %	Line 220 use vars qw(@desklines %category_names %
my @inlineremote;	my @inlineremote;

sub prep_menuitem {	sub prep_menuitem {
my ($menuitem,$ltitarget,$listclass,$linkattr) = @_;	my ($menuitem,$target,$listclass,$linkattr) = @_;
return '' unless(ref($menuitem) eq 'ARRAY');	return '' unless(ref($menuitem) eq 'ARRAY');
my $link;	my ($link,$targetattr);
if ($$menuitem[1]) { # graphical Link	if ($$menuitem[1]) { # graphical Link
$link = "<img class=\"LC_noBorder\""	$link = "<img class=\"LC_noBorder\""
. " src=\"" . &Apache::loncommon::lonhttpdurl($$menuitem[1]) . "\""	. " src=\"" . &Apache::loncommon::lonhttpdurl($$menuitem[1]) . "\""
Line 230 sub prep_menuitem {	Line 230 sub prep_menuitem {
} else { # textual Link	} else { # textual Link
$link = &mt($$menuitem[3]);	$link = &mt($$menuitem[3]);
}	}
my $target = ' target="_top"';	if ($target ne '') {
if ($ltitarget eq 'iframe') {	$targetattr = ' target="'.$target.'"';
$target ='';
}	}
return ($listclass?'<li class="'.$listclass.'">':'<li>').'<a'	return ($listclass?'<li class="'.$listclass.'">':'<li>').'<a'
# highlighting for new messages	# highlighting for new messages
. ( $$menuitem[4] eq 'newmsg' ? ' class="LC_new_message"' : '')	. ( $$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,	# primary_menu() evaluates @primary_menu and returns a two item array,
Line 247 sub prep_menuitem {	Line 246 sub prep_menuitem {
# @primary_menu is filled within the BEGIN block of this module with	# @primary_menu is filled within the BEGIN block of this module with
# entries from mydesk.tab	# entries from mydesk.tab
sub primary_menu {	sub primary_menu {
my ($crstype,$ltimenu,$menucoll,$menuref,$links_disabled) = @_;	my ($crstype,$ltimenu,$menucoll,$menuref,$links_disabled,$links_target) = @_;
my (%menu,%ltiexc,%menuopts);	my (%menu,%ltiexc,%menuopts);
# each element of @primary contains following array:	# 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, position)
Line 265 sub primary_menu {	Line 264 sub primary_menu {
my %roles_in_env;	my %roles_in_env;
$rolecount = &Apache::lonroles::roles_from_env(\%roles_in_env,$update);	$rolecount = &Apache::lonroles::roles_from_env(\%roles_in_env,$update);
}	}
my ($lti,$ltitarget);	my $lti;
if ($env{'request.lti.login'}) {	if ($env{'request.lti.login'}) {
$lti = 1;	$lti = 1;
$ltitarget = $env{'request.lti.target'};
if (ref($ltimenu) eq 'HASH') {	if (ref($ltimenu) eq 'HASH') {
foreach my $item ('fullname','logout') {	foreach my $item ('fullname','logout') {
unless ($ltimenu->{$item}) {	unless ($ltimenu->{$item}) {
Line 277 sub primary_menu {	Line 275 sub primary_menu {
}	}
}	}
}	}
	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')) {	if (($menucoll) && (ref($menuref) eq 'HASH')) {
%menuopts = %{$menuref};	%menuopts = %{$menuref};
}	}
Line 332 sub primary_menu {	Line 351 sub primary_menu {
}	}
}	}
}	}
my ($listclass,$linkattr);
if ($links_disabled) {
$listclass = 'LCisDisabled';
$linkattr = 'aria-disabled="true"';
}
if (defined($primary_submenu{$title})) {	if (defined($primary_submenu{$title})) {
my ($link,$target);	my $link;
if ($menuitem->[0] ne '') {	if ($menuitem->[0] ne '') {
$link = $menuitem->[0];	$link = $menuitem->[0];
unless ($ltitarget eq 'iframe') {
$target = '_top';
}
} else {	} else {
$link = '#';	$link = '#';
}	}
Line 391 sub primary_menu {	Line 402 sub primary_menu {
'helpdeskmail',	'helpdeskmail',
$defdom,$origmail);	$defdom,$origmail);
if ($to ne '') {	if ($to ne '') {
$menu{$position} .= &prep_menuitem($menuitem,$ltitarget,$listclass,$linkattr);	$menu{$position} .= &prep_menuitem($menuitem,$target,$listclass,$linkattr);
}	}
} else {	} else {
$menu{$position} .= ($listclass?'<li class="'.$listclass.'">':'<li>').	$menu{$position} .= ($listclass?'<li class="'.$listclass.'">':'<li>').
Line 404 sub primary_menu {	Line 415 sub primary_menu {
$$menuitem[0] = '/adm/login';	$$menuitem[0] = '/adm/login';
}	}
}	}
$menu{$position} .= prep_menuitem($menuitem,$ltitarget,$listclass,$linkattr);	$menu{$position} .= prep_menuitem($menuitem,$target,$listclass,$linkattr);
} else {	} else {
$menu{$position} .= prep_menuitem($menuitem,$ltitarget,$listclass,$linkattr);	$menu{$position} .= prep_menuitem($menuitem,$target,$listclass,$linkattr);
}	}
}	}
my @output = ('','');	my @output = ('','');
Line 445 sub getauthor{	Line 456 sub getauthor{
}	}

sub secondary_menu {	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 $menu;

my $crstype = &Apache::loncommon::course_type();	my $crstype = &Apache::loncommon::course_type();
Line 522 sub secondary_menu {	Line 534 sub secondary_menu {
%menuopts = %{$menuref};	%menuopts = %{$menuref};
}	}

my ($listclass,$linkattr);	my ($listclass,$linkattr,$target);
if ($links_disabled) {	if ($links_disabled) {
$listclass = 'LCisDisabled';	$listclass = 'LCisDisabled';
$linkattr = 'aria-disabled="true"';	$linkattr = 'aria-disabled="true"';
Line 537 sub secondary_menu {	Line 549 sub secondary_menu {
}	}
}	}

my ($roleswitcher_js,$roleswitcher_form,$ltitarget);	my ($roleswitcher_js,$roleswitcher_form);
if ($env{'request.lti.login'}) {	if ($links_target ne '') {
$ltitarget = $env{'request.lti.target'};	$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) {	foreach my $menuitem (@secondary_menu) {
Line 595 sub secondary_menu {	Line 620 sub secondary_menu {
}	}
}	}
if (defined($secondary_submenu{$title})) {	if (defined($secondary_submenu{$title})) {
my ($link,$target);	my $link;
if ($menuitem->[0] ne '') {	if ($menuitem->[0] ne '') {
$link = $menuitem->[0];	$link = $menuitem->[0];
unless ($ltitarget eq 'iframe') {
$target = '_top';
}
} else {	} else {
$link = '#';	$link = '#';
}	}
Line 649 sub secondary_menu {	Line 671 sub secondary_menu {
&roles_selector(	&roles_selector(
$env{'course.' . $env{'request.course.id'} . '.domain'},	$env{'course.' . $env{'request.course.id'} . '.domain'},
$env{'course.' . $env{'request.course.id'} . '.num'},	$env{'course.' . $env{'request.course.id'} . '.num'},
$httphost,$ltitarget	$httphost,$target,$menucoll,$menuref
);	);
if (($$menuitem[5]) && (!$menuopts{$$menuitem[5]})) {	if (($$menuitem[5]) && (!$menuopts{$$menuitem[5]})) {
next unless ($has_opa_priv);	next unless ($has_opa_priv);
Line 683 sub secondary_menu {	Line 705 sub secondary_menu {
}	}
$$menuitem[0] = &HTML::Entities::encode($$menuitem[0],'&<>"');	$$menuitem[0] = &HTML::Entities::encode($$menuitem[0],'&<>"');
}	}
$menu .= &prep_menuitem(\@$menuitem,$ltitarget,$listclass,$linkattr);	$menu .= &prep_menuitem(\@$menuitem,$target,$listclass,$linkattr);
}	}
}	}
if ($menu =~ /\[url\].*\[symb\]/) {	if ($menu =~ /\[url\].*\[symb\]/) {
Line 723 sub secondary_menu {	Line 745 sub secondary_menu {
sub create_submenu {	sub create_submenu {
my ($link,$target,$title,$submenu,$translate,$addclass,$listclass,$linkattr) = @_;	my ($link,$target,$title,$submenu,$translate,$addclass,$listclass,$linkattr) = @_;
return unless (ref($submenu) eq 'ARRAY');	return unless (ref($submenu) eq 'ARRAY');
my $disptarget;	my $targetattr;
if ($target ne '') {	if (($target ne '') && ($link ne '#')) {
$disptarget = ' target="'.$target.'"';	$targetattr = ' target="'.$target.'"';
}	}
my $menu = '<li class="LC_hoverable '.$addclass.'">'.	my $menu = '<li class="LC_hoverable '.$addclass.'">'.
'<a href="'.$link.'"'.$disptarget.'>'.	'<a href="'.$link.'"'.$targetattr.'>'.
'<span class="LC_nobreak">'.$title.	'<span class="LC_nobreak">'.$title.
'<span class="LC_fontsize_small" style="font-weight:normal;">'.	'<span class="LC_fontsize_small" style="font-weight:normal;">'.
' ▼</span></span></a>'.	' ▼</span></span></a>'.
Line 805 sub build_submenu {	Line 827 sub build_submenu {
}	}
$href =~ s/\[returnurl\]/$returnurl/;	$href =~ s/\[returnurl\]/$returnurl/;
}	}
	my $targetattr;
unless (($href eq '') \|\| ($href =~ /^\#/)) {	unless (($href eq '') \|\| ($href =~ /^\#/)) {
if ($target eq '_top') {	if ($target ne '') {
$target = ' target="_top"';	$targetattr = ' target="'.$target.'"';
}	}
}	}

$menu .= '<li '.	$menu .= '<li ';
$menu .= ($listclass?'class="'.$listclass.'" ':'');	$menu .= ($listclass?'class="'.$listclass.'" ':'');
$menu .= 'style="margin:0;padding:0;'. $bordertop . $borderbot .'">';	$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>';	$menu .= '</li>';
}	}
}	}
Line 823 sub build_submenu {	Line 846 sub build_submenu {
}	}

sub innerregister {	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 $const_space = ($env{'request.state'} eq 'construct');
my $is_const_dir = 0;	my $is_const_dir = 0;

Line 864 sub innerregister {	Line 888 sub innerregister {
}	}
}	}
}	}
unless (($forcereg) &&	unless ((($crstype eq 'Placement') && (!$env{'request.role.adv'})) \|\|
($env{'request.noversionuri'} eq '/adm/navmaps') &&
($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'}) \|\|
(($crstype eq 'Placement') && (!$env{'request.role.adv'})) \|\|
($ltiscope eq 'map') \|\| ($ltiscope eq 'resource')) {	($ltiscope eq 'map') \|\| ($ltiscope eq 'resource')) {
@crumbs = ({text => $crstype.' Contents',	@crumbs = ({text => $crstype.' Contents',
href => "Javascript:gopost('/adm/navmaps','')"});	href => "Javascript:gopost('/adm/navmaps','')"});
Line 914 sub innerregister {	Line 935 sub innerregister {
if ($env{'form.title'}) {	if ($env{'form.title'}) {
$title = $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'}) {	if ($env{'form.folderpath'}) {
&prepare_functions($resurl,$forcereg,$group,undef,undef,1,$hostname);	&prepare_functions($resurl,$forcereg,$group,undef,undef,1,$hostname);
	$title = &HTML::Entities::encode($title,'\'"<>&');
($trail) =	($trail) =
&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);	&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,1);
} else {	} else {
&Apache::lonhtmlcommon::add_breadcrumb(	&Apache::lonhtmlcommon::add_breadcrumb(
{text => "Supplemental $crstype Content",	{text => "Supplemental $crstype Content",
href => "javascript:gopost('/adm/supplemental','')"});	href => "javascript:gopost('/adm/supplemental','')"});
$title = &mt('View Resource');	$title = &HTML::Entities::encode(&mt('View Resource'),'\'"<>&');
($trail) =	($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;	return $trail;
} elsif ($resurl =~ m{^\Q/uploaded$courseurl/portfolio/syllabus/}) {	} elsif ($resurl =~ m{^\Q/uploaded$courseurl/portfolio/syllabus/}) {
&Apache::lonhtmlcommon::clear_breadcrumbs();	&Apache::lonhtmlcommon::clear_breadcrumbs();
&prepare_functions('/public'.$courseurl."/syllabus",	&prepare_functions('/public'.$courseurl."/syllabus",
$forcereg,$group,undef,undef,1,$hostname);	$forcereg,$group,undef,undef,1,$hostname);
$title = &mt('Syllabus File');	$title = &HTML::Entities::encode(&mt('Syllabus File'),'\'"<>&');
my ($trail) =	my ($trail) =
&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,$hostname);	&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,1);
	if (ref($showncrumbsref)) {
	$$showncrumbsref = 1;
	}
return $trail;	return $trail;
}	}
unless ($env{'request.state'} eq 'construct') {	unless ($env{'request.state'} eq 'construct') {
Line 1056 sub innerregister {	Line 1089 sub innerregister {
$currdir =~ s\|[^/]+$\|\|;	$currdir =~ s\|[^/]+$\|\|;
my $cleandisfn = &Apache::loncommon::escape_single($thisdisfn);	my $cleandisfn = &Apache::loncommon::escape_single($thisdisfn);
my $esc_currdir = &Apache::loncommon::escape_single($currdir);	my $esc_currdir = &Apache::loncommon::escape_single($currdir);
	my $pubfile = "/res/$udom/$uname/$thisdisfn";
	my $candelete = 1;
	if (-e $londocroot.$pubfile) {
	unless (&Apache::lonnet::metadata($pubfile,'obsolete')) {
	undef($candelete);
	}
	}
#	#
# Probably should be in mydesk.tab	# Probably should be in mydesk.tab
#	#
Line 1063 sub innerregister {	Line 1103 sub innerregister {
s&6&1&list.png&Directory&dir[_1]&golist('$esc_currdir')&List current directory	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&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&6&3&pub.png&Publish&resource[_3]&gocstr('/adm/publish','/priv/$udom/$uname/$cleandisfn')&Publish this resource
	s&7&3&copy.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
	#
	if ($candelete) {
	$menuitems .= (<<ENDMENUITEMS);
	s&7&4&rename.png&Rename&resource[_5]&gocstr('/adm/cfile?action=rename','/priv/$udom/$uname/$cleandisfn')&Rename this resource
s&7&1&del.png&Delete&resource[_2]&gocstr('/adm/cfile?action=delete','/priv/$udom/$uname/$cleandisfn')&Delete this resource	s&7&1&del.png&Delete&resource[_2]&gocstr('/adm/cfile?action=delete','/priv/$udom/$uname/$cleandisfn')&Delete this resource
	ENDMENUITEMS
	}
	$menuitems .= (<<ENDMENUITEMS);
s&7&2&prt.png&Print&printout[_1]&gocstr('/adm/printout','/priv/$udom/$uname/$cleandisfn')&Prepare a printable document	s&7&2&prt.png&Print&printout[_1]&gocstr('/adm/printout','/priv/$udom/$uname/$cleandisfn')&Prepare a printable document
ENDMENUITEMS	ENDMENUITEMS
}	}
Line 1223 ENDMENUITEMS	Line 1274 ENDMENUITEMS
}	}
}	}
}	}
my $showprogress;	my ($showprogress,$linkprotout);
if (($crstype eq 'Placement') && (!$env{'request.role.adv'})) {	if (($crstype eq 'Placement') && (!$env{'request.role.adv'})) {
$showprogress = &placement_progress();	$showprogress = &placement_progress();
}	}
	if ($env{'request.deeplink.login'}) {
	$linkprotout = &linkprot_exit();
	}

my $addremote=0;	my $addremote=0;
foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} }	foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} }
Line 1252 ENDMENUITEMS	Line 1306 ENDMENUITEMS
if ($countdown) {	if ($countdown) {
&Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$countdown);	&Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$countdown);
}	}
	if ($linkprotout) {
	&Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$linkprotout);
	}
if ($showprogress) {	if ($showprogress) {
&Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$showprogress);	&Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$showprogress);
}	}
Line 1260 ENDMENUITEMS	Line 1317 ENDMENUITEMS
if ($countdown) {	if ($countdown) {
unshift(@tools,$countdown);	unshift(@tools,$countdown);
}	}
	if ($linkprotout) {
	unshift(@tools,$linkprotout);
	}
&Apache::lonhtmlcommon::add_breadcrumb_tool(	&Apache::lonhtmlcommon::add_breadcrumb_tool(
'tools',@tools);	'tools',@tools);

Line 1277 ENDMENUITEMS	Line 1337 ENDMENUITEMS
if ($showprogress) {	if ($showprogress) {
&Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$showprogress);	&Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$showprogress);
}	}
	if ($linkprotout) {
	&Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$linkprotout);
	}
}	}
my ($topic_help,$topic_help_text);	my ($topic_help,$topic_help_text);
if ($is_const_dir == 2) {	if ($is_const_dir == 2) {
Line 1288 ENDMENUITEMS	Line 1351 ENDMENUITEMS
$topic_help_text = 'About WebDAV access';	$topic_help_text = 'About WebDAV access';
}	}
}	}
	if (ref($showncrumbsref)) {
	$$showncrumbsref = 1;
	}
return &Apache::lonhtmlcommon::scripttag('', 'start')	return &Apache::lonhtmlcommon::scripttag('', 'start')
. &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'','','','',$topic_help,$topic_help_text)	. &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'','','','',$topic_help,$topic_help_text)
. &Apache::lonhtmlcommon::scripttag('', 'end');	. &Apache::lonhtmlcommon::scripttag('', 'end');
Line 1311 sub get_editbutton {	Line 1377 sub get_editbutton {
if ($env{'form.folderpath'}) {	if ($env{'form.folderpath'}) {
$suppanchor = $env{'form.anchor'};	$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,	$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.folderpath'}),
&escape($env{'form.title'}),$hostname,	&escape($env{'form.title'}),$hostname,
$env{'form.idx'},&escape($env{'form.suppurl'}),	$env{'form.idx'},&escape($env{'form.suppurl'}),
Line 1348 sub prepare_functions {	Line 1418 sub prepare_functions {

my $editbutton = '';	my $editbutton = '';
my $viewsrcbutton = '';	my $viewsrcbutton = '';
	my $clientip = &Apache::lonnet::get_requestor_ip();
#	#
# Determine whether or not to display 'Edit' or 'View Source' icon/button	# Determine whether or not to display 'Edit' or 'View Source' icon/button
#	#
if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) {	if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) {
my $blocked = &Apache::loncommon::blocking_status('about',$2,$1);	my $blocked = &Apache::loncommon::blocking_status('about',$clientip,$2,$1);
my $file=&Apache::lonnet::declutter($env{'request.filename'});	my $file=&Apache::lonnet::declutter($env{'request.filename'});
($cfile,$home,$switchserver,$forceedit,$forceview) =	($cfile,$home,$switchserver,$forceedit,$forceview) =
&Apache::lonnet::can_edit_resource($file,$cnum,$cdom,	&Apache::lonnet::can_edit_resource($file,$cnum,$cdom,
Line 1470 sub prepare_functions {	Line 1541 sub prepare_functions {
if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) {	if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) {
my ($sdom,$sname) = ($1,$2);	my ($sdom,$sname) = ($1,$2);
unless (&Apache::lonnet::is_course($sdom,$sname)) {	unless (&Apache::lonnet::is_course($sdom,$sname)) {
my $blocked = &Apache::loncommon::blocking_status('about',$sname,$sdom);	my $blocked = &Apache::loncommon::blocking_status('about',$clientip,$sname,$sdom);
unless ($blocked) {	unless ($blocked) {
&switch('','',6,4,'mail-message-new-22x22.png','Message to user',	&switch('','',6,4,'mail-message-new-22x22.png','Message to user',
'',	'',
Line 1565 sub advtools_crumbs {	Line 1636 sub advtools_crumbs {
&Apache::lonhtmlcommon::add_breadcrumb_tool(	&Apache::lonhtmlcommon::add_breadcrumb_tool(
'advtools', @funcs[61,64,65,66,67,74]);	'advtools', @funcs[61,64,65,66,67,74]);
} elsif ($env{'request.noversionuri'} !~ m{^/adm/(navmaps\|viewclasslist)(\?\|$)}) {	} elsif ($env{'request.noversionuri'} !~ m{^/adm/(navmaps\|viewclasslist)(\?\|$)}) {
&Apache::lonhtmlcommon::add_breadcrumb_tool(	if ($env{'request.state'} eq 'construct') {
'advtools', @funcs[61,71,72,73,74,92]);	&Apache::lonhtmlcommon::add_breadcrumb_tool(
	'advtools', @funcs[61,73,74,71,72]);
	} else {
	&Apache::lonhtmlcommon::add_breadcrumb_tool(
	'advtools', @funcs[61,71,72,73,74,92]);
	}
} elsif ($env{'request.noversionuri'} eq '/adm/viewclasslist') {	} elsif ($env{'request.noversionuri'} eq '/adm/viewclasslist') {
&Apache::lonhtmlcommon::add_breadcrumb_tool(	&Apache::lonhtmlcommon::add_breadcrumb_tool(
'advtools', $funcs[61]);	'advtools', $funcs[61]);
Line 1902 sub check_for_rcrs {	Line 1978 sub check_for_rcrs {
if (!$showreqcrs) {	if (!$showreqcrs) {
foreach my $type (@reqtypes) {	foreach my $type (@reqtypes) {
if ($env{'environment.reqcrsotherdom.'.$type} ne '') {	if ($env{'environment.reqcrsotherdom.'.$type} ne '') {
$showreqcrs = 1;	my @domains = split(',',$env{'environment.reqcrsotherdom.'.$type});
last;	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;
	}
}	}
}	}
}	}
Line 2207 sub utilityfunctions {	Line 2292 sub utilityfunctions {

my $esc_url=&escape($currenturl);	my $esc_url=&escape($currenturl);
my $esc_symb=&escape($currentsymb);	my $esc_symb=&escape($currentsymb);
	my $newname = &mt('New Name');

my $countdown = &countdown_toggle_js();	my $countdown = &countdown_toggle_js();

my $ltitarget;	my ($ltitarget,$deeplinktarget);
if ($env{'request.lti.login'}) {	if ($env{'request.lti.login'}) {
$ltitarget = $env{'request.lti.target'};	$ltitarget = $env{'request.lti.target'};
}	}
	if ($env{'request.deeplink.login'}) {
	$deeplinktarget = $env{'request.deeplink.target'};
	}

my $annotateurl = '/adm/annotation';	my $annotateurl = '/adm/annotation';
if ($httphost) {	if ($httphost) {
Line 2277 function gocstr(url,filename) {	Line 2366 function gocstr(url,filename) {
this.document.cstrdelete.submit();	this.document.cstrdelete.submit();
return;	return;
}	}
	if ((url == '/adm/cfile?action=copy') \|\| (url == '/adm/cfile?action=rename')) {
	this.document.cstrcopy.filename.value = filename;
	var oldname = filename.substring(filename.lastIndexOf("/") + 1);
	var newname=prompt('$newname',oldname);
	if (newname == "" \|\| !newname \|\| newname == oldname) {
	return;
	}
	if (url == '/adm/cfile?action=rename') {
	this.document.cstrcopy.action.value = 'rename';
	} else {
	this.document.cstrcopy.action.value = 'copy';
	}
	this.document.cstrcopy.newfilename.value = newname;
	this.document.cstrcopy.submit();
	return;
	}
if (url == '/adm/printout') {	if (url == '/adm/printout') {
this.document.cstrprint.postdata.value = filename	this.document.cstrprint.postdata.value = filename
this.document.cstrprint.curseed.value = 0;	this.document.cstrprint.curseed.value = 0;
Line 2316 function golist(url) {	Line 2421 function golist(url) {
currentSymb= null;	currentSymb= null;
var lcHostname = setLCHost();	var lcHostname = setLCHost();
var ltitarget = '$ltitarget';	var ltitarget = '$ltitarget';
if (ltitarget == 'iframe') {	var deeplinktarget = '$deeplinktarget';
	if ((ltitarget == 'iframe') \|\| (deeplinktarget == '_self')) {
document.location.href=lcHostname+url;	document.location.href=lcHostname+url;
} else {	} else {
top.location.href=lcHostname+url;	top.location.href=lcHostname+url;
Line 2414 sub serverform {	Line 2520 sub serverform {
unless (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) {	unless (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) {
$target = ' target="_top"';	$target = ' target="_top"';
}	}
	if (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self')) {
	$target = ' target="_self"';
	}
return(<<ENDSERVERFORM);	return(<<ENDSERVERFORM);
<form name="server" action="/adm/logout" method="post"$target>	<form name="server" action="/adm/logout" method="post"$target>
<input type="hidden" name="postdata" value="none" />	<input type="hidden" name="postdata" value="none" />
Line 2425 ENDSERVERFORM	Line 2534 ENDSERVERFORM
}	}

sub constspaceform {	sub constspaceform {
	my ($frameset) = @_;
my ($target,$printtarget);	my ($target,$printtarget);
unless (($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) {	if ($frameset) {
$target = ' target="_top"';	$target = ' target="_parent"';
$printtarget = ' target="_parent"';	$printtarget = ' target="_parent"';
	} else {
	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="_top"';
	}
}	}
return(<<ENDCONSTSPACEFORM);	return(<<ENDCONSTSPACEFORM);
<form name="constspace" action="/adm/logout" method="post"$target>	<form name="constspace" action="/adm/logout" method="post"$target>
Line 2443 sub constspaceform {	Line 2559 sub constspaceform {
<input type="hidden" name="curseed" value="" />	<input type="hidden" name="curseed" value="" />
<input type="hidden" name="problemtype" value="" />	<input type="hidden" name="problemtype" value="" />
</form>	</form>
	<form name="cstrcopy" action="/adm/cfile" method="post"$target>
	<input type="hidden" name="action" value="copy" />
	<input type="hidden" name="filename" value="" />
	<input type="hidden" name="newfilename" value="" />
	</form>

ENDCONSTSPACEFORM	ENDCONSTSPACEFORM
}	}
Line 2458 sub hidden_button_check {	Line 2579 sub hidden_button_check {
}	}

sub roles_selector {	sub roles_selector {
my ($cdom,$cnum,$httphost,$ltitarget) = @_;	my ($cdom,$cnum,$httphost,$target,$menucoll,$menuref) = @_;
my $crstype = &Apache::loncommon::course_type();	my $crstype = &Apache::loncommon::course_type();
my $now = time;	my $now = time;
my (%courseroles,%seccount,%courseprivs,%roledesc);	my (%courseroles,%seccount,%courseprivs,%roledesc);
Line 2564 sub roles_selector {	Line 2685 sub roles_selector {
}	}
}	}
if ((keys(%seccount) > 1) \|\| ($numdiffsec > 1)) {	if ((keys(%seccount) > 1) \|\| ($numdiffsec > 1)) {
	my $targetattr;
	if ($target ne '') {
	$targetattr = ' target="'.$target.'"';
	}
my @submenu;	my @submenu;
$js = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,\%roledesc,$privref);	$js = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,
	\%roledesc,$privref,$menucoll,$menuref);
$form =	$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="'.	' <input type="hidden" name="destinationurl" value="'.
&HTML::Entities::encode($destinationurl).'" />'."\n".	&HTML::Entities::encode($destinationurl).'" />'."\n".
' <input type="hidden" name="gotorole" value="1" />'."\n".	' <input type="hidden" name="gotorole" value="1" />'."\n".
Line 2630 sub roles_selector {	Line 2756 sub roles_selector {
}	}
}	}
if (@submenu > 0) {	if (@submenu > 0) {
$switcher = &create_submenu('','',&mt('Switch role'),\@submenu,'','',$ltitarget);	$switcher = &create_submenu('#',$target,&mt('Switch role'),\@submenu);
}	}
}	}
return ($js,$form,$switcher,$has_opa_priv);	return ($js,$form,$switcher,$has_opa_priv);
Line 2800 sub get_customadhoc_roles {	Line 2926 sub get_customadhoc_roles {
}	}

sub jump_to_role {	sub jump_to_role {
my ($cdom,$cnum,$seccount,$courseroles,$courseprivs,$roledesc,$privref) = @_;	my ($cdom,$cnum,$seccount,$courseroles,$courseprivs,$roledesc,$privref,
	$menucoll,$menuref) = @_;
my %lt = &Apache::lonlocal::texthash(	my %lt = &Apache::lonlocal::texthash(
this => 'This role has section(s) associated with it.',	this => 'This role has section(s) associated with it.',
ente => 'Enter a specific section.',	ente => 'Enter a specific section.',
Line 2811 sub jump_to_role {	Line 2938 sub jump_to_role {
role => 'The role you selected is not permitted to view the current page.',	role => 'The role you selected is not permitted to view the current page.',
swit => 'Switch role, but display Main Menu page instead?',	swit => 'Switch role, but display Main Menu page instead?',
);	);
	&js_escape(\%lt);
my $js;	my $js;
if (ref($courseroles) eq 'HASH') {	if (ref($courseroles) eq 'HASH') {
$js = ' var secpick = new Array("'.$lt{'ente'}.'","'.$lt{'orlb'}.'");'."\n".	$js = ' var secpick = new Array("'.$lt{'ente'}.'","'.$lt{'orlb'}.'");'."\n".
Line 2833 sub jump_to_role {	Line 2961 sub jump_to_role {
}	}
}	}
my $checkroles = 0;	my $checkroles = 0;
	my $fallback = '/adm/menu';
	my $displaymsg = $lt{'swit'};
if ((ref($privref) eq 'ARRAY') && (@{$privref} > 0) && (ref($courseprivs) eq 'HASH')) {	if ((ref($privref) eq 'ARRAY') && (@{$privref} > 0) && (ref($courseprivs) eq 'HASH')) {
my %disallowed;	my %disallowed;
foreach my $role (sort(keys(%{$courseprivs}))) {	foreach my $role (sort(keys(%{$courseprivs}))) {
Line 2854 sub jump_to_role {	Line 2984 sub jump_to_role {
$checkroles = 1;	$checkroles = 1;
$js .= " var disallow = new Array('".join("','",keys(%disallowed))."');\n".	$js .= " var disallow = new Array('".join("','",keys(%disallowed))."');\n".
" var rolecheck = 1;\n";	" var rolecheck = 1;\n";
	if ($menucoll) {
	if (ref($menuref) eq 'HASH') {
	if ($menuref->{'main'} eq 'n') {
	$fallback = '/adm/navmaps';
	if (&Apache::loncommon::course_type() eq 'Community') {
	$displaymsg = &mt('Switch role, but display Community Contents page instead?');
	} else {
	$displaymsg = &mt('Switch role, but display Course Contents page instead?');
	}
	&js_escape(\$displaymsg);
	}
	}
	}
}	}
}	}
	&js_escape(\$fallback);
if (!$checkroles) {	if (!$checkroles) {
$js .= " var disallow = new Array();\n".	$js .= " var disallow = new Array();\n".
" rolecheck = 0;\n";	" rolecheck = 0;\n";
Line 2878 function adhocRole(newrole) {	Line 3022 function adhocRole(newrole) {
if (rolecheck > 0) {	if (rolecheck > 0) {
for (var i=0; i<disallow.length; i++) {	for (var i=0; i<disallow.length; i++) {
if (disallow[i] == newrole) {	if (disallow[i] == newrole) {
if (confirm("$lt{'role'}\\n$lt{'swit'}")) {	if (confirm("$lt{'role'}\\n$displaymsg")) {
document.rolechooser.destinationurl.value = '/adm/menu';	document.rolechooser.destinationurl.value = '$fallback';
} else {	} else {
return;	return;
}	}
Line 3065 sub placement_progress {	Line 3209 sub placement_progress {
&mt('Test is [_1]% complete',$complete).'</span>';	&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	# ================================================================ Main Program

BEGIN {	BEGIN {

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.512
changed lines
	Added in v.1.529