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.369.2.71.4.4 and 1.369.2.83.4.1

version 1.369.2.71.4.4, 2017/10/14 22:37:15	version 1.369.2.83.4.1, 2022/03/25 21:25:37
Line 240 use vars qw(@desklines %category_names %	Line 240 use vars qw(@desklines %category_names %
my @inlineremote;	my @inlineremote;

sub prep_menuitem {	sub prep_menuitem {
my ($menuitem) = @_;	my ($menuitem,$listclass,$linkattr) = @_;
return '' unless(ref($menuitem) eq 'ARRAY');	return '' unless(ref($menuitem) eq 'ARRAY');
my $link;	my $link;
if ($$menuitem[1]) { # graphical Link	if ($$menuitem[1]) { # graphical Link
Line 250 sub prep_menuitem {	Line 250 sub prep_menuitem {
} else { # textual Link	} else { # textual Link
$link = &mt($$menuitem[3]);	$link = &mt($$menuitem[3]);
}	}
return '<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="_top">$link</a></li>\|;	. qq\| href="$$menuitem[0]" target="_top" $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 263 sub prep_menuitem {	Line 263 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 ($links_disabled) = @_;
my %menu;	my %menu;
# 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 294 sub primary_menu {	Line 295 sub primary_menu {
if ($position eq '') {	if ($position eq '') {
$position = 'right';	$position = 'right';
}	}
	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,$target);
if ($menuitem->[0] ne '') {	if ($menuitem->[0] ne '') {
Line 318 sub primary_menu {	Line 324 sub primary_menu {
} else {	} else {
$title = &mt($title);	$title = &mt($title);
}	}
$menu{$position} .= &create_submenu($link,$target,$title,\@primsub,1);	$menu{$position} .= &create_submenu($link,$target,$title,\@primsub,1,undef,$listclass,$linkattr);
} elsif ($link) {	} elsif ($link) {
$menu{$position} .= '<li><a href="'.$link.'" target="'.$target.'">'.&mt($title).'</a></li>';	$menu{$position} .= ($listclass?'<li class="'.$listclass.'">':'<li>').
	'<a href="'.$link.'" target="'.$target.'" '.$linkattr.'>'.&mt($title).'</a></li>';
}	}
}	}
} elsif ($$menuitem[3] eq 'Help') { # special treatment for helplink	} elsif ($$menuitem[3] eq 'Help') { # special treatment for helplink
Line 331 sub primary_menu {	Line 338 sub primary_menu {
'helpdeskmail',	'helpdeskmail',
$defdom,$origmail);	$defdom,$origmail);
if ($to ne '') {	if ($to ne '') {
$menu{$position} .= &prep_menuitem($menuitem);	$menu{$position} .= &prep_menuitem($menuitem,$listclass,$linkattr);
}	}
} else {	} else {
$menu{$position} .= '<li>'.&Apache::loncommon::top_nav_help('Help').'</li>';	$menu{$position} .= ($listclass?'<li class="'.$listclass.'">':'<li>').
	&Apache::loncommon::top_nav_help('Help',$linkattr).
	'</li>';
	}
	} elsif ($$menuitem[3] eq 'Log In') {
	if ($public) {
	if (&Apache::lonnet::get_saml_landing()) {
	$$menuitem[0] = '/adm/login';
	}
}	}
	$menu{$position} .= prep_menuitem($menuitem,$listclass,$linkattr);
} else {	} else {
$menu{$position} .= prep_menuitem($menuitem);	$menu{$position} .= prep_menuitem($menuitem,$listclass,$linkattr);
}	}
}	}
my @output = ('','');	my @output = ('','');
Line 376 sub getauthor{	Line 392 sub getauthor{
}	}

