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.392 and 1.424

version 1.392, 2012/11/16 23:37:16	version 1.424, 2013/12/27 14:17:59
Line 106 secondary_menu().	Line 106 secondary_menu().

=item primary_menu()	=item primary_menu()

This routine evaluates @primary_menu and returns XHTML for the menu	This routine evaluates @primary_menu and returns a two item array,
that contains following links: About, Message, Roles, Help, Logout	with the array elements containing XHTML for the left and right sides of
	the menu that contains the following links: About, Message, Roles, Help, Logout
@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

=item secondary_menu()	=item secondary_menu()

Line 203 sub prep_menuitem {	Line 204 sub prep_menuitem {
. qq\| href="$$menuitem[0]" target="_top">$link</a></li>\|;	. qq\| href="$$menuitem[0]" target="_top">$link</a></li>\|;
}	}

# primary_menu() evaluates @primary_menu and returns XHTML for the menu	# primary_menu() evaluates @primary_menu and returns a two item array,
# that contains following links:	# with the array elements containing XHTML for the left and right sides of
# About, Message, Personal, Roles, Help, Logout	# the menu that contains the following links:
	# Personal, About, Message, Roles, Help, Logout
# @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 $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)	# (link url, icon path, alt text, link text, condition, position)
my $public;	my $public;
if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))	if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))
\|\| (($env{'user.name'} eq '') && ($env{'user.domain'} eq ''))) {	\|\| (($env{'user.name'} eq '') && ($env{'user.domain'} eq ''))) {
Line 236 sub primary_menu {	Line 238 sub primary_menu {
&& !&Apache::loncommon::show_course(); ##	&& !&Apache::loncommon::show_course(); ##

my $title = $menuitem->[3];	my $title = $menuitem->[3];
	my $position = $menuitem->[5];
	if ($position eq '') {
	$position = 'right';
	}
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 248 sub primary_menu {	Line 254 sub primary_menu {
if (ref($primary_submenu{$title}) eq 'ARRAY') {	if (ref($primary_submenu{$title}) eq 'ARRAY') {
foreach my $item (@{$primary_submenu{$title}}) {	foreach my $item (@{$primary_submenu{$title}}) {
next if (($item->[2] eq 'wishlist') && (!$env{'user.adv'}));	next if (($item->[2] eq 'wishlist') && (!$env{'user.adv'}));
next if (($item->[2] eq 'reqcrs') && (!&check_for_rcrs()));
next if ((($item->[2] eq 'portfolio') \|\|	next if ((($item->[2] eq 'portfolio') \|\|
($item->[2] eq 'blog')) &&	($item->[2] eq 'blog')) &&
(!&Apache::lonnet::usertools_access('','',$item->[2],	(!&Apache::lonnet::usertools_access('','',$item->[2],
Line 256 sub primary_menu {	Line 261 sub primary_menu {
push(@primsub,$item);	push(@primsub,$item);
}	}
if (@primsub > 0) {	if (@primsub > 0) {
$menu .= &create_submenu($link,$target,$title,\@primsub);	$menu{$position} .= &create_submenu($link,$target,$title,\@primsub,1);
} elsif ($link) {	} elsif ($link) {
$menu .= '<li><a href="'.$link.'" target="'.$target.'">'.&mt($title).'</a></li>';	$menu{$position} .= '<li><a href="'.$link.'" target="'.$target.'">'.&mt($title).'</a></li>';
}	}
}	}
} elsif ($$menuitem[3] eq 'Help') { # special treatment for helplink	} elsif ($$menuitem[3] eq 'Help') { # special treatment for helplink
Line 269 sub primary_menu {	Line 274 sub primary_menu {
'helpdeskmail',	'helpdeskmail',
$defdom,$origmail);	$defdom,$origmail);
if ($to ne '') {	if ($to ne '') {
$menu .= &prep_menuitem($menuitem);	$menu{$position} .= &prep_menuitem($menuitem);
}	}
} else {	} else {
$menu .= '<li>'.&Apache::loncommon::top_nav_help('Help').'</li>';	$menu{$position} .= '<li>'.&Apache::loncommon::top_nav_help('Help').'</li>';
}	}
} else {	} else {
$menu .= prep_menuitem($menuitem);	$menu{$position} .= prep_menuitem($menuitem);
}	}
}	}
$menu =~ s/\[domain\]/$env{'user.domain'}/g;	my @output = ('','');
$menu =~ s/\[user\]/$env{'user.name'}/g;	if ($menu{'left'} ne '') {
	$output[0] = "<ol class=\"LC_primary_menu LC_floatleft\">$menu{'left'}</ol>";
return "<ol class=\"LC_primary_menu LC_right\">$menu</ol>";	}
	if ($menu{'right'} ne '') {
	$output[1] = "<ol class=\"LC_primary_menu LC_floatright LC_right\">$menu{'right'}</ol>";
	}
	return @output;
}	}

#returns hashref {user=>'',dom=>''} containing:	#returns hashref {user=>'',dom=>''} containing:
Line 310 sub getauthor{	Line 319 sub getauthor{
}	}

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

my $crstype = &Apache::loncommon::course_type();	my $crstype = &Apache::loncommon::course_type();
Line 318 sub secondary_menu {	Line 328 sub secondary_menu {
: '');	: '');
my $canedit = &Apache::lonnet::allowed('mdc', $env{'request.course.id'});	my $canedit = &Apache::lonnet::allowed('mdc', $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') {
	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 $canviewwnew = &Apache::lonnet::allowed('whn', $crs_sec);	my $canviewwnew = &Apache::lonnet::allowed('whn', $crs_sec);
Line 326 sub secondary_menu {	Line 339 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);
	if ($env{'request.course.id'}) {
	$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
	$cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
	if ($canedit) {
	$showsyllabus = 1;
	$showfeeds = 1;
	} else {
	unless (&Apache::lonnet::is_on_map("public/$cdom/$cnum/syllabus")) {
	if (($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'}) \|\|
	($env{'course.'.$env{'request.course.id'}.'.uploadedsyllabus'}) \|\|
	($env{'course.'.$env{'request.course.id'}.'.updatedsyllabus'}) \|\|
	($env{'request.course.syllabustime'})) {
	$showsyllabus = 1;
	}
	}
	if ($env{'request.course.feeds'}) {
	$showfeeds = 1;
	}
	}
	unless ($canmgr) {
	my %slots = &Apache::lonnet::get_course_slots($cnum,$cdom);
	if (keys(%slots) > 0) {
	$showresv = 1;
	}
	}
	}

	my ($canmodifycoauthor);
	if ($env{'request.role'} eq "au./$env{'user.domain'}/") {
	my $extent = "$env{'user.domain'}/$env{'user.name'}";
	if ((&Apache::lonnet::allowed('cca',$extent)) \|\|
	(&Apache::lonnet::allowed('caa',$extent))) {
	$canmodifycoauthor = 1;
	}
	}

my %groups = &Apache::lonnet::get_active_groups(	my %groups = &Apache::lonnet::get_active_groups(
$env{'user.domain'}, $env{'user.name'},	$env{'user.domain'}, $env{'user.name'},
$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'});

	my ($roleswitcher_js,$roleswitcher_form);

foreach my $menuitem (@secondary_menu) {	foreach my $menuitem (@secondary_menu) {
# evaluate conditions	# evaluate conditions
next if ref($menuitem) ne 'ARRAY';	next if ref($menuitem) ne 'ARRAY';
next if $$menuitem[4] ne 'always'	next if $$menuitem[4] ne 'always'
&& $$menuitem[4] ne 'author'	&& ($$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] =~ /^mdc/
&& !$canedit;	&& !$canedit;
Line 349 sub secondary_menu {	Line 401 sub secondary_menu {
&& ($canmodifyuser \|\| !$canviewroster);	&& ($canmodifyuser \|\| !$canviewroster);
next if $$menuitem[4] eq 'mgr'	next if $$menuitem[4] eq 'mgr'
&& !$canmgr;	&& !$canmgr;
next if $$menuitem[4] eq 'nmgr'	next if $$menuitem[4] eq 'showresv'
&& $canmgr;	&& !$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 'opa'
Line 358 sub secondary_menu {	Line 410 sub secondary_menu {
next if $$menuitem[4] =~ /showgroups$/	next if $$menuitem[4] =~ /showgroups$/
&& !$canviewgrps	&& !$canviewgrps
&& !%groups;	&& !%groups;
	next if $$menuitem[4] eq 'showsyllabus'
	&& !$showsyllabus;
	next if $$menuitem[4] eq 'showfeeds'
	&& !$showfeeds;
next if $$menuitem[4] eq 'author'	next if $$menuitem[4] eq 'author'
&& !$author;	&& !$author;
	next if $$menuitem[4] eq 'cca'
	&& !$canmodifycoauthor;

if ($$menuitem[3] eq 'Roles' && $env{'request.course.id'}) {	if ($$menuitem[3] eq 'Roles' && $env{'request.course.id'}) {
# special treatment for role selector	# special treatment for role selector
my $roles_selector = &roles_selector(	($roleswitcher_js,$roleswitcher_form,my $switcher) =
	&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
$menu .= $roles_selector ? "<li>$roles_selector</li>"	);
: '';	$menu .= $switcher;
} else {	} else {
	if ($$menuitem[3] eq 'Syllabus' && $env{'request.course.id'}) {
	my $url = $$menuitem[0];
	$url =~ s{\[cdom\]/\[cnum\]}{$cdom/$cnum};
	if (&Apache::lonnet::is_on_map($url)) {
	unless ($$menuitem[0] =~ /\?register=1/) {
	$$menuitem[0] .= '?register=1';
	}
	} else {
	$$menuitem[0] =~ s{\?register=1}{};
	}
	}
$menu .= &prep_menuitem(\@$menuitem);	$menu .= &prep_menuitem(\@$menuitem);
}	}
}	}
Line 393 sub secondary_menu {	Line 463 sub secondary_menu {
}	}
$menu =~ s/\[uname\]/$$author{user}/g;	$menu =~ s/\[uname\]/$$author{user}/g;
$menu =~ s/\[udom\]/$$author{dom}/g;	$menu =~ s/\[udom\]/$$author{dom}/g;
	if ($showsyllabus \|\| $showfeeds) {
	$menu =~ s/\[cnum\]/$cnum/g;
	$menu =~ s/\[cdom\]/$cdom/g;
	}
if ($menu) {	if ($menu) {
$menu = "<ul id=\"LC_secondary_menu\">$menu</ul>";	$menu = "<ul id=\"LC_secondary_menu\">$menu</ul>";
}	}
	if ($roleswitcher_form) {
	$menu .= "\n$roleswitcher_js\n$roleswitcher_form";
	}
return $menu;	return $menu;
}	}

sub create_submenu {	sub create_submenu {
my ($link,$target,$title,$submenu) = @_;	my ($link,$target,$title,$submenu,$translate) = @_;
return unless (ref($submenu) eq 'ARRAY');	return unless (ref($submenu) eq 'ARRAY');
my $disptarget;	my $disptarget;
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">'.	my $menu = '<li class="LC_hoverable">'.
'<a href="'.$link.'"'.$disptarget.'>'.	'<a href="'.$link.'"'.$disptarget.'>'.
'<span class="LC_nobreak">'.&mt($title).	'<span class="LC_nobreak">'.$name.
'<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>';
Line 417 sub create_submenu {	Line 504 sub create_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];
	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;
	}
my $borderbot;	my $borderbot;
if ($count == $numsub) {	if ($count == $numsub) {
$borderbot = 'border-bottom:1px solid black;';	$borderbot = 'border-bottom:1px solid black;';
}	}
$menu .= '<li style="margin:0;padding:0;'.	$menu .= '<li style="margin:0;padding:0;'.
$borderbot.'"><a href="'.$item->[0].'">'.	$borderbot.'"><a href="'.$href.'">';
&mt($item->[1]).'</a></li>';	if ($translate) {
	$menu .= &mt($item->[1]);
	} else {
	$menu .= $item->[1];
	}
	$menu .= '</a></li>';
}	}
}	}
$menu .= '</ul></li>';	$menu .= '</ul></li>';
Line 441 sub innerregister {	Line 539 sub innerregister {

undef(@inlineremote);	undef(@inlineremote);

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

if ($env{'request.course.id'} && $env{'request.symb'} eq '') {
$resurl = $env{'request.noversionuri'};
}

if ( $env{'request.symb'} && $env{'request.course.id'} ) {

(my $mapurl, my $rid, $resurl) = &Apache::lonnet::decode_symb(&Apache::lonnet::symbread());	if ($env{'request.course.id'}) {
my $coursetitle = $env{'course.'.$env{'request.course.id'}.'.description'};	if ($env{'request.symb'}) {
	($mapurl, my $rid, $resurl) = &Apache::lonnet::decode_symb(&Apache::lonnet::symbread());
	my $coursetitle = $env{'course.'.$env{'request.course.id'}.'.description'};

my $maptitle = &Apache::lonnet::gettitle($mapurl);	my $maptitle = &Apache::lonnet::gettitle($mapurl);
my $restitle = &Apache::lonnet::gettitle(&Apache::lonnet::symbread());	my $restitle = &Apache::lonnet::gettitle(&Apache::lonnet::symbread());

#SD	#SD
#course_type only Course and Community?	#course_type only Course and Community?
#	#
my @crumbs;	my @crumbs;
unless (($forcereg) && ($env{'request.noversionuri'} eq '/adm/navmaps')	unless (($forcereg) &&
&& ($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'})) {	($env{'request.noversionuri'} eq '/adm/navmaps') &&
@crumbs = ({text => Apache::loncommon::course_type()	($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'})) {
. ' Contents',	@crumbs = ({text => Apache::loncommon::course_type()
href => "Javascript:gopost('/adm/navmaps','')"});	. ' Contents',
}	href => "Javascript:gopost('/adm/navmaps','')"});
if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) {	}
push(@crumbs, {text => '...',	if ($mapurl ne $env{'course.'.$env{'request.course.id'}.'.url'}) {
no_mt => 1});	push(@crumbs, {text => '...',
}	no_mt => 1});
	}
push @crumbs, {text => $maptitle, no_mt => 1} if ($maptitle
&& $maptitle ne 'default.sequence'	push @crumbs, {text => $maptitle, no_mt => 1} if ($maptitle
&& $maptitle ne $coursetitle);	&& $maptitle ne 'default.sequence'
	&& $maptitle ne $coursetitle);

push @crumbs, {text => $restitle, no_mt => 1} if $restitle;	push @crumbs, {text => $restitle, no_mt => 1} if $restitle;
	&Apache::lonhtmlcommon::clear_breadcrumbs();
&Apache::lonhtmlcommon::clear_breadcrumbs();	&Apache::lonhtmlcommon::add_breadcrumb(@crumbs);
&Apache::lonhtmlcommon::add_breadcrumb(@crumbs);	} else {
} elsif ($env{'request.course.id'}) {	$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'});
if ($env{'request.noversionuri'} =~ m{^\Q/uploaded$courseurl/supplemental/\E(default\|\d+)/}) {	my $crstype = &Apache::loncommon::course_type();
my $crstype = &Apache::loncommon::course_type();	my $title = &mt('View Resource');
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});	if ($resurl =~ m{^\Q/uploaded$courseurl/supplemental/\E(default\|\d+)/}) {
if ($env{'form.folderpath'}) {	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['folderpath','title']);
my ($trail) =
&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype);
return $trail;
} else {
&Apache::lonhtmlcommon::clear_breadcrumbs();	&Apache::lonhtmlcommon::clear_breadcrumbs();
&Apache::lonhtmlcommon::add_breadcrumb(	if ($env{'form.title'}) {
	$title = $env{'form.title'};
	}
	my $trail;
	if ($env{'form.folderpath'}) {
	&prepare_functions($resurl,$forcereg,$group,undef,undef,1);
	($trail) =
	&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
	} else {
	&Apache::lonhtmlcommon::add_breadcrumb(
{text => "Supplemental $crstype Content",	{text => "Supplemental $crstype Content",
href => "javascript:gopost('/adm/supplemental','')"});	href => "javascript:gopost('/adm/supplemental','')"});
if ($env{'httpref.'.$env{'request.noversionuri'}} ne '') {	$title = &mt('View Resource');
&Apache::lonhtmlcommon::add_breadcrumb({text => 'View Resource'});	($trail) =
	&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
}	}
return &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype);	return $trail;
	} elsif ($resurl =~ m{^\Q/uploaded$courseurl/portfolio/syllabus/}) {
	&Apache::lonhtmlcommon::clear_breadcrumbs();
	&prepare_functions('/public'.$courseurl."/syllabus",
	$forcereg,$group,undef,undef,1);
	$title = &mt('Syllabus File');
	my ($trail) =
	&Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1);
	return $trail;
	}
	unless ($env{'request.state'} eq 'construct') {
	&Apache::lonhtmlcommon::clear_breadcrumbs();
	&Apache::lonhtmlcommon::add_breadcrumb({text => 'View Resource'});
}	}
} else {
&Apache::lonhtmlcommon::clear_breadcrumbs();
&Apache::lonhtmlcommon::add_breadcrumb({text => 'View Resource'});
}	}
} elsif (! $const_space){	} elsif (! $const_space){
#a situation when we're looking at a resource outside of context of a	#a situation when we're looking at a resource outside of context of a
Line 520 sub innerregister {	Line 630 sub innerregister {
$editbutton = &prepare_functions($resurl,$forcereg,$group);	$editbutton = &prepare_functions($resurl,$forcereg,$group);
}	}
if ($editbutton eq '') {	if ($editbutton eq '') {
&clear(6,1);	$editbutton = &clear(6,1);
}	}

#	#
Line 564 sub innerregister {	Line 674 sub innerregister {
"gocmd('/adm/parmset','set')",	"gocmd('/adm/parmset','set')",
'Content Settings');	'Content Settings');
}	}
# End grades/submissions check	# End grades/submissions check

#	#
# 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'})) {
&switch('','',7,4,'docs-22x22.png','Folder/Page Content','parms[_2]',	my $text = 'Edit Folder';
	if (($mapurl =~ /\.page$/) \|\|
	($env{'request.symb'}=~
	m{uploaded/$cdom/$cnum/default_\d+\.page$})) {
	$text = 'Edit Page';
	}
	&switch('','',7,4,'docs-22x22.png',$text,'parms[_2]',
"gocmd('/adm/coursedocs','direct')",	"gocmd('/adm/coursedocs','direct')",
'Folder/Page Content');	'Folder/Page Content');
}	}
Line 633 ENDMENUITEMS	Line 749 ENDMENUITEMS
# wishlist is only available for users with access to resource-pool	# wishlist is only available for users with access to resource-pool
# and links can only be set for resources within the resource-pool	# and links can only be set for resources within the resource-pool
$menuitems .= (<<ENDMENUITEMS);	$menuitems .= (<<ENDMENUITEMS);
s&9&1&wishlist-link.png&Stored Links&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1	s&9&1&wishlist-link.png&Stored Links&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in my personal Stored Links repository&&1
ENDMENUITEMS	ENDMENUITEMS
$got_wishlist = 1;	$got_wishlist = 1;
}	}
Line 656 $menuitems.="Make notes and annotations	Line 772 $menuitems.="Make notes and annotations
s&6&3&catalog.png&Info&info[_1]&catalog_info()&Show Metadata	s&6&3&catalog.png&Info&info[_1]&catalog_info()&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/}) \|\|
	($env{'request.noversionuri'} =~ m{^\Q/adm/wrapper/\E(ext\|uploaded)/})) {
$menuitems.=(<<ENDREALRES);	$menuitems.=(<<ENDREALRES);
s&8&1&eval.png&Evaluate&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource	s&8&1&eval.png&Evaluate&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
ENDREALRES	ENDREALRES
}	}
$menuitems.=(<<ENDREALRES);	unless ($env{'request.noversionuri'} =~ m{^\Q/adm/wrapper/\E(ext\|uploaded)/}) {
	$menuitems.=(<<ENDREALRES);
s&8&2&fdbk.png&Communicate&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource	s&8&2&fdbk.png&Communicate&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource
ENDREALRES	ENDREALRES
	}
}	}
}	}
if ($env{'request.uri'} =~ /^\/res/) {	if ($env{'request.uri'} =~ /^\/res/) {
Line 743 ENDMENUITEMS	Line 862 ENDMENUITEMS

sub get_editbutton {	sub get_editbutton {
my ($cfile,$home,$switchserver,$forceedit,$forceview,$forcereg) = @_;	my ($cfile,$home,$switchserver,$forceedit,$forceview,$forcereg) = @_;
my $jscall =	my $jscall;
&Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver,	if (($forceview) && ($env{'form.todocs'})) {
$forceedit,$forcereg,$env{'request.symb'});	my ($folderpath,$command);
	if ($env{'request.symb'}) {
	$folderpath = &Apache::loncommon::symb_to_docspath($env{'request.symb'});
	} elsif ($env{'form.folderpath'} =~ /^supplemental/) {
	$folderpath = $env{'form.folderpath'};
	$command = '&forcesupplement=1';
	}
	$folderpath = &escape(&HTML::Entities::encode(&escape($folderpath),'<>&"'));
	$jscall = "go('/adm/coursedocs?folderpath=$folderpath$command')";
	} else {
	$jscall = &Apache::lonhtmlcommon::jump_to_editres($cfile,$home,$switchserver,
	$forceedit,$forcereg,$env{'request.symb'},
	&escape($env{'form.folderpath'}),
	&escape($env{'form.title'}),$env{'form.idx'},
	&escape($env{'form.suppurl'},$env{'form.todocs'}));
	}
if ($jscall) {	if ($jscall) {
my $icon = 'pcstr.png';	my $icon = 'pcstr.png';
my $label = 'Edit';	my $label = 'Edit';
Line 761 sub get_editbutton {	Line 895 sub get_editbutton {
}	}

sub prepare_functions {	sub prepare_functions {
my ($resurl,$forcereg,$group,$bread_crumbs,$advtools) = @_;	my ($resurl,$forcereg,$group,$bread_crumbs,$advtools,$docscrumbs) = @_;
unless ($env{'request.registered'}) {	unless ($env{'request.registered'}) {
undef(@inlineremote);	undef(@inlineremote);
}	}
Line 806 sub prepare_functions {	Line 940 sub prepare_functions {
#	#
# This applies in course context	# This applies in course context
#	#
if (($resurl eq "/public/$cdom/$cnum/syllabus") && ($perms{'mdc'})) {	if (($perms{'mdc'}) &&
if ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ /\w/) {	(($resurl eq "/public/$cdom/$cnum/syllabus") \|\|
&switch('','',6,1,'pcstr.png','Edit',	($resurl =~ m{^/uploaded/$cdom/$cnum/portfolio/syllabus/}))) {
'resource[_2]',	$cfile = $resurl;
"go('/adm/courseprefs?phase=display&actions=courseinfo')",	$home = &Apache::lonnet::homeserver($cnum,$cdom);
'Edit this resource');	if ($env{'form.forceedit'}) {
$editbutton = 1;	$forceview = 1;
} else {	} else {
$cfile = $resurl;	$forceedit = 1;
$home = &Apache::lonnet::homeserver($cnum,$cdom);	}
if ($env{'form.forceedit'}) {	$editbutton = &get_editbutton($cfile,$home,$switchserver,
$forceview = 1;	$forceedit,$forceview,$forcereg);
} else {	} elsif (($resurl eq '/adm/extresedit') &&
$forceedit = 1;	(($env{'form.symb'}) \|\| ($env{'form.folderpath'}))) {
}	($cfile,$home,$switchserver,$forceedit,$forceview) =
	&Apache::lonnet::can_edit_resource($resurl,$cnum,$cdom,$resurl,
	$env{'form.symb'});
	if ($cfile ne '') {
$editbutton = &get_editbutton($cfile,$home,$switchserver,	$editbutton = &get_editbutton($cfile,$home,$switchserver,
$forceedit,$forceview,$forcereg);	$forceedit,$forceview,$forcereg,
	$env{'form.title'},$env{'form.suppurl'});
}	}
} elsif ($resurl !~ m{^adm/($match_domain)/($match_username)/aboutme$}) {	} elsif (($resurl =~ m{^/?adm/viewclasslist$}) &&
	(&Apache::lonnet::allowed('opa',$env{'request.course.id'}))) {
	($cfile,$home,$switchserver,$forceedit,$forceview) =
	&Apache::lonnet::can_edit_resource($resurl,$cnum,$cdom,$resurl,
	$env{'form.symb'});
	$editbutton = &get_editbutton($cfile,$home,$switchserver,
	$forceedit,$forceview,$forcereg);
	} elsif (($resurl !~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) &&
	($resurl ne '/cgi-bin/printout.pl')) {
if ($env{'request.filename'}) {	if ($env{'request.filename'}) {
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) =
Line 839 sub prepare_functions {	Line 985 sub prepare_functions {
}	}
# End determination of 'Edit' icon/button display	# End determination of 'Edit' icon/button display

# This applies to about me page for users in a course
if ($env{'request.course.id'}) {	if ($env{'request.course.id'}) {
	# This applies to about me page for users in a course
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',	&switch('','',6,4,'mail-message-new-22x22.png','Message to user',
'',	'',
"go('/adm/email?compose=individual&recname=$sname&recdom=$sdom')",	"go('/adm/email?compose=individual&recname=$sname&recdom=$sdom')",
'Send message to specific user');	'Send message to specific user');
}	}
my $hideprivileged = 1;	my $hideprivileged = 1;
Line 868 sub prepare_functions {	Line 1014 sub prepare_functions {
if ($perms{'vgr'}) {	if ($perms{'vgr'}) {
&switch('','',6,6,'rsrv-22x22.png','Reservations',	&switch('','',6,6,'rsrv-22x22.png','Reservations',
'',	'',
"go('/adm/slotrequest?command=showresv&origin=aboutme&uname=$sname&udom=$sdom')",	"go('/adm/slotrequest?command=showresv&origin=aboutme&uname=$sname&udom=$sdom')",
'Slot reservation history');	'Slot reservation history');
}	}
if ($perms{'srm'}) {	if ($perms{'srm'}) {
&switch('','',6,7,'contact-new-22x22.png','Records',	&switch('','',6,7,'contact-new-22x22.png','Records',
'',	'',
"go('/adm/email?recordftf=retrieve&recname=$sname&recdom=$sdom')",	"go('/adm/email?recordftf=retrieve&recname=$sname&recdom=$sdom')",
'Add records');	'Add records');
}	}
}	}
}	}
	if (($env{'form.folderpath'} =~ /^supplemental/) &&
	(&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) &&
	(($resurl =~ m{^/adm/wrapper/ext/}) \|\|
	($resurl =~ m{^/uploaded/$cdom/$cnum/supplemental/}) \|\|
	($resurl eq '/adm/supplemental') \|\|
	($resurl =~ m{^/public/$cdom/$cnum/syllabus$}) \|\|
	($resurl =~ m{^/adm/$match_domain/$match_username/aboutme$}))) {
	my @folders=split('&',$env{'form.folderpath'});
	if ((@folders > 2) \|\| ($resurl ne '/adm/supplemental')) {
	my $esc_path=&escape(&HTML::Entities::encode(&escape($env{'form.folderpath'}),'<>&"'));
	&switch('','',7,4,'docs-22x22.png','Edit Folder','parms[_2]',
	"location.href='/adm/coursedocs?command=direct&forcesupplement=1&supppath=$esc_path'",
	'Folder/Page Content');
	}
	}
}	}

# End checking for items for about me page for users in a course	# End checking for items for about me page for users in a course
	if ($docscrumbs) {
if ($env{'request.registered'}) {	&Apache::lonhtmlcommon::clear_breadcrumb_tools();
	&advtools_crumbs(@inlineremote);
	return $editbutton;
	} elsif ($env{'request.registered'}) {
return $editbutton;	return $editbutton;
} else {	} else {
if (ref($bread_crumbs) eq 'ARRAY') {	if (ref($bread_crumbs) eq 'ARRAY') {
Line 911 sub advtools_crumbs {	Line 1075 sub advtools_crumbs {
} elsif ($env{'request.noversionuri'} !~ m{^/adm/(navmaps\|viewclasslist)(\?\|$)}) {	} elsif ($env{'request.noversionuri'} !~ m{^/adm/(navmaps\|viewclasslist)(\?\|$)}) {
&Apache::lonhtmlcommon::add_breadcrumb_tool(	&Apache::lonhtmlcommon::add_breadcrumb_tool(
'advtools', @funcs[61,71,72,73,74,92]);	'advtools', @funcs[61,71,72,73,74,92]);
}	} elsif ($env{'request.noversionuri'} eq '/adm/viewclasslist') {
	&Apache::lonhtmlcommon::add_breadcrumb_tool(
	'advtools', $funcs[61]);
	}
	return;
}	}

# ================================================================== Raw Config	# ================================================================== Raw Config
Line 1219 sub rawconfig {	Line 1387 sub rawconfig {

sub check_for_rcrs {	sub check_for_rcrs {
my $showreqcrs = 0;	my $showreqcrs = 0;
my @reqtypes = ('official','unofficial','community');	my @reqtypes = ('official','unofficial','community','textbook');
foreach my $type (@reqtypes) {	foreach my $type (@reqtypes) {
if (&Apache::lonnet::usertools_access($env{'user.name'},	if (&Apache::lonnet::usertools_access($env{'user.name'},
$env{'user.domain'},	$env{'user.domain'},
Line 1286 END	Line 1454 END
}	}

sub utilityfunctions {	sub utilityfunctions {
	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/}	if ($currenturl =~ m{^/adm/wrapper/ext/}
&& $env{'request.external.querystring'} ) {	&& $env{'request.external.querystring'} ) {
Line 1321 sub utilityfunctions {	Line 1490 sub utilityfunctions {
my $countdown = &countdown_toggle_js();	my $countdown = &countdown_toggle_js();

return (<<ENDUTILITY)	return (<<ENDUTILITY)
	var host="$httphost";
var currentURL=unescape("$esc_url");	var currentURL=unescape("$esc_url");
var reloadURL=unescape("$esc_url");	var reloadURL=unescape("$esc_url");
var currentSymb=unescape("$esc_symb");	var currentSymb=unescape("$esc_symb");
Line 1332 $jumptores	Line 1501 $jumptores

function gopost(url,postdata) {	function gopost(url,postdata) {
if (url!='') {	if (url!='') {
this.document.server.action=url;	this.document.server.action=host+url;
this.document.server.postdata.value=postdata;	this.document.server.postdata.value=postdata;
this.document.server.command.value='';	this.document.server.command.value='';
this.document.server.url.value='';	this.document.server.url.value='';
Line 1343 function gopost(url,postdata) {	Line 1512 function gopost(url,postdata) {

function gocmd(url,cmd) {	function gocmd(url,cmd) {
if (url!='') {	if (url!='') {
this.document.server.action=url;	this.document.server.action=host+url;
this.document.server.postdata.value='';	this.document.server.postdata.value='';
this.document.server.command.value=cmd;	this.document.server.command.value=cmd;
this.document.server.url.value=currentURL;	this.document.server.url.value=currentURL;
Line 1395 function golist(url) {	Line 1564 function golist(url) {
if (url!='' && url!= null) {	if (url!='' && url!= null) {
currentURL = null;	currentURL = null;
currentSymb= null;	currentSymb= null;
top.location.href=url;	top.location.href=host+url;
}	}
}	}

Line 1406 function catalog_info() {	Line 1575 function catalog_info() {
}	}

function chat_win() {	function chat_win() {
lonchat=window.open('/res/adm/pages/chatroom.html',"LONchat",'height=320,width=480,resizable=yes,location=no,menubar=no,toolbar=no');	lonchat=window.open(host+'/res/adm/pages/chatroom.html',"LONchat",'height=320,width=480,resizable=yes,location=no,menubar=no,toolbar=no');
}	}

function group_chat(group) {	function group_chat(group) {
var url = '/adm/groupchat?group='+group;	var url = host+'/adm/groupchat?group='+group;
var winName = 'LONchat_'+group;	var winName = 'LONchat_'+group;
grpchat=window.open(url,winName,'height=320,width=280,resizable=yes,location=no,menubar=no,toolbar=no');	grpchat=window.open(url,winName,'height=320,width=280,resizable=yes,location=no,menubar=no,toolbar=no');
}	}
Line 1431 function annotate() {	Line 1600 function annotate() {
function open_StoredLinks_Import(rat) {	function open_StoredLinks_Import(rat) {
var newWin;	var newWin;
if (rat) {	if (rat) {
newWin = window.open('/adm/wishlist?inhibitmenu=yes&mode=import&rat='+rat,	newWin = window.open(host+'/adm/wishlist?inhibitmenu=yes&mode=import&rat='+rat,
'wishlistImport','scrollbars=1,resizable=1,menubar=0');	'wishlistImport','scrollbars=1,resizable=1,menubar=0');
}	}
else {	else {
newWin = window.open('/adm/wishlist?inhibitmenu=yes&mode=import',	newWin = window.open(host+'/adm/wishlist?inhibitmenu=yes&mode=import',
'wishlistImport','scrollbars=1,resizable=1,menubar=0');	'wishlistImport','scrollbars=1,resizable=1,menubar=0');
}	}
newWin.focus();	newWin.focus();
Line 1500 sub hidden_button_check {	Line 1669 sub hidden_button_check {
}	}

sub roles_selector {	sub roles_selector {
my ($cdom,$cnum) = @_;	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);
my $is_cc;	my $is_cc;
my $role_selector;	my ($js,$form,$switcher,$switchtext);
my $ccrole;	my $ccrole;
if ($crstype eq 'Community') {	if ($crstype eq 'Community') {
$ccrole = 'co';	$ccrole = 'co';
Line 1593 sub roles_selector {	Line 1762 sub roles_selector {
}	}
}	}
}	}
my $switchtext;	$switchtext = 'Switch role'; # do not translate here
if ($crstype eq 'Community') {
$switchtext = &mt('Switch community role to...')
} else {
$switchtext = &mt('Switch course role to...')
}
my @roles_order = ($ccrole,'in','ta','ep','ad','st');	my @roles_order = ($ccrole,'in','ta','ep','ad','st');
if (keys(%courseroles) > 1) {	my $numdiffsec;
$role_selector = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,$priv);	if (keys(%seccount) == 1) {
$role_selector .= '<form name="rolechooser" method="post" action="/adm/roles">	foreach my $key (keys(%seccount)) {
<select name="switchrole" onchange="javascript:adhocRole('."'switchrole'".')">';	$numdiffsec = $seccount{$key};
$role_selector .= '<option value="">'.$switchtext.'</option>';	}
	}
	if ((keys(%seccount) > 1) \|\| ($numdiffsec > 1)) {
	my @submenu;
	$js = &jump_to_role($cdom,$cnum,\%seccount,\%courseroles,\%courseprivs,$priv);
	$form =
	'<form name="rolechooser" method="post" action="'.$httphost.'/adm/roles">'."\n".
	' <input type="hidden" name="destinationurl" value="'.
	&HTML::Entities::encode($destinationurl).'" />'."\n".
	' <input type="hidden" name="gotorole" value="1" />'."\n".
	' <input type="hidden" name="selectrole" value="" />'."\n".
	' <input type="hidden" name="switchrole" value="" />'."\n";
	if ($destsymb ne '') {
	$form .= ' <input type="hidden" name="destsymb" value="'.
	&HTML::Entities::encode($destsymb).'" />'."\n";
	}
	$form .= '</form>'."\n";
foreach my $role (@roles_order) {	foreach my $role (@roles_order) {
	my $include;
if (defined($courseroles{$role})) {	if (defined($courseroles{$role})) {
$role_selector .= "\n".'<option value="'.$role.'">'.&Apache::lonnet::plaintext($role,$crstype).'</option>';	if ($env{'request.role'} =~ m{^\Q$role\E}) {
	if ($seccount{$role} > 1) {
	$include = 1;
	}
	} else {
	$include = 1;
	}
	}
	if ($include) {
	push(@submenu,['javascript:adhocRole('."'$role'".')',
	&Apache::lonnet::plaintext($role,$crstype)]);
}	}
}	}
foreach my $role (sort(keys(%courseroles))) {	foreach my $role (sort(keys(%courseroles))) {
if ($role =~ /^cr/) {	if ($role =~ /^cr/) {
$role_selector .= "\n".'<option value="'.$role.'">'.&Apache::lonnet::plaintext($role).'</option>';	my $include;
	if ($env{'request.role'} =~ m{^\Q$role\E}) {
	if ($seccount{$role} > 1) {
	$include = 1;
	}
	} else {
	$include = 1;
	}
	if ($include) {
	push(@submenu,['javascript:adhocRole('."'$role'".')',
	&Apache::lonnet::plaintext($role)]);
	}
}	}
}	}
$role_selector .= '</select>'."\n";	if (@submenu > 0) {
if ($destsymb ne '') {	$switcher = &create_submenu('','',$switchtext,\@submenu);
$role_selector .= '<input type="hidden" name="destsymb" value="'.
&HTML::Entities::encode($destsymb).'" />'."\n";
}	}
$role_selector .=
'<input type="hidden" name="destinationurl" value="'.
&HTML::Entities::encode($destinationurl).'" />'."\n".
'<input type="hidden" name="gotorole" value="1" />'."\n".
'<input type="hidden" name="selectrole" value="" />'."\n".
'<input type="hidden" name="switch" value="1" />'."\n".
'</form>';
}	}
return $role_selector;	return ($js,$form,$switcher);
}	}

sub get_all_courseroles {	sub get_all_courseroles {
Line 1691 sub get_all_courseroles {	Line 1884 sub get_all_courseroles {
push(@{$courseroles->{'st'}},keys(%sections_count));	push(@{$courseroles->{'st'}},keys(%sections_count));
$seccount->{'st'} = scalar(keys(%sections_count));	$seccount->{'st'} = scalar(keys(%sections_count));
}	}
	$seccount->{'st'} ++; # Increment for a section-less student role.
my $rolehash = {	my $rolehash = {
'roles' => $courseroles,	'roles' => $courseroles,
'seccount' => $seccount,	'seccount' => $seccount,
Line 1767 sub jump_to_role {	Line 1961 sub jump_to_role {
return <<"END";	return <<"END";
<script type="text/javascript">	<script type="text/javascript">
//<![CDATA[	//<![CDATA[
function adhocRole(roleitem) {	function adhocRole(newrole) {
$js	$js
var newrole = document.rolechooser.elements[roleitem].options[document.rolechooser.elements[roleitem].selectedIndex].value;
if (newrole == '') {	if (newrole == '') {
return;	return;
}	}
Line 1786 function adhocRole(roleitem) {	Line 1979 function adhocRole(roleitem) {
if (confirm("$lt{'role'}\\n$lt{'swit'}")) {	if (confirm("$lt{'role'}\\n$lt{'swit'}")) {
document.rolechooser.destinationurl.value = '/adm/menu';	document.rolechooser.destinationurl.value = '/adm/menu';
} else {	} else {
document.rolechooser.elements[roleitem].selectedIndex = 0;
return;	return;
}	}
}	}
Line 1822 function adhocRole(roleitem) {	Line 2014 function adhocRole(roleitem) {
fullrole += '/'+secchoice;	fullrole += '/'+secchoice;
}	}
} else {	} else {
document.rolechooser.elements[roleitem].selectedIndex = 0;
if (secchoice != null) {	if (secchoice != null) {
alert("$lt{'youe'} \\""+secchoice+"\\".\\n $lt{'plst'}");	alert("$lt{'youe'} \\""+secchoice+"\\".\\n $lt{'plst'}");
}	}
return;	return;
}	}
if (fullrole == "$env{'request.role'}") {	if (fullrole == "$env{'request.role'}") {
document.rolechooser.elements[roleitem].selectedIndex = 0;
return;	return;
}	}
itemid = retrieveIndex('gotorole');	itemid = retrieveIndex('gotorole');
if (itemid != -1) {	if (itemid != -1) {
document.rolechooser.elements[itemid].name = fullrole;	document.rolechooser.elements[itemid].name = fullrole;
}	}
document.rolechooser.elements[roleitem].options[document.rolechooser.elements[roleitem].selectedIndex].value = fullrole;	document.rolechooser.switchrole.value = fullrole;
document.rolechooser.selectrole.value = '1';	document.rolechooser.selectrole.value = '1';
document.rolechooser.submit();	document.rolechooser.submit();
return;	return;
Line 1899 sub countdown_timer {	Line 2089 sub countdown_timer {
}	}
my $duedate = &Apache::lonnet::EXT("resource.0.duedate");	my $duedate = &Apache::lonnet::EXT("resource.0.duedate");
my @interval=&Apache::lonnet::EXT("resource.0.interval");	my @interval=&Apache::lonnet::EXT("resource.0.interval");
my $hastimeleft;
if (@interval > 1) {	if (@interval > 1) {
my $first_access=&Apache::lonnet::get_first_access($interval[1]);	my $first_access=&Apache::lonnet::get_first_access($interval[1]);
if ($first_access > 0) {	if ($first_access > 0) {
Line 1957 BEGIN {	Line 2146 BEGIN {
$category_positions{$entries[2]}=$entries[1];	$category_positions{$entries[2]}=$entries[1];
$category_names{$entries[2]}=$entries[3];	$category_names{$entries[2]}=$entries[3];
} elsif ($configline=~/^prim\:/) {	} elsif ($configline=~/^prim\:/) {
my @entries = (split(/\:/, $configline))[1..5];	my @entries = (split(/\:/, $configline))[1..6];
push @primary_menu, \@entries;	push(@primary_menu,\@entries);
} elsif ($configline=~/^primsub\:/) {	} elsif ($configline=~/^primsub\:/) {
my ($parent,@entries) = (split(/\:/, $configline))[1..4];	my ($parent,@entries) = (split(/\:/, $configline))[1..4];
push (@{$primary_submenu{$parent}},\@entries);	push(@{$primary_submenu{$parent}},\@entries);
} elsif ($configline=~/^scnd\:/) {	} elsif ($configline=~/^scnd\:/) {
my @entries = (split(/\:/, $configline))[1..5];	my @entries = (split(/\:/, $configline))[1..5];
push @secondary_menu, \@entries;	push(@secondary_menu,\@entries);
} elsif ($configline) {	} elsif ($configline) {
push(@desklines,$configline);	push(@desklines,$configline);
}	}

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

Removed from v.1.392
changed lines
	Added in v.1.424