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.57 and 1.369.2.77

version 1.369.2.57, 2016/08/13 21:14:50	version 1.369.2.77, 2019/08/06 23:18:43
Line 132 Inputs: 6 - (a) link and (b) target for	Line 132 Inputs: 6 - (a) link and (b) target for
(f) optional class for <li> element in primary menu, for which	(f) optional class for <li> element in primary menu, for which
sub menu is being generated.	sub menu is being generated.

	The underlying datastructure used in (d) contains data from mydesk.tab.
	It consists of an array which has an array for each item appearing in
	the menu (e.g. [["link", "title", "condition"]] for a single-item menu).
	create_submenu() supports also the creation of XHTML for nested dropdown
	menus represented by unordered lists. This is done by replacing the
	scalar used for the link with an arrayreference containing the menuitems
	for the nested menu. This can be done recursively so that the next menu
	may also contain nested submenus.

	Example:
	[ # begin of datastructure
	["/home/", "Home", "condition1"], # 1st item of the 1st layer menu
	[ # 2nd item of the 1st layer menu
	[ # anon. array for nested menu
	["/path1", "Path1", undef], # 1st item of the 2nd layer menu
	["/path2", "Path2", undef], # 2nd item of the 2nd layer menu
	[ # 3rd item of the 2nd layer menu
	[[...], [...], ..., [...]], # containing another menu layer
	"Sub-Sub-Menu", # title for this container
	undef
	]
	], # end of array/nested menu
	"Sub-Menu", # title for the container item
	undef
	] # end of 2nd item of the 1st layer menu
	]


=item innerregister()	=item innerregister()

Line 286 sub primary_menu {	Line 313 sub primary_menu {
push(@primsub,$item);	push(@primsub,$item);
}	}
if (@primsub > 0) {	if (@primsub > 0) {
	if ($title eq 'Personal' && $env{'user.name'} && $env{'user.domain'} ) {
	$title = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
	} else {
	$title = &mt($title);
	}
$menu{$position} .= &create_submenu($link,$target,$title,\@primsub,1);	$menu{$position} .= &create_submenu($link,$target,$title,\@primsub,1);
} elsif ($link) {	} elsif ($link) {
$menu{$position} .= '<li><a href="'.$link.'" target="'.$target.'">'.&mt($title).'</a></li>';	$menu{$position} .= '<li><a href="'.$link.'" target="'.$target.'">'.&mt($title).'</a></li>';
Line 352 sub secondary_menu {	Line 384 sub secondary_menu {
? "/$env{'request.course.sec'}"	? "/$env{'request.course.sec'}"
: '');	: '');
my $canedit = &Apache::lonnet::allowed('mdc', $env{'request.course.id'});	my $canedit = &Apache::lonnet::allowed('mdc', $env{'request.course.id'});
	my $canvieweditor = &Apache::lonnet::allowed('cev', $env{'request.course.id'});
my $canviewroster = $env{'course.'.$env{'request.course.id'}.'.student_classlist_view'};	my $canviewroster = $env{'course.'.$env{'request.course.id'}.'.student_classlist_view'};
if ($canviewroster eq 'disabled') {	if ($canviewroster eq 'disabled') {
undef($canviewroster);	undef($canviewroster);
}	}
my $canviewgrps = &Apache::lonnet::allowed('vcg', $crs_sec);	my $canviewgrps = &Apache::lonnet::allowed('vcg', $crs_sec);
my $canmodifyuser = &Apache::lonnet::allowed('cst', $crs_sec);	my $canmodifyuser = &Apache::lonnet::allowed('cst', $crs_sec);
	my $canviewusers = &Apache::lonnet::allowed('vcl', $crs_sec);
my $canviewwnew = &Apache::lonnet::allowed('whn', $crs_sec);	my $canviewwnew = &Apache::lonnet::allowed('whn', $crs_sec);
	my $canviewpara = &Apache::lonnet::allowed('vpa', $crs_sec);
my $canmodpara = &Apache::lonnet::allowed('opa', $crs_sec);	my $canmodpara = &Apache::lonnet::allowed('opa', $crs_sec);
my $canvgr = &Apache::lonnet::allowed('vgr', $crs_sec);	my $canvgr = &Apache::lonnet::allowed('vgr', $crs_sec);
my $canmgr = &Apache::lonnet::allowed('mgr', $crs_sec);	my $canmgr = &Apache::lonnet::allowed('mgr', $crs_sec);
my $author = &getauthor();	my $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'};
unless ($canedit) {	unless ($canedit \|\| $canvieweditor) {
unless (&Apache::lonnet::is_on_map("public/$cdom/$cnum/syllabus")) {	unless (&Apache::lonnet::is_on_map("public/$cdom/$cnum/syllabus")) {
if (($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'}) \|\|	if (($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'}) \|\|
($env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) \|\|	($env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) \|\|
Line 381 sub secondary_menu {	Line 417 sub secondary_menu {
$showfeeds = 1;	$showfeeds = 1;
}	}
}	}
unless ($canmgr) {	unless ($canmgr \|\| $canvgr) {
my %slots = &Apache::lonnet::get_course_slots($cnum,$cdom);	my %slots = &Apache::lonnet::get_course_slots($cnum,$cdom);
if (keys(%slots) > 0) {	if (keys(%slots) > 0) {
$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 ($canmodifycoauthor);	my ($canmodifycoauthor);
Line 398 sub secondary_menu {	Line 444 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 411 sub secondary_menu {	Line 452 sub secondary_menu {
next if $$menuitem[4] ne 'always'	next if $$menuitem[4] ne 'always'
&& ($$menuitem[4] ne 'author' && $$menuitem[4] ne 'cca')	&& ($$menuitem[4] ne 'author' && $$menuitem[4] ne 'cca')
&& !$env{'request.course.id'};	&& !$env{'request.course.id'};
next if $$menuitem[4] =~ /^mdc/	next if $$menuitem[4] =~ /^crsedit/
&& !$canedit;	&& (!$canedit && !$canvieweditor);
next if $$menuitem[4] eq 'mdcCourse'	next if $$menuitem[4] eq 'crseditCourse'
&& ($crstype eq 'Community');	&& ($crstype eq 'Community');
next if $$menuitem[4] eq 'mdcCommunity'	next if $$menuitem[4] eq 'crseditCommunity'
&& ($crstype eq 'Course');	&& ($crstype eq 'Course');
next if $$menuitem[4] eq 'nvgr'	next if $$menuitem[4] eq 'nvgr'
&& $canvgr;	&& $canvgr;
next if $$menuitem[4] eq 'vgr'	next if $$menuitem[4] eq 'vgr'
&& !$canvgr;	&& !$canvgr;
next if $$menuitem[4] eq 'cst'	next if $$menuitem[4] eq 'viewusers'
&& !$canmodifyuser;	&& !$canmodifyuser && !$canviewusers;
next if $$menuitem[4] eq 'ncst'	next if $$menuitem[4] eq 'noviewusers'
&& ($canmodifyuser \|\| !$canviewroster);	&& ($canmodifyuser \|\| $canviewusers \|\| !$canviewroster);
next if $$menuitem[4] eq 'mgr'	next if $$menuitem[4] eq 'mgr'
&& !$canmgr;	&& !$canmgr;
next if $$menuitem[4] eq 'showresv'	next if $$menuitem[4] eq 'showresv'
&& !$showresv;	&& !$showresv;
next if $$menuitem[4] eq 'whn'	next if $$menuitem[4] eq 'whn'
&& !$canviewwnew;	&& !$canviewwnew;
next if $$menuitem[4] eq 'opa'	next if $$menuitem[4] eq 'params'
&& !$canmodpara;	&& (!$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 459 sub secondary_menu {	Line 500 sub secondary_menu {
if (ref($item) eq 'ARRAY') {	if (ref($item) eq 'ARRAY') {
next if ($item->[2] eq 'vgr' && !$canvgr);	next if ($item->[2] eq 'vgr' && !$canvgr);
next if ($item->[2] eq 'opa' && !$canmodpara);	next if ($item->[2] eq 'opa' && !$canmodpara);
next if ($item->[2] eq 'cst' && !$canmodifyuser);	next if ($item->[2] eq 'vpa' && !$canviewpara);
	next if ($item->[2] eq 'viewusers' && !($canmodifyuser \|\| $canviewusers));
next if ($item->[2] eq 'mgr' && !$canmgr);	next if ($item->[2] eq 'mgr' && !$canmgr);
next if ($item->[2] eq 'vcg' && !$canviewgrps);	next if ($item->[2] eq 'vcg' && !$canviewgrps);
next if ($item->[2] eq 'mdc' && !$canedit);	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);
}	}
}	}
Line 486 sub secondary_menu {	Line 531 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()) {
	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);
}	}
Line 510 sub secondary_menu {	Line 568 sub secondary_menu {
my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};	my $londocroot = $Apache::lonnet::perlvar{'lonDocRoot'};
($escurl = $env{'request.filename'}) =~ s{^\Q$londocroot\E}{};	($escurl = $env{'request.filename'}) =~ s{^\Q$londocroot\E}{};
$escurl = &escape($escurl);	$escurl = &escape($escurl);
}	}
$menu =~ s/\[url\]/$escurl/g;	$menu =~ s/\[url\]/$escurl/g;
$menu =~ s/\[symb\]/$escsymb/g;	$menu =~ s/\[symb\]/$escsymb/g;
}	}
Line 536 sub create_submenu {	Line 594 sub create_submenu {
if ($target ne '') {	if ($target ne '') {
$disptarget = ' target="'.$target.'"';	$disptarget = ' target="'.$target.'"';
}	}
my $name;
if ($title eq 'Personal') {
if ($env{'user.name'} && $env{'user.domain'}) {
$name = &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'});
} else {
$name = &mt($title);
}
} else {
$name = &mt($title);
}
my $menu = '<li class="LC_hoverable '.$addclass.'">'.	my $menu = '<li class="LC_hoverable '.$addclass.'">'.
'<a href="'.$link.'"'.$disptarget.'>'.	'<a href="'.$link.'"'.$disptarget.'>'.
'<span class="LC_nobreak">'.$name.	'<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>'.
'<ul>';	'<ul>';

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

	return $menu;
	}

	# helper routine for create_submenu
	# build the dropdown (and nested submenus) recursively
	# see perldoc create_submenu documentation for further information
	sub build_submenu {
	my ($target, $submenu, $translate, $first_level) = @_;
	unless (@{$submenu}) {
	return '';
	}

	my $menu = '';
my $count = 0;	my $count = 0;
my $numsub = scalar(@{$submenu});	my $numsub = scalar(@{$submenu});
foreach my $item (@{$submenu}) {	foreach my $item (@{$submenu}) {
$count ++;	$count ++;
if (ref($item) eq 'ARRAY') {	if (ref($item) eq 'ARRAY') {
my $href = $item->[0];	my $href = $item->[0];
if ($href =~ /(aboutme\|rss\.html)$/) {	my $bordertop;
next unless (($env{'user.name'} ne '') && ($env{'user.domain'} ne ''));
$href =~ s/\[domain\]/$env{'user.domain'}/g;
$href =~ s/\[user\]/$env{'user.name'}/g;
}
my $borderbot;	my $borderbot;
if ($count == $numsub) {	my $title;
$borderbot = 'border-bottom:1px solid black;';
}
unless (($href eq '') \|\| ($href =~ /^\#/)) {
$target = ' target="_top"';
}
$menu .= '<li style="margin:0;padding:0;'.
$borderbot.'"><a href="'.$href.'"'.$target.'>';
if ($translate) {	if ($translate) {
$menu .= &mt($item->[1]);	$title = &mt($item->[1]);
} else {	} else {
$menu .= $item->[1];	$title = $item->[1];
	}

	if ($count == 1 && !$first_level) {
	$bordertop = 'border-top: 1px solid black;';
	}
	if ($count == $numsub) {
	$borderbot = 'border-bottom: 1px solid black;';
	}

	# href is a reference to another submenu
	if (ref($href) eq 'ARRAY') {
	$menu .= '<li style="margin:0;padding:0;'.$bordertop . $borderbot . '">';
	$menu .= '<p><span class="LC_primary_menu_innertitle">'
	. $title . '</span><span class="LC_primary_menu_innerarrow">▶</span></p>';
	$menu .= '<ul>';
	$menu .= &build_submenu($target, $href, $translate);
	$menu .= '</ul>';
	$menu .= '</li>';
	} else { # href is the actual hyperlink and does not represent another submenu
	# for the current menu title
	if ($href =~ /(aboutme\|rss\.html)$/) {
	next unless (($env{'user.name'} ne '') && ($env{'user.domain'} ne ''));
	$href =~ s/\[domain\]/$env{'user.domain'}/g;
	$href =~ s/\[user\]/$env{'user.name'}/g;
	} elsif (($href =~ m{^/adm/preferences\?}) && ($href =~ /\[returnurl\]/)) {
	my $returnurl = $ENV{'REQUEST_URI'};
	if ($ENV{'REQUEST_URI'} =~ m{/adm/preferences\?action=(?:changedomcoord\|authorsettings)\&returnurl=([^\&]+)$}) {
	$returnurl = $1;
	}
	if (($returnurl =~ m{^/adm/createuser($\|\?action=)}) \|\|
	($returnurl =~ m{^/priv/$match_domain/$match_username}) \|\|
	($returnurl =~ m{^/res(/?$\|/$match_domain/$match_username)})) {
	$returnurl =~ s{\?.*$}{};
	$returnurl = '&returnurl='.&HTML::Entities::encode($returnurl,'"<>&\'');
	} else {
	undef($returnurl);
	}
	$href =~ s/\[returnurl\]/$returnurl/;
	}
	unless (($href eq '') \|\| ($href =~ /^\#/)) {
	$target = ' target="_top"';
	}

	$menu .= '<li style="margin:0;padding:0;'. $bordertop . $borderbot .'">';
	$menu .= '<a href="'.$href.'"'.$target.'>' . $title . '</a>';
	$menu .= '</li>';
}	}
$menu .= '</a></li>';
}	}
}	}
$menu .= '</ul></li>';
return $menu;	return $menu;
}	}

Line 613 sub registerurl {	Line 714 sub registerurl {
}	}

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

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

if ($env{'request.course.id'}) {	if ($env{'request.course.id'}) {
	#
	#course_type: Course or Community
	#
	$crstype = &Apache::loncommon::course_type();
if ($env{'request.symb'}) {	if ($env{'request.symb'}) {
($mapurl, my $rid, $resurl) = &Apache::lonnet::decode_symb(&Apache::lonnet::symbread());	($mapurl, my $rid, $resurl) = &Apache::lonnet::decode_symb(&Apache::lonnet::symbread());
my $coursetitle = $env{'course.'.$env{'request.course.id'}.'.description'};	my $coursetitle = $env{'course.'.$env{'request.course.id'}.'.description'};
Line 644 sub innerregister {	Line 749 sub innerregister {
my $maptitle = &Apache::lonnet::gettitle($mapurl);	my $maptitle = &Apache::lonnet::gettitle($mapurl);
my $restitle = &Apache::lonnet::gettitle(&Apache::lonnet::symbread());	my $restitle = &Apache::lonnet::gettitle(&Apache::lonnet::symbread());


#SD
#course_type only Course and Community?
#
my @crumbs;	my @crumbs;
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 681 sub innerregister {	Line 781 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 691 sub innerregister {	Line 790 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 706 sub innerregister {	Line 805 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 746 sub innerregister {	Line 845 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 759 sub innerregister {	Line 858 sub innerregister {
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'};	$cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};	$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
$perms{'mdc'} = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});	$perms{'mdc'} = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
	$perms{'cev'} = &Apache::lonnet::allowed('cev',$env{'request.course.id'});
my @privs;	my @privs;
if ($env{'request.symb'} ne '') {	if ($env{'request.symb'} ne '') {
if ($env{'request.filename'}=~/$LONCAPA::assess_re/) {	if ($env{'request.filename'}=~/$LONCAPA::assess_re/) {
push(@privs,('mgr','vgr'));	push(@privs,('mgr','vgr'));
}	}
push(@privs,'opa');	push(@privs,('opa','vpa'));
}	}
foreach my $priv (@privs) {	foreach my $priv (@privs) {
$perms{$priv} = &Apache::lonnet::allowed($priv,$env{'request.course.id'});	$perms{$priv} = &Apache::lonnet::allowed($priv,$env{'request.course.id'});
Line 790 sub innerregister {	Line 890 sub innerregister {
'Content Submissions');	'Content Submissions');
}	}
}	}
if (($env{'request.symb'} ne '') && ($perms{'opa'})) {	if (($env{'request.symb'} ne '') && (($perms{'opa'}) \|\| ($perms{'vpa'}))) {
$hwkadd .= &switch('','',7,3,'pparm.png','Content Settings',	$hwkadd .= &switch('','',7,3,'pparm.png','Content Settings',
'parms[_2]',"gocmd('/adm/parmset','set')",	'parms[_2]',"gocmd('/adm/parmset','set')",
'Content Settings');	'Content Settings');
Line 800 sub innerregister {	Line 900 sub innerregister {
#	#
# This applies to items inside a folder/page modifiable in the course.	# This applies to items inside a folder/page modifiable in the course.
#	#
if (($env{'request.symb'}=~/^uploaded/) && ($perms{'mdc'})) {	if (($env{'request.symb'}=~/^uploaded/) && (($perms{'mdc'}) \|\| ($perms{'cev'}))) {
my $text = 'Edit Folder';	my $text = 'Edit Folder';
if (($mapurl =~ /\.page$/) \|\|	if (($mapurl =~ /\.page$/) \|\|
($env{'request.symb'}=~	($env{'request.symb'}=~
Line 967 ENDMENUITEMS	Line 1067 ENDMENUITEMS
my $addremote=0;	my $addremote=0;
foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} }	foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} }
if ($addremote) {	if ($addremote) {
	my ($countdown,$buttonshide);
&Apache::lonhtmlcommon::clear_breadcrumb_tools();

&Apache::lonhtmlcommon::add_breadcrumb_tool(
'navigation', @inlineremote[21,23]);

my $countdown;
if ($env{'request.filename'} =~ /\.page$/) {	if ($env{'request.filename'} =~ /\.page$/) {
my %breadcrumb_tools = &Apache::lonhtmlcommon::current_breadcrumb_tools();	my %breadcrumb_tools = &Apache::lonhtmlcommon::current_breadcrumb_tools();
if (ref($breadcrumb_tools{'tools'}) eq 'ARRAY') {	if (ref($breadcrumb_tools{'tools'}) eq 'ARRAY') {
$countdown = $breadcrumb_tools{'tools'}[0];	$countdown = $breadcrumb_tools{'tools'}->[0];
}	}
	$buttonshide = $pagebuttonshide;
} else {	} else {
$countdown = &countdown_timer();	$countdown = &countdown_timer();
	$buttonshide = &hidden_button_check();
}	}
if (&hidden_button_check() eq 'yes') {
	&Apache::lonhtmlcommon::clear_breadcrumb_tools();

	&Apache::lonhtmlcommon::add_breadcrumb_tool(
	'navigation', @inlineremote[21,23]);

	if ($buttonshide eq 'yes') {
if ($countdown) {	if ($countdown) {
&Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$countdown);	&Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$countdown);
}	}
Line 1332 ENDOPEN	Line 1434 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);	my ($folderpath,$command,$navmap);
if ($env{'request.symb'}) {	if ($env{'request.symb'}) {
$folderpath = &Apache::loncommon::symb_to_docspath($env{'request.symb'});	$folderpath = &Apache::loncommon::symb_to_docspath($env{'request.symb'},\$navmap);
} elsif ($env{'form.folderpath'} =~ /^supplemental/) {	} elsif ($env{'form.folderpath'} =~ /^supplemental/) {
$folderpath = $env{'form.folderpath'};	$folderpath = $env{'form.folderpath'};
$command = '&forcesupplement=1';	$command = '&forcesupplement=1';
Line 1345 sub get_editbutton {	Line 1447 sub get_editbutton {
$folderpath = &escape(&HTML::Entities::encode(&escape($folderpath),'<>&"'));	$folderpath = &escape(&HTML::Entities::encode(&escape($folderpath),'<>&"'));
$jscall = "go('/adm/coursedocs?folderpath=$folderpath$command')";	$jscall = "go('/adm/coursedocs?folderpath=$folderpath$command')";
} else {	} else {
	my $suppanchor;
	if ($env{'form.folderpath'}) {
	$suppanchor = $env{'form.anchor'};
	}
$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'}),
	$env{'form.todocs'},$suppanchor);
}	}
if ($jscall) {	if ($jscall) {
my $icon = 'pcstr.png';	my $icon = 'pcstr.png';
Line 1382 sub get_editbutton {	Line 1489 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 1396 sub prepare_functions {	Line 1503 sub prepare_functions {
}	}

my $editbutton = '';	my $editbutton = '';
	my $viewsrcbutton = '';
#	#
# Determine whether or not to display 'Edit' 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 $file=&Apache::lonnet::declutter($env{'request.filename'});	my $file=&Apache::lonnet::declutter($env{'request.filename'});
Line 1428 sub prepare_functions {	Line 1536 sub prepare_functions {
# This applies in course context	# This applies in course context
#	#
if (($perms{'mdc'}) &&	if (($perms{'mdc'}) &&
(($resurl eq "/public/$cdom/$cnum/syllabus") \|\|	(($resurl =~ m{^/?public/$cdom/$cnum/syllabus}) \|\|
($resurl =~ m{^/uploaded/$cdom/$cnum/portfolio/syllabus/}))) {	($resurl =~ m{^/?uploaded/$cdom/$cnum/portfolio/syllabus/}))) {
$cfile = $resurl;	if ($resurl =~ m{^/}) {
	$cfile = $resurl;
	} else {
	$cfile = "/$resurl";
	}
$home = &Apache::lonnet::homeserver($cnum,$cdom);	$home = &Apache::lonnet::homeserver($cnum,$cdom);
if ($env{'form.forceedit'}) {	if ($env{'form.forceedit'}) {
$forceview = 1;	$forceview = 1;
Line 1438 sub prepare_functions {	Line 1550 sub prepare_functions {
$forceedit = 1;	$forceedit = 1;
}	}
$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'}))) {
($cfile,$home,$switchserver,$forceedit,$forceview) =	($cfile,$home,$switchserver,$forceedit,$forceview) =
Line 1467 sub prepare_functions {	Line 1580 sub prepare_functions {
$editbutton = &get_editbutton($cfile,$home,$switchserver,	$editbutton = &get_editbutton($cfile,$home,$switchserver,
$forceedit,$forceview,$forcereg);	$forceedit,$forceview,$forcereg);
}	}
	if ((($cfile eq '') \|\| (!$editbutton)) &&
	($resurl =~ /$LONCAPA::assess_re/)) {
	my $showurl = &Apache::lonnet::clutter($resurl);
	if ((&Apache::lonnet::allowed('cre','/')) &&
	(&Apache::lonnet::metadata($resurl,'sourceavail') eq 'open')) {
	$viewsrcbutton = 1;
	} elsif (&Apache::lonnet::allowed('vxc',$env{'request.course.id'})) {
	if ($showurl =~ m{^\Q/res/$cdom/\E($match_username)/}) {
	my $auname = $1;
	if (($env{'request.course.adhocsrcaccess'} ne '') &&
	(grep(/^\Q$auname\E$/,split(/,/,$env{'request.course.adhocsrcaccess'})))) {
	$viewsrcbutton = 1;
	} elsif ((&Apache::lonnet::metadata($resurl,'sourceavail') eq 'open') &&
	(&Apache::lonnet::allowed('bre','/'))) {
	$viewsrcbutton = 1;
	}
	}
	}
	if ($viewsrcbutton) {
	&switch('','',6,1,'pcstr.png','View Source','resource[_2]','open_source()',
	'View source code');
	}
	}
}	}
}	}
}	}
Line 1521 sub prepare_functions {	Line 1657 sub prepare_functions {
($resurl =~ m{^/adm/$match_domain/$match_username/aboutme$}))) {	($resurl =~ m{^/adm/$match_domain/$match_username/aboutme$}))) {
my @folders=split('&',$env{'form.folderpath'});	my @folders=split('&',$env{'form.folderpath'});
if ((@folders > 2) \|\| ($resurl ne '/adm/supplemental')) {	if ((@folders > 2) \|\| ($resurl ne '/adm/supplemental')) {
	my $suppanchor;
	if ($resurl =~ m{^/adm/wrapper/ext/}) {
	$suppanchor = $env{'form.anchor'};
	}
my $esc_path=&escape(&HTML::Entities::encode(&escape($env{'form.folderpath'}),'<>&"'));	my $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'",	"location.href='$link'",'Folder/Page Content');
'Folder/Page Content','','',1);
}	}
}	}
}	}
Line 2020 END	Line 2164 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 2053 sub utilityfunctions {	Line 2201 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 2079 return (<<ENDUTILITY)	Line 2231 return (<<ENDUTILITY)

$dc_popup_cid	$dc_popup_cid

function go(url) {
if (url!='' && url!= null) {
currentURL = null;
currentSymb= null;
var lcHostname = setLCHost();
window.location.href=lcHostname+url;
}
}

$jumptores	$jumptores

function gopost(url,postdata) {	function gopost(url,postdata) {
Line 2190 function annotate() {	Line 2333 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 2283 sub roles_selector {	Line 2426 sub roles_selector {
my ($cdom,$cnum,$httphost) = @_;	my ($cdom,$cnum,$httphost) = @_;
my $crstype = &Apache::loncommon::course_type();	my $crstype = &Apache::loncommon::course_type();
my $now = time;	my $now = time;
my (%courseroles,%seccount,%courseprivs);	my (%courseroles,%seccount,%courseprivs,%roledesc);
my $is_cc;	my $is_cc;
my ($js,$form,$switcher,$switchtext);	my ($js,$form,$switcher);
my $ccrole;	my $ccrole;
if ($crstype eq 'Community') {	if ($crstype eq 'Community') {
$ccrole = 'co';	$ccrole = 'co';
} else {	} else {
$ccrole = 'cc';	$ccrole = 'cc';
}	}
my ($priv,$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;
}	}
}	}
Line 2313 sub roles_selector {	Line 2456 sub roles_selector {
my $destination = $destinationurl;	my $destination = $destinationurl;
$destination =~ s/(\?.*)$//;	$destination =~ s/(\?.*)$//;
if (exists($reqprivs->{$destination})) {	if (exists($reqprivs->{$destination})) {
$priv = $reqprivs->{$destination};	if ($reqprivs->{$destination} =~ /,/) {
	@{$privref} = split(/,/,$reqprivs->{$destination});
	} else {
	$privref = [$reqprivs->{$destination}];
	}
}	}
}	}
if ($env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum}) {	if ($env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum}) {
my ($start,$end) = split(/\./,$env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum});	my ($start,$end) = split(/\./,$env{'user.role.'.$ccrole.'./'.$cdom.'/'.$cnum});

if ((($start) && ($start<0)) \|\|	if ((($start) && ($start<0)) \|\|
(($end) && ($end<$now)) \|\|	(($end) && ($end<$now)) \|\|
(($start) && ($now<$start))) {	(($start) && ($now<$start))) {
Line 2328 sub roles_selector {	Line 2474 sub roles_selector {
}	}
}	}
if ($is_cc) {	if ($is_cc) {
&get_all_courseroles($cdom,$cnum,\%courseroles,\%seccount,\%courseprivs,$priv);	&get_all_courseroles($cdom,$cnum,\%courseroles,\%seccount,\%courseprivs);
	} elsif ($env{'request.role'} =~ m{^\Qcr/$cdom/$cdom-domainconfig/\E(\w+)\.\Q/$cdom/$cnum\E}) {
	&get_customadhoc_roles($cdom,$cnum,\%courseroles,\%seccount,\%courseprivs,\%roledesc,$privref);
} else {	} else {
my %gotnosection;	my %gotnosection;
foreach my $item (keys(%env)) {	foreach my $item (keys(%env)) {
Line 2344 sub roles_selector {	Line 2492 sub roles_selector {
$gotnosection{$role} = 1;	$gotnosection{$role} = 1;
}	}
}	}
if ($priv ne '') {	if ((ref($privref) eq 'ARRAY') && (@{$privref} > 0)) {
my $cnumsec = $cnum;	my $cnumsec = $cnum;
if ($sec ne '') {	if ($sec ne '') {
$cnumsec .= "/$sec";	$cnumsec .= "/$sec";
Line 2373 sub roles_selector {	Line 2521 sub roles_selector {
}	}
}	}
}	}
$switchtext = 'Switch role'; # do not translate here
my @roles_order = ($ccrole,'in','ta','ep','ad','st');	my @roles_order = ($ccrole,'in','ta','ep','ad','st');
my $numdiffsec;	my $numdiffsec;
if (keys(%seccount) == 1) {	if (keys(%seccount) == 1) {
Line 2383 sub roles_selector {	Line 2530 sub roles_selector {
}	}
if ((keys(%seccount) > 1) \|\| ($numdiffsec > 1)) {	if ((keys(%seccount) > 1) \|\| ($numdiffsec > 1)) {
my @submenu;	my @submenu;
$js = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,$priv);	$js = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,\%roledesc,$privref);
$form =	$form =
'<form name="rolechooser" method="post" action="'.$httphost.'/adm/roles">'."\n".	'<form name="rolechooser" method="post" action="'.$httphost.'/adm/roles">'."\n".
' <input type="hidden" name="destinationurl" value="'.	' <input type="hidden" name="destinationurl" value="'.
Line 2423 sub roles_selector {	Line 2570 sub roles_selector {
$include = 1;	$include = 1;
}	}
if ($include) {	if ($include) {
	my $rolename;
	if ($role =~ m{^cr/$cdom/$cdom\-domainconfig/(\w+)(?:/\w+\|$)}) {
	$rolename = $roledesc{$role};
	if ($rolename eq '') {
	$rolename = &mt('Helpdesk [_1]',$1);
	}
	} else {
	$rolename = &Apache::lonnet::plaintext($role);
	}
push(@submenu,['javascript:adhocRole('."'$role'".')',	push(@submenu,['javascript:adhocRole('."'$role'".')',
&Apache::lonnet::plaintext($role)]);	$rolename]);
}	}
}	}
}	}
if (@submenu > 0) {	if (@submenu > 0) {
$switcher = &create_submenu('','',$switchtext,\@submenu);	$switcher = &create_submenu('','',&mt('Switch role'),\@submenu);
}	}
}	}
return ($js,$form,$switcher);	return ($js,$form,$switcher);
Line 2505 sub get_all_courseroles {	Line 2661 sub get_all_courseroles {
return;	return;
}	}

	sub get_customadhoc_roles {
	my ($cdom,$cnum,$courseroles,$seccount,$courseprivs,$roledesc,$privref) = @_;
	unless ((ref($courseroles) eq 'HASH') && (ref($seccount) eq 'HASH') &&
	(ref($courseprivs) eq 'HASH') && (ref($roledesc) eq 'HASH')) {
	return;
	}
	my $is_helpdesk = 0;
	my $now = time;
	foreach my $role ('dh','da') {
	if ($env{"user.role.$role./$cdom/"}) {
	my ($start,$end)=split(/\./,$env{"user.role.$role./$cdom/"});
	if (!($start && ($now<$start)) && !($end && ($now>$end))) {
	$is_helpdesk = 1;
	last;
	}
	}
	}
	if ($is_helpdesk) {
	my ($possroles,$description) = &Apache::lonnet::get_my_adhocroles($cdom.'_'.$cnum);
	my %available;
	if (ref($possroles) eq 'ARRAY') {
	map { $available{$_} = 1; } @{$possroles};
	}
	my %domdefaults = &Apache::lonnet::get_domain_defaults($cdom);
	if (ref($domdefaults{'adhocroles'}) eq 'HASH') {
	if (keys(%{$domdefaults{'adhocroles'}})) {
	my $numsec = 1;
	my @sections;
	my ($allseclist,$cached) =
	&Apache::lonnet::is_cached_new('courseseclist',$cdom.'_'.$cnum);
	if (defined($cached)) {
	if ($allseclist ne '') {
	@sections = split(/,/,$allseclist);
	$numsec += scalar(@sections);
	}
	} else {
	my %sections_count = &Apache::loncommon::get_sections($cdom,$cnum);
	@sections = sort(keys(%sections_count));
	$numsec += scalar(@sections);
	$allseclist = join(',',@sections);
	&Apache::lonnet::do_cache_new('courseseclist',$cdom.'_'.$cnum,$allseclist);
	}
	my (%adhoc,$gotprivs);
	my $prefix = "cr/$cdom/$cdom".'-domainconfig';
	foreach my $role (keys(%{$domdefaults{'adhocroles'}})) {
	next if (($role eq '') \|\| ($role =~ /\W/));
	$seccount->{"$prefix/$role"} = $numsec;
	$roledesc->{"$prefix/$role"} = $description->{$role};
	if ((ref($privref) eq 'ARRAY') && (@{$privref} > 0)) {
	if (exists($env{"user.priv.$prefix/$role./$cdom/$cnum./"})) {
	$courseprivs->{"$prefix/$role./$cdom/$cnum./"} =
	$env{"user.priv.$prefix/$role./$cdom/$cnum./"};
	$courseprivs->{"$prefix/$role./$cdom/$cnum./$cdom/"} =
	$env{"user.priv.$prefix/$role./$cdom/$cnum./$cdom/"};
	$courseprivs->{"$prefix/$role./$cdom/$cnum./$cdom/$cnum"} =
	$env{"user.priv.$prefix/$role./$cdom/$cnum./$cdom/$cnum"};
	} else {
	unless ($gotprivs) {
	my ($adhocroles,$privscached) =
	&Apache::lonnet::is_cached_new('adhocroles',$cdom);
	if ((defined($privscached)) && (ref($adhocroles) eq 'HASH')) {
	%adhoc = %{$adhocroles};
	} else {
	my $confname = &Apache::lonnet::get_domainconfiguser($cdom);
	my %roledefs = &Apache::lonnet::dump('roles',$cdom,$confname,'rolesdef_');
	foreach my $key (keys(%roledefs)) {
	(undef,my $rolename) = split(/_/,$key);
	if ($rolename ne '') {
	my ($systempriv,$domainpriv,$coursepriv) = split(/\_/,$roledefs{$key});
	$coursepriv = &Apache::lonnet::course_adhocrole_privs($rolename,$cdom,$cnum,$coursepriv);
	$adhoc{$rolename} = join('_',($systempriv,$domainpriv,$coursepriv));
	}
	}
	&Apache::lonnet::do_cache_new('adhocroles',$cdom,\%adhoc);
	}
	$gotprivs = 1;
	}
	($courseprivs->{"$prefix/$role./$cdom/$cnum./"},
	$courseprivs->{"$prefix/$role./$cdom/$cnum./$cdom/"},
	$courseprivs->{"$prefix/$role./$cdom/$cnum./$cdom/$cnum"}) =
	split(/\_/,$adhoc{$role});
	}
	}
	if ($available{$role}) {
	$courseroles->{"$prefix/$role"} = \@sections;
	}
	}
	}
	}
	}
	return;
	}

sub jump_to_role {	sub jump_to_role {
my ($cdom,$cnum,$seccount,$courseroles,$courseprivs,$priv) = @_;	my ($cdom,$cnum,$seccount,$courseroles,$courseprivs,$roledesc,$privref) = @_;
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 2539 sub jump_to_role {	Line 2788 sub jump_to_role {
}	}
}	}
my $checkroles = 0;	my $checkroles = 0;
if ($priv && ref($courseprivs) eq 'HASH') {	if ((ref($privref) eq 'ARRAY') && (@{$privref} > 0) && (ref($courseprivs) eq 'HASH')) {
my (%disallowed,%allowed,@disallow);	my %disallowed;
foreach my $role (sort(keys(%{$courseprivs}))) {	foreach my $role (sort(keys(%{$courseprivs}))) {
my $trole;	my $trole;
if ($role =~ m{^(.+?)\Q./$cdom/$cnum\E}) {	if ($role =~ m{^(.+?)\Q./$cdom/$cnum\E}) {
$trole = $1;	$trole = $1;
}	}
if (($trole ne '') && ($trole ne 'cm')) {	if (($trole ne '') && ($trole ne 'cm')) {
if ($courseprivs->{$role} =~ /\Q:$priv\E($\|:\|\&\w+)/) {	$disallowed{$trole} = 1;
$allowed{$trole} = 1;	foreach my $priv (@{$privref}) {
} else {	if ($courseprivs->{$role} =~ /\Q:$priv\E($\|:\|\&\w+)/) {
$disallowed{$trole} = 1;	delete($disallowed{$trole});
	last;
	}
}	}
}	}
}	}
foreach my $trole (keys(%disallowed)) {	if (keys(%disallowed) > 0) {
unless ($allowed{$trole}) {
push(@disallow,$trole);
}
}
if (@disallow > 0) {
$checkroles = 1;	$checkroles = 1;
$js .= " var disallow = new Array('".join("','",@disallow)."');\n".	$js .= " var disallow = new Array('".join("','",keys(%disallowed))."');\n".
" var rolecheck = 1;\n";	" var rolecheck = 1;\n";
}	}
}	}
Line 2659 END	Line 2905 END

sub required_privs {	sub required_privs {
my $privs = {	my $privs = {
'/adm/parmset' => 'opa',	'/adm/parmset' => 'opa,vpa',
'/adm/courseprefs' => 'opa',	'/adm/courseprefs' => 'opa,vpa',
'/adm/whatsnew' => 'whn',	'/adm/whatsnew' => 'whn',
'/adm/populate' => 'cst',	'/adm/populate' => 'cst,vpa,vcl',
'/adm/trackstudent' => 'vsa',	'/adm/trackstudent' => 'vsa',
'/adm/statistics' => 'vgr',	'/adm/statistics' => 'mgr,vgr',
'/adm/setblock' => 'dcm',	'/adm/setblock' => 'dcm,vcb',
'/adm/coursedocs' => 'mdc',	'/adm/coursedocs' => 'mdc',
};	};
unless ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'spreadsheet') {	unless ($env{'course.'.$env{'request.course.id'}.'.grading'} eq 'spreadsheet') {

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

Removed from v.1.369.2.57
changed lines
	Added in v.1.369.2.77