sub secondary_menu {	sub secondary_menu {
my ($httphost) = @_;	my ($httphost,$links_disabled) = @_;
my $menu;	my $menu;

my $crstype = &Apache::loncommon::course_type();	my $crstype = &Apache::loncommon::course_type();
Line 399 sub secondary_menu {	Line 415 sub secondary_menu {
my $canmgr = &Apache::lonnet::allowed('mgr', $crs_sec);	my $canmgr = &Apache::lonnet::allowed('mgr', $crs_sec);
my $author = &getauthor();	my $author = &getauthor();

my ($cdom,$cnum,$showsyllabus,$showfeeds,$showresv);	my ($cdom,$cnum,$showsyllabus,$showfeeds,$showresv,$grouptools);
	$grouptools = 0;
if ($env{'request.course.id'}) {	if ($env{'request.course.id'}) {
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};	$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'};	$cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
Line 422 sub secondary_menu {	Line 439 sub secondary_menu {
$showresv = 1;	$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 ($listclass,$linkattr);
	if ($links_disabled) {
	$listclass = 'LCisDisabled';
	$linkattr = 'aria-disabled="true"';
}	}

my ($canmodifycoauthor);	my ($canmodifycoauthor);
Line 433 sub secondary_menu {	Line 466 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);	my ($roleswitcher_js,$roleswitcher_form);

foreach my $menuitem (@secondary_menu) {	foreach my $menuitem (@secondary_menu) {
Line 469 sub secondary_menu {	Line 497 sub secondary_menu {
next if $$menuitem[4] eq 'params'	next if $$menuitem[4] eq 'params'
&& (!$canmodpara && !$canviewpara);	&& (!$canmodpara && !$canviewpara);
next if $$menuitem[4] eq 'nvcg'	next if $$menuitem[4] eq 'nvcg'
&& ($canviewgrps \|\| !%groups);	&& ($canviewgrps \|\| !$grouptools);
next if $$menuitem[4] eq 'showsyllabus'	next if $$menuitem[4] eq 'showsyllabus'
&& !$showsyllabus;	&& !$showsyllabus;
next if $$menuitem[4] eq 'showfeeds'	next if $$menuitem[4] eq 'showfeeds'
Line 499 sub secondary_menu {	Line 527 sub secondary_menu {
next if ($item->[2] eq 'mgr' && !$canmgr);	next if ($item->[2] eq 'mgr' && !$canmgr);
next if ($item->[2] eq 'vcg' && !$canviewgrps);	next if ($item->[2] eq 'vcg' && !$canviewgrps);
next if ($item->[2] eq 'crsedit' && !$canedit && !$canvieweditor);	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);	push(@scndsub,$item);
}	}
}	}
if (@scndsub > 0) {	if (@scndsub > 0) {
$menu .= &create_submenu($link,$target,$title,\@scndsub,1);	$menu .= &create_submenu($link,$target,&mt($title),\@scndsub,1,undef,
	$listclass,$linkattr);
} elsif ($link ne '#') {	} elsif ($link ne '#') {
$menu .= '<li><a href="'.$link.'" target="'.$target.'">'.&mt($title).'</a></li>';	$menu .= ($listclass?'<li class="'.$listclass.'">':'<li>').
	'<a href="'.$link.'" target="'.$target.'" '.$linkattr.'>'.
	&mt($title).'</a></li>';
}	}
}	}
} elsif ($$menuitem[3] eq 'Roles' && $env{'request.course.id'}) {	} elsif ($$menuitem[3] eq 'Roles' && $env{'request.course.id'}) {
Line 522 sub secondary_menu {	Line 556 sub secondary_menu {
my $url = $$menuitem[0];	my $url = $$menuitem[0];
$url =~ s{\[cdom\]/\[cnum\]}{$cdom/$cnum};	$url =~ s{\[cdom\]/\[cnum\]}{$cdom/$cnum};
if (&Apache::lonnet::is_on_map($url)) {	if (&Apache::lonnet::is_on_map($url)) {
unless ($$menuitem[0] =~ /\?register=1/) {	unless ($$menuitem[0] =~ /(\?\|\&)register=1/) {
$$menuitem[0] .= '?register=1';	$$menuitem[0] .= (($$menuitem[0]=~/\?/)? '&' : '?').'register=1';
}	}
} else {	} else {
$$menuitem[0] =~ s{\?register=1}{};	$$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()) \|\| (&Apache::lonnet::waf_allssl())) {
	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);	$menu .= &prep_menuitem(\@$menuitem,$listclass,$linkattr);
}	}
}	}
if ($menu =~ /\[url\].*\[symb\]/) {	if ($menu =~ /\[url\].*\[symb\]/) {
Line 566 sub secondary_menu {	Line 613 sub secondary_menu {
}	}

sub create_submenu {	sub create_submenu {
my ($link,$target,$title,$submenu,$translate,$addclass) = @_;	my ($link,$target,$title,$submenu,$translate,$addclass,$listclass,$linkattr) = @_;
return unless (ref($submenu) eq 'ARRAY');	return unless (ref($submenu) eq 'ARRAY');
my $disptarget;	my $disptarget;
if ($target ne '') {	if ($target ne '') {
Line 581 sub create_submenu {	Line 628 sub create_submenu {

# $link and $title are only used in the initial string written in $menu	# $link and $title are only used in the initial string written in $menu
# as seen above, not needed for nested submenus	# as seen above, not needed for nested submenus
$menu .= &build_submenu($target, $submenu, $translate, '1');	$menu .= &build_submenu($target, $submenu, $translate, '1', $listclass, $linkattr);
$menu .= '</ul></li>';	$menu .= '</ul></li>';

return $menu;	return $menu;
Line 591 sub create_submenu {	Line 638 sub create_submenu {
# build the dropdown (and nested submenus) recursively	# build the dropdown (and nested submenus) recursively
# see perldoc create_submenu documentation for further information	# see perldoc create_submenu documentation for further information
sub build_submenu {	sub build_submenu {
my ($target, $submenu, $translate, $first_level) = @_;	my ($target, $submenu, $translate, $first_level, $listclass, $linkattr) = @_;
unless (@{$submenu}) {	unless (@{$submenu}) {
return '';	return '';
}	}
Line 635 sub build_submenu {	Line 682 sub build_submenu {
next unless (($env{'user.name'} ne '') && ($env{'user.domain'} ne ''));	next unless (($env{'user.name'} ne '') && ($env{'user.domain'} ne ''));
$href =~ s/\[domain\]/$env{'user.domain'}/g;	$href =~ s/\[domain\]/$env{'user.domain'}/g;
$href =~ s/\[user\]/$env{'user.name'}/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 =~ /^\#/)) {	unless (($href eq '') \|\| ($href =~ /^\#/)) {
$target = ' target="_top"';	$target = ' target="_top"';
}	}

$menu .= '<li style="margin:0;padding:0;'. $bordertop . $borderbot .'">';	$menu .= '<li ';
$menu .= '<a href="'.$href.'"'.$target.'>' . $title . '</a>';	$menu .= ($listclass?'class="'.$listclass.'" ':'');
	$menu .= 'style="margin:0;padding:0;'. $bordertop . $borderbot .'">';
	$menu .= '<a href="'.$href.'"'.$target.' '.$linkattr.'>' . $title . '</a>';
$menu .= '</li>';	$menu .= '</li>';
}	}
}	}
Line 678 sub registerurl {	Line 741 sub registerurl {
}	}

sub innerregister {	sub innerregister {
my ($forcereg,$bread_crumbs,$group,$pagebuttonshide) = @_;	my ($forcereg,$bread_crumbs,$group,$pagebuttonshide,$hostname) = @_;
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 699 sub innerregister {	Line 762 sub innerregister {
$newmail= 'swmenu.setstatus("you have","messages");';	$newmail= 'swmenu.setstatus("you have","messages");';
}	}

my ($mapurl,$resurl,$navmap);	my ($mapurl,$resurl,$crstype,$navmap);

if ($env{'request.course.id'}) {	if ($env{'request.course.id'}) {
#	#
#course_type: Course or Community	#course_type: Course or Community
#	#
	$crstype = &Apache::loncommon::course_type();
if ($env{'request.symb'}) {	if ($env{'request.symb'}) {
my $ignorenull;	my $ignorenull;
unless ($env{'request.noversionuri'} eq '/adm/navmaps') {	unless ($env{'request.noversionuri'} eq '/adm/navmaps') {
Line 718 sub innerregister {	Line 782 sub innerregister {
my $restitle = &Apache::lonnet::gettitle($symb);	my $restitle = &Apache::lonnet::gettitle($symb);

my (@crumbs,@mapcrumbs);	my (@crumbs,@mapcrumbs);
if (($env{'request.noversionuri'} ne '/adm/navmaps') && ($mapurl ne '')) {	if (($env{'request.noversionuri'} ne '/adm/navmaps') && ($mapurl ne '') &&
	($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'})) {
$navmap = Apache::lonnavmaps::navmap->new();	$navmap = Apache::lonnavmaps::navmap->new();
if (ref($navmap)) {	if (ref($navmap)) {
@mapcrumbs = $navmap->recursed_crumbs($mapurl,$restitle);	@mapcrumbs = $navmap->recursed_crumbs($mapurl,$restitle);
Line 727 sub innerregister {	Line 792 sub innerregister {
unless (($forcereg) &&	unless (($forcereg) &&
($env{'request.noversionuri'} eq '/adm/navmaps') &&	($env{'request.noversionuri'} eq '/adm/navmaps') &&
($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'})) {	($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'})) {
@crumbs = ({text => Apache::loncommon::course_type()	@crumbs = ({text => $crstype.' Contents',
. ' Contents',
href => "Javascript:gopost('/adm/navmaps','')"});	href => "Javascript:gopost('/adm/navmaps','')"});
}	}
if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) {	if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) {
Line 737 sub innerregister {	Line 801 sub innerregister {
} else {	} else {
push(@crumbs, {text => '...',	push(@crumbs, {text => '...',
no_mt => 1});	no_mt => 1});
	}
}	}

unless ((@mapcrumbs) \|\| (!$maptitle) \|\| ($maptitle eq 'default.sequence') \|\|	unless ((@mapcrumbs) \|\| (!$maptitle) \|\| ($maptitle eq 'default.sequence') \|\|
($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'})) {	($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'})) {
push @crumbs, {text => $maptitle, no_mt => 1, href => $mapurl};	push @crumbs, {text => $maptitle, no_mt => 1,
	href => &Apache::lonnet::clutter($mapurl).'?navmap=1'};
}	}
if ($restitle && !@mapcrumbs) {	if ($restitle && !@mapcrumbs) {
push(@crumbs,{text => $restitle, no_mt => 1});	push(@crumbs,{text => $restitle, no_mt => 1});
Line 761 sub innerregister {	Line 827 sub innerregister {
} else {	} else {
$resurl = $env{'request.noversionuri'};	$resurl = $env{'request.noversionuri'};
my $courseurl = &Apache::lonnet::courseid_to_courseurl($env{'request.course.id'});	my $courseurl = &Apache::lonnet::courseid_to_courseurl($env{'request.course.id'});
my $crstype = &Apache::loncommon::course_type();
my $title = &mt('View Resource');	my $title = &mt('View Resource');
if ($resurl =~ m{^\Q/uploaded$courseurl/supplemental/\E(default\|\d+)/}) {	if ($resurl =~ m{^\Q/uploaded$courseurl/supplemental/\E(default\|\d+)/}) {
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['folderpath','title']);	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['folderpath','title']);
Line 771 sub innerregister {	Line 836 sub innerregister {
}	}
my $trail;	my $trail;
if ($env{'form.folderpath'}) {	if ($env{'form.folderpath'}) {
&prepare_functions($resurl,$forcereg,$group,undef,undef,1);	&prepare_functions($resurl,$forcereg,$group,undef,undef,1,$hostname);
($trail) =	($trail) =
&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);	&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
} else {	} else {
Line 786 sub innerregister {	Line 851 sub innerregister {
} 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);	$forcereg,$group,undef,undef,1,$hostname);
$title = &mt('Syllabus File');	$title = &mt('Syllabus File');
my ($trail) =	my ($trail) =
&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);	&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1,$hostname);
return $trail;	return $trail;
}	}
unless ($env{'request.state'} eq 'construct') {	unless ($env{'request.state'} eq 'construct') {
Line 826 sub innerregister {	Line 891 sub innerregister {
if (($env{'environment.remote'} eq 'on') && ($env{'request.symb'})) {	if (($env{'environment.remote'} eq 'on') && ($env{'request.symb'})) {
&Apache::lonhtmlcommon::clear_breadcrumbs();	&Apache::lonhtmlcommon::clear_breadcrumbs();
}	}
$editbutton = &prepare_functions($resurl,$forcereg,$group);	$editbutton = &prepare_functions($resurl,$forcereg,$group,'','','',$hostname);
}	}
if ($editbutton eq '') {	if ($editbutton eq '') {
$editbutton = &clear(6,1);	$editbutton = &clear(6,1);
Line 980 if ($env{'browser.mobile'}) {	Line 1045 if ($env{'browser.mobile'}) {
$is_mobile = 1;	$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/})) {	if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) &&
	($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/(docs/\|default_\d+\.page$)})) {
$menuitems.=(<<ENDREALRES);	$menuitems.=(<<ENDREALRES);
s&6&3&catalog.png&$swtext{'catalog'}&info[_1]&catalog_info('$is_mobile')&Show Metadata	s&6&3&catalog.png&$swtext{'catalog'}&info[_1]&catalog_info('$is_mobile')&Show Metadata
ENDREALRES	ENDREALRES
}	}
unless (($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/docs/}) \|\|	unless (($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/(docs/\|default_\d+\.page$)}) \|\|
($env{'request.noversionuri'} =~ m{^\Q/adm/wrapper/\E(ext\|uploaded)/})) {	($env{'request.noversionuri'} =~ m{^\Q/adm/wrapper/\E(ext\|uploaded)/})) {
$menuitems.=(<<ENDREALRES);	$menuitems.=(<<ENDREALRES);
s&8&1&eval.png&$swtext{'eval'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource	s&8&1&eval.png&$swtext{'eval'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
Line 1415 ENDOPEN	Line 1481 ENDOPEN
}	}

sub get_editbutton {	sub get_editbutton {
my ($cfile,$home,$switchserver,$forceedit,$forceview,$forcereg) = @_;	my ($cfile,$home,$switchserver,$forceedit,$forceview,$forcereg,$hostname) = @_;
my $jscall;	my $jscall;
if (($forceview) && ($env{'form.todocs'})) {	if (($forceview) && ($env{'form.todocs'})) {
my ($folderpath,$command,$navmap);	my ($folderpath,$command,$navmap);
Line 1435 sub get_editbutton {	Line 1501 sub get_editbutton {
$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'},
&escape($env{'form.folderpath'}),	&escape($env{'form.folderpath'}),
&escape($env{'form.title'}),$env{'form.idx'},	&escape($env{'form.title'}),$hostname,
&escape($env{'form.suppurl'}),$env{'form.todocs'},	$env{'form.idx'},&escape($env{'form.suppurl'}),
$suppanchor);	$env{'form.todocs'},$suppanchor);
}	}
if ($jscall) {	if ($jscall) {
my $icon = 'pcstr.png';	my $icon = 'pcstr.png';
Line 1470 sub get_editbutton {	Line 1536 sub get_editbutton {
}	}

sub prepare_functions {	sub prepare_functions {
my ($resurl,$forcereg,$group,$bread_crumbs,$advtools,$docscrumbs,$forbodytag) = @_;	my ($resurl,$forcereg,$group,$bread_crumbs,$advtools,$docscrumbs,$hostname,$forbodytag) = @_;
unless ($env{'request.registered'}) {	unless ($env{'request.registered'}) {
undef(@inlineremote);	undef(@inlineremote);
}	}
Line 1485 sub prepare_functions {	Line 1551 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',$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,
&Apache::lonnet::clutter($resurl),$env{'request.symb'},$group);	&Apache::lonnet::clutter($resurl),$env{'request.symb'},$group);
if (($cfile) && ($home ne '') && ($home ne 'no_host')) {	if (($cfile) && ($home ne '') && ($home ne 'no_host') && (!$blocked)) {
$editbutton = &get_editbutton($cfile,$home,$switchserver,	$editbutton = &get_editbutton($cfile,$home,$switchserver,
$forceedit,$forceview,$forcereg);	$forceedit,$forceview,$forcereg);
}	}
Line 1518 sub prepare_functions {	Line 1586 sub prepare_functions {
#	#
if (($perms{'mdc'}) &&	if (($perms{'mdc'}) &&
(($resurl =~ m{^/?public/$cdom/$cnum/syllabus}) \|\|	(($resurl =~ m{^/?public/$cdom/$cnum/syllabus}) \|\|
($resurl =~ m{^/?uploaded/$cdom/$cnum/portfolio/syllabus/}) \|\|	($resurl =~ m{^/?uploaded/$cdom/$cnum/portfolio/syllabus/}) \|\|
(($resurl =~ m{^/?uploaded/$cdom/$cnum/default_\d+\.sequence$}) && ($env{'form.navmap'})))) {	(($resurl =~ m{^/?uploaded/$cdom/$cnum/default_\d+\.sequence$}) && ($env{'form.navmap'})))) {
if ($resurl =~ m{^/}) {	if ($resurl =~ m{^/}) {
$cfile = $resurl;	$cfile = $resurl;
} else {	} else {
Line 1539 sub prepare_functions {	Line 1607 sub prepare_functions {
$editbutton = 1;	$editbutton = 1;
} else {	} else {
$editbutton = &get_editbutton($cfile,$home,$switchserver,	$editbutton = &get_editbutton($cfile,$home,$switchserver,
$forceedit,$forceview,$forcereg);	$forceedit,$forceview,$forcereg,
	$hostname);
}	}
} elsif (($resurl eq '/adm/extresedit') &&	} elsif (($resurl eq '/adm/extresedit') &&
(($env{'form.symb'}) \|\| ($env{'form.folderpath'}))) {	(($env{'form.symb'}) \|\| ($env{'form.folderpath'}))) {
Line 1572 sub prepare_functions {	Line 1641 sub prepare_functions {
if ((($cfile eq '') \|\| (!$editbutton)) &&	if ((($cfile eq '') \|\| (!$editbutton)) &&
($resurl =~ /$LONCAPA::assess_re/)) {	($resurl =~ /$LONCAPA::assess_re/)) {
my $showurl = &Apache::lonnet::clutter($resurl);	my $showurl = &Apache::lonnet::clutter($resurl);
	my $crs_sec = $env{'request.course.id'} . (($env{'request.course.sec'} ne '')
	? "/$env{'request.course.sec'}"
	: '');
if ((&Apache::lonnet::allowed('cre','/')) &&	if ((&Apache::lonnet::allowed('cre','/')) &&
(&Apache::lonnet::metadata($resurl,'sourceavail') eq 'open')) {	(&Apache::lonnet::metadata($resurl,'sourceavail') eq 'open')) {
$viewsrcbutton = 1;	$viewsrcbutton = 1;
} elsif (&Apache::lonnet::allowed('vxc',$env{'request.course.id'})) {	} elsif (&Apache::lonnet::allowed('vxc',$crs_sec)) {
if ($showurl =~ m{^\Q/res/$cdom/\E($match_username)/}) {	if ($showurl =~ m{^\Q/res/$cdom/\E($match_username)/}) {
my $auname = $1;	my $auname = $1;
if (($env{'request.course.adhocsrcaccess'} ne '') &&	if (($env{'request.course.adhocsrcaccess'} ne '') &&
(grep(/^\Q$auname\E$/,split(/,/,$env{'request.course.adhocsrcaccess'})))) {	(grep(/^\Q$auname\E$/,split(/,/,$env{'request.course.adhocsrcaccess'})))) {
$viewsrcbutton = 1;	$viewsrcbutton = 1;
} elsif ((&Apache::lonnet::metadata($resurl,'sourceavail') eq 'open') &&	} elsif ((&Apache::lonnet::metadata($resurl,'sourceavail') eq 'open') &&
(&Apache::lonnet::allowed('bre','/'))) {	(&Apache::lonnet::allowed('bre',$crs_sec))) {
$viewsrcbutton = 1;	$viewsrcbutton = 1;
}	}
}	}
Line 1602 sub prepare_functions {	Line 1674 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)) {
&switch('','',6,4,'mail-message-new-22x22.png','Message to user',	my $blocked = &Apache::loncommon::blocking_status('about',$clientip,$sname,$sdom);
'',	unless ($blocked) {
"go('/adm/email?compose=individual&recname=$sname&recdom=$sdom')",	&switch('','',6,4,'mail-message-new-22x22.png','Message to user',
'Send message to specific user','','',1);	'',
	"go('/adm/email?compose=individual&recname=$sname&recdom=$sdom')",
	'Send message to specific user','','',1);
	}
}	}
my $hideprivileged = 1;	my $hideprivileged = 1;
if (&Apache::lonnet::in_course($sdom,$sname,$cdom,$cnum,undef,	if (&Apache::lonnet::in_course($sdom,$sname,$cdom,$cnum,undef,
Line 1640 sub prepare_functions {	Line 1715 sub prepare_functions {
if (($env{'form.folderpath'} =~ /^supplemental/) &&	if (($env{'form.folderpath'} =~ /^supplemental/) &&
(&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) &&	(&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) &&
(($resurl =~ m{^/adm/wrapper/ext/}) \|\|	(($resurl =~ m{^/adm/wrapper/ext/}) \|\|
($resurl =~ m{^/adm/$cdom/$cnum/\d+/ext\.tool$}) \|\|
($resurl =~ m{^/uploaded/$cdom/$cnum/supplemental/}) \|\|	($resurl =~ m{^/uploaded/$cdom/$cnum/supplemental/}) \|\|
($resurl eq '/adm/supplemental') \|\|	($resurl eq '/adm/supplemental') \|\|
($resurl =~ m{^/public/$cdom/$cnum/syllabus$}) \|\|	($resurl =~ m{^/public/$cdom/$cnum/syllabus$}) \|\|
Line 1652 sub prepare_functions {	Line 1726 sub prepare_functions {
$suppanchor = $env{'form.anchor'};	$suppanchor = $env{'form.anchor'};
}	}
my $esc_path=&escape(&HTML::Entities::encode(&escape($env{'form.folderpath'}),'<>&"'));	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]',	&switch('','',7,4,'docs-22x22.png','Edit Folder','parms[_2]',
"location.href='/adm/coursedocs?command=direct&forcesupplement=1&supppath=$esc_path&anchor=$suppanchor'",	"location.href='$link'",'Folder/Page Content');
'Folder/Page Content','','',1);
}	}
}	}
}	}
Line 2173 sub done_button_js {	Line 2251 sub done_button_js {
key => 'Key:',	key => 'Key:',
nokey => 'A proctor key is required',	nokey => 'A proctor key is required',
);	);
	my $shownsymb = &HTML::Entities::encode(&Apache::lonenc::check_encrypt($env{'request.symb'}));
my $navmap = Apache::lonnavmaps::navmap->new();	my $navmap = Apache::lonnavmaps::navmap->new();
my ($missing,$tried) = (0,0);	my ($missing,$tried) = (0,0);
if (ref($navmap)) {	if (ref($navmap)) {
Line 2235 sub done_button_js {	Line 2314 sub done_button_js {
<form method="post" name="LCdoneButton" action="">	<form method="post" name="LCdoneButton" action="">
<input type="hidden" name="LC_interval_done" value="" />	<input type="hidden" name="LC_interval_done" value="" />
<input type="hidden" name="LC_interval_done_proctorpass" value="" />	<input type="hidden" name="LC_interval_done_proctorpass" value="" />
	<input type="hidden" name="symb" value="$shownsymb" />
<button id="LC_done-confirm-opener" type="button">$donebuttontext</button>	<button id="LC_done-confirm-opener" type="button">$donebuttontext</button>
</form>	</form>

Line 2316 END	Line 2396 END

<form method="post" name="LCdoneButton" action="">	<form method="post" name="LCdoneButton" action="">
<input type="hidden" name="LC_interval_done" value="" />	<input type="hidden" name="LC_interval_done" value="" />
	<input type="hidden" name="symb" value="$shownsymb" />
<button id="LC_done-confirm-opener" type="button">$donebuttontext</button>	<button id="LC_done-confirm-opener" type="button">$donebuttontext</button>
</form>	</form>

Line 2361 END	Line 2442 END
sub utilityfunctions {	sub utilityfunctions {
my ($httphost) = @_;	my ($httphost) = @_;
my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));	my $currenturl=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
if ($currenturl =~ m{^/adm/wrapper/ext/}	my $currentsymb=&Apache::lonenc::check_encrypt($env{'request.symb'});
&& $env{'request.external.querystring'} ) {	if ($currenturl =~ m{^/adm/wrapper/ext/}) {
	if ($env{'request.external.querystring'}) {
$currenturl .= ($currenturl=~/\?/)?'&':'?'.$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));	$currenturl=&Apache::lonenc::check_encrypt(&unescape($currenturl));

my $currentsymb=&Apache::lonenc::check_encrypt($env{'request.symb'});

my $dc_popup_cid;	my $dc_popup_cid;
if ($env{'user.adv'} && exists($env{'user.role.dc./'.	if ($env{'user.adv'} && exists($env{'user.role.dc./'.
$env{'course.'.$env{'request.course.id'}.	$env{'course.'.$env{'request.course.id'}.
Line 2394 sub utilityfunctions {	Line 2479 sub utilityfunctions {

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

	my $annotateurl = '/adm/annotation';
	if ($httphost) {
	$annotateurl = '/adm/annotations';
	}
my $hostvar = '	my $hostvar = '
function setLCHost() {	function setLCHost() {
var lcHostname="";	var lcHostname="";
Line 2522 function annotate() {	Line 2611 function annotate() {
annotator.document.write(	annotator.document.write(
'$start_page_annotate'	'$start_page_annotate'
+"<form name='goannotate' target='Annotator' method='post' "	+"<form name='goannotate' target='Annotator' method='post' "
+"action='/adm/annotations'>"	+"action='$annotateurl'>"
+"<input type='hidden' name='symbnew' value='"+currentSymb+"' />"	+"<input type='hidden' name='symbnew' value='"+currentSymb+"' />"
+"<\\/form>"	+"<\\/form>"
+'$end_page_annotate');	+'$end_page_annotate');
Line 2544 function open_StoredLinks_Import(rat) {	Line 2633 function open_StoredLinks_Import(rat) {
}	}

function open_source() {	function open_source() {
var url = escape(window.location.pathname);	sourcewin=window.open('/adm/source?inhibitmenu=yes&viewonly=1&filename='+currentURL,'LONsource',
sourcewin=window.open('/adm/source?inhibitmenu=yes&viewonly=1&filename='+url,'LONsource',
'height=500,width=600,resizable=yes,location=no,menubar=no,toolbar=no,scrollbars=yes');	'height=500,width=600,resizable=yes,location=no,menubar=no,toolbar=no,scrollbars=yes');
}	}

Line 2632 sub roles_selector {	Line 2720 sub roles_selector {
}	}
my ($privref,$gotsymb,$destsymb);	my ($privref,$gotsymb,$destsymb);
my $destinationurl = $ENV{'REQUEST_URI'};	my $destinationurl = $ENV{'REQUEST_URI'};
if ($destinationurl =~ /\?symb=/) {	if ($destinationurl =~ /(\?\|\&)symb=/) {
$gotsymb = 1;	$gotsymb = 1;
} elsif ($destinationurl =~ m{^/enc/}) {	} elsif ($destinationurl =~ m{^/enc/}) {
my $plainurl = &Apache::lonenc::unencrypted($destinationurl);	my $plainurl = &Apache::lonenc::unencrypted($destinationurl);
if ($plainurl =~ /\?symb=/) {	if ($plainurl =~ /(\?\|\&)symb=/) {
$gotsymb = 1;	$gotsymb = 1;
}	}
}	}

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

Removed from v.1.369.2.71.4.4
changed lines
	Added in v.1.369.2.83.4.1