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.461 and 1.484

version 1.461, 2016/11/09 14:23:36	version 1.484, 2017/12/18 23:20:48
Line 214 use HTML::Entities();	Line 214 use HTML::Entities();
use Apache::lonwishlist();	use Apache::lonwishlist();

use vars qw(@desklines %category_names %category_members %category_positions	use vars qw(@desklines %category_names %category_members %category_positions
$readdesk @primary_menu %primary_submenu @secondary_menu);	$readdesk @primary_menu %primary_submenu @secondary_menu %secondary_submenu);

my @inlineremote;	my @inlineremote;

Line 381 sub secondary_menu {	Line 381 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);
Line 400 sub secondary_menu {	Line 401 sub secondary_menu {
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'};
if ($canedit) {	unless ($canedit \|\| $canvieweditor) {
$showsyllabus = 1;
$showfeeds = 1;
} else {
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 416 sub secondary_menu {	Line 414 sub secondary_menu {
$showfeeds = 1;	$showfeeds = 1;
}	}
}	}
unless (($canmgr \|\| $canvgr)) {	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;
Line 452 sub secondary_menu {	Line 450 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 'nvgr'	next if $$menuitem[4] eq 'nvgr'
&& $canvgr;	&& $canvgr;
next if $$menuitem[4] eq 'vgr'	next if $$menuitem[4] eq 'vgr'
Line 470 sub secondary_menu {	Line 468 sub secondary_menu {
&& !$canviewwnew;	&& !$canviewwnew;
next if $$menuitem[4] eq 'params'	next if $$menuitem[4] eq 'params'
&& (!$canmodpara && !$canviewpara);	&& (!$canmodpara && !$canviewpara);
next if $$menuitem[4] =~ /showgroups$/	next if $$menuitem[4] eq 'showgroups'
&& !$canviewgrps	&& ($canviewgrps \|\| !$grouptools);
&& !$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 482 sub secondary_menu {	Line 479 sub secondary_menu {
next if $$menuitem[4] eq 'cca'	next if $$menuitem[4] eq 'cca'
&& !$canmodifycoauthor;	&& !$canmodifycoauthor;

if ($$menuitem[3] eq 'Roles' && $env{'request.course.id'}) {	my $title = $menuitem->[3];
	if (defined($secondary_submenu{$title})) {
	my ($link,$target);
	if ($menuitem->[0] ne '') {
	$link = $menuitem->[0];
	$target = '_top';
	} else {
	$link = '#';
	}
	my @scndsub;
	if (ref($secondary_submenu{$title}) eq 'ARRAY') {
	foreach my $item (@{$secondary_submenu{$title}}) {
	if (ref($item) eq 'ARRAY') {
	next if ($item->[2] eq 'vgr' && !$canvgr);
	next if ($item->[2] eq 'opa' && !$canmodpara);
	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 'vcg' && !$canviewgrps);
	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);
	}
	}
	if (@scndsub > 0) {
	$menu .= &create_submenu($link,$target,$title,\@scndsub,1);
	} elsif ($link ne '#') {
	$menu .= '<li><a href="'.$link.'" target="'.$target.'">'.&mt($title).'</a></li>';
	}
	}
	} elsif ($$menuitem[3] eq 'Roles' && $env{'request.course.id'}) {
# special treatment for role selector	# special treatment for role selector
($roleswitcher_js,$roleswitcher_form,my $switcher) =	($roleswitcher_js,$roleswitcher_form,my $switcher) =
&roles_selector(	&roles_selector(
Line 496 sub secondary_menu {	Line 525 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 ($$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 520 sub secondary_menu {	Line 560 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;
}	}
$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) {	if ($env{'request.course.id'}) {
$menu =~ s/\[cnum\]/$cnum/g;	$menu =~ s/\[cnum\]/$cnum/g;
$menu =~ s/\[cdom\]/$cdom/g;	$menu =~ s/\[cdom\]/$cdom/g;
}	}
Line 624 sub build_submenu {	Line 664 sub build_submenu {
}	}

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 634 sub innerregister {	Line 674 sub innerregister {

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

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

if ($env{'request.course.id'}) {	if ($env{'request.course.id'}) {
#	#
Line 642 sub innerregister {	Line 682 sub innerregister {
#	#
$crstype = &Apache::loncommon::course_type();	$crstype = &Apache::loncommon::course_type();
if ($env{'request.symb'}) {	if ($env{'request.symb'}) {
($mapurl, my $rid, $resurl) = &Apache::lonnet::decode_symb(&Apache::lonnet::symbread());	my $ignorenull;
	unless ($env{'request.noversionuri'} eq '/adm/navmaps') {
	$ignorenull = 1;
	}
	my $symb = &Apache::lonnet::symbread('','',$ignorenull);
	($mapurl, my $rid, $resurl) = &Apache::lonnet::decode_symb($symb);
my $coursetitle = $env{'course.'.$env{'request.course.id'}.'.description'};	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($symb);
my @crumbs;	my (@crumbs,@mapcrumbs);
	if (($env{'request.noversionuri'} ne '/adm/navmaps') && ($mapurl ne '') &&
	(!(($crstype eq 'Placement') && !$env{'request.role.adv'}))) {
	$navmap = Apache::lonnavmaps::navmap->new();
	if (ref($navmap)) {
	@mapcrumbs = $navmap->recursed_crumbs($mapurl,$restitle);
	}
	}
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'}) \|\|
Line 656 sub innerregister {	Line 708 sub innerregister {
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'}) {
push(@crumbs, {text => '...',	if (@mapcrumbs) {
no_mt => 1});	push(@crumbs,@mapcrumbs);
	} elsif (!(($crstype eq 'Placement') && (!$env{'request.role.adv'}))) {
	push(@crumbs, {text => '...',
	no_mt => 1});
	}
}	}

unless (($crstype eq 'Placement') \|\| (!$env{'request.role.adv'})) {	unless ((($crstype eq 'Placement') && (!$env{'request.role.adv'})) \|\| (@mapcrumbs) \|\|
push @crumbs, {text => $maptitle, no_mt => 1} if ($maptitle	(!$maptitle) \|\| ($maptitle eq 'default.sequence') \|\|
&& $maptitle ne 'default.sequence'	($mapurl eq $env{'course.'.$env{'request.course.id'}.'.url'})) {
&& $maptitle ne $coursetitle);	push @crumbs, {text => $maptitle, no_mt => 1, href => $mapurl};
	}
	if ($restitle && !@mapcrumbs) {
	push(@crumbs,{text => $restitle, no_mt => 1});
}	}

push @crumbs, {text => $restitle, no_mt => 1} if $restitle;
my @tools;	my @tools;
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();
Line 691 sub innerregister {	Line 748 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 763 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 733 sub innerregister {	Line 790 sub innerregister {
$forceview,$editbutton);	$forceview,$editbutton);
if (($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) \|\|	if (($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) \|\|
($env{'request.role'} !~/^(aa\|ca\|au)/)) {	($env{'request.role'} !~/^(aa\|ca\|au)/)) {
$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 746 sub innerregister {	Line 803 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;
	my $gradable_exttool;
if ($env{'request.symb'} ne '') {	if ($env{'request.symb'} ne '') {
if ($env{'request.filename'}=~/$LONCAPA::assess_re/) {	if ($env{'request.noversionuri'} =~ m{^/adm/$cdom/$cnum/(\d+)/ext\.tool$}) {
	if (&Apache::lonnet::EXT('resource.0.gradable') =~ /^yes$/i) {
	$gradable_exttool = 1;
	push(@privs,('mgr','vgr'));
	}
	} elsif ($env{'request.filename'}=~/$LONCAPA::assess_re/) {
push(@privs,('mgr','vgr'));	push(@privs,('mgr','vgr'));
}	}
push(@privs,('opa','vpa'));	push(@privs,('opa','vpa'));
Line 763 sub innerregister {	Line 827 sub innerregister {
#	#
# Determine whether or not to show Grades and Submissions buttons	# Determine whether or not to show Grades and Submissions buttons
#	#
if ($env{'request.symb'} ne '' &&	if (($env{'request.symb'} ne '') &&
$env{'request.filename'}=~/$LONCAPA::assess_re/) {	(($env{'request.filename'}=~/$LONCAPA::assess_re/) \|\| ($gradable_exttool))) {
if ($perms{'mgr'}) {	if ($perms{'mgr'}) {
&switch('','',7,2,'pgrd.png','Content Grades','grades[_4]',	&switch('','',7,2,'pgrd.png','Content Grades','grades[_4]',
"gocmd('/adm/grades','gradingmenu')",	"gocmd('/adm/grades','gradingmenu')",
Line 785 sub innerregister {	Line 849 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 906 if ($env{'browser.mobile'}) {	Line 970 if ($env{'browser.mobile'}) {
$is_mobile = 1;	$is_mobile = 1;
}	}

unless ($env{'request.noversionuri'}=~/\/(bulletinboard\|smppg\|navmaps\|syllabus\|aboutme\|viewclasslist\|portfolio\|exttools?)(\?\|$)/) {	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/}) && ($env{'request.noversionuri'} !~ m{^/adm/.+/ext\.tool$})) {
$menuitems.=(<<ENDREALRES);	$menuitems.=(<<ENDREALRES);
s&6&3&catalog.png&Info&info[_1]&catalog_info('$is_mobile')&Show Metadata	s&6&3&catalog.png&Info&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/}) \|\|
($env{'request.noversionuri'} =~ m{^\Q/adm/wrapper/\E(ext\|uploaded)/})) {	($env{'request.noversionuri'} =~ m{^\Q/adm/wrapper/\E(ext\|uploaded)/}) \|\|
	($env{'request.noversionuri'} =~ m{^/adm/.+/ext\.tool$})) {
$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
Line 1031 ENDMENUITEMS	Line 1096 ENDMENUITEMS
}	}

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 1051 sub get_editbutton {	Line 1116 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 1070 sub get_editbutton {	Line 1135 sub get_editbutton {
}	}

sub prepare_functions {	sub prepare_functions {
my ($resurl,$forcereg,$group,$bread_crumbs,$advtools,$docscrumbs) = @_;	my ($resurl,$forcereg,$group,$bread_crumbs,$advtools,$docscrumbs,$hostname) = @_;
unless ($env{'request.registered'}) {	unless ($env{'request.registered'}) {
undef(@inlineremote);	undef(@inlineremote);
}	}
Line 1084 sub prepare_functions {	Line 1149 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 1116 sub prepare_functions {	Line 1182 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;	(($resurl =~ m{^/?uploaded/$cdom/$cnum/default_\d+\.sequence$}) && ($env{'form.navmap'})))) {
	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;
} else {	} else {
$forceedit = 1;	$forceedit = 1;
}	}
$editbutton = &get_editbutton($cfile,$home,$switchserver,	if ($cfile =~ m{^/uploaded/$cdom/$cnum/default_\d+\.sequence$}) {
$forceedit,$forceview,$forcereg);	my $text = 'Edit Folder';
	&switch('','',7,4,'docs-22x22.png','Edit Folder','parms[_2]',
	"gocmd('/adm/coursedocs','direct')",
	'Folder/Page Content');
	$editbutton = 1;
	} else {
	$editbutton = &get_editbutton($cfile,$home,$switchserver,
	$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 1134 sub prepare_functions {	Line 1214 sub prepare_functions {
$env{'form.symb'});	$env{'form.symb'});
if ($cfile ne '') {	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/viewclasslist$}) &&	} elsif (($resurl =~ m{^/?adm/viewclasslist$}) &&
(&Apache::lonnet::allowed('opa',$env{'request.course.id'}))) {	(&Apache::lonnet::allowed('opa',$env{'request.course.id'}))) {
Line 1153 sub prepare_functions {	Line 1232 sub prepare_functions {
&Apache::lonnet::clutter($resurl),$env{'request.symb'},$group);	&Apache::lonnet::clutter($resurl),$env{'request.symb'},$group);
if ($cfile ne '') {	if ($cfile ne '') {
$editbutton = &get_editbutton($cfile,$home,$switchserver,	$editbutton = &get_editbutton($cfile,$home,$switchserver,
$forceedit,$forceview,$forcereg);	$forceedit,$forceview,$forcereg,
	$hostname);
	}
	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 1203 sub prepare_functions {	Line 1306 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+/exttools?$}) \|\|	($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 1215 sub prepare_functions {	Line 1318 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');
}	}
}	}
}	}
Line 1228 sub prepare_functions {	Line 1335 sub prepare_functions {
&advtools_crumbs(@inlineremote);	&advtools_crumbs(@inlineremote);
return $editbutton;	return $editbutton;
} elsif ($env{'request.registered'}) {	} elsif ($env{'request.registered'}) {
return $editbutton;	return $editbutton \|\| $viewsrcbutton;
} else {	} else {
if (ref($bread_crumbs) eq 'ARRAY') {	if (ref($bread_crumbs) eq 'ARRAY') {
if (@inlineremote > 0) {	if (@inlineremote > 0) {
Line 2035 function open_StoredLinks_Import(rat) {	Line 2142 function open_StoredLinks_Import(rat) {
newWin.focus();	newWin.focus();
}	}

	function open_source() {
	var url = escape(window.location.pathname);
	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');
	}

(function (\$) {	(function (\$) {
\$(document).ready(function () {	\$(document).ready(function () {
\$.single=function(a){return function(b){a[0]=b;return a}}(\$([1]));	\$.single=function(a){return function(b){a[0]=b;return a}}(\$([1]));
Line 2097 sub roles_selector {	Line 2210 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);	my ($js,$form,$switcher);
my $ccrole;	my $ccrole;
Line 2108 sub roles_selector {	Line 2221 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;
}	}
}	}
Line 2147 sub roles_selector {	Line 2260 sub roles_selector {
if ($is_cc) {	if ($is_cc) {
&get_all_courseroles($cdom,$cnum,\%courseroles,\%seccount,\%courseprivs);	&get_all_courseroles($cdom,$cnum,\%courseroles,\%seccount,\%courseprivs);
} elsif ($env{'request.role'} =~ m{^\Qcr/$cdom/$cdom-domainconfig/\E(\w+)\.\Q/$cdom/$cnum\E}) {	} elsif ($env{'request.role'} =~ m{^\Qcr/$cdom/$cdom-domainconfig/\E(\w+)\.\Q/$cdom/$cnum\E}) {
&get_customadhoc_roles($cdom,$cnum,\%courseroles,\%seccount,\%courseprivs,$privref);	&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 2201 sub roles_selector {	Line 2314 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,$privref);	$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 2243 sub roles_selector {	Line 2356 sub roles_selector {
if ($include) {	if ($include) {
my $rolename;	my $rolename;
if ($role =~ m{^cr/$cdom/$cdom\-domainconfig/(\w+)(?:/\w+\|$)}) {	if ($role =~ m{^cr/$cdom/$cdom\-domainconfig/(\w+)(?:/\w+\|$)}) {
$rolename = &mt('Helpdesk [_1]',$1);	$rolename = $roledesc{$role};
	if ($rolename eq '') {
	$rolename = &mt('Helpdesk [_1]',$1);
	}
} else {	} else {
$rolename = &Apache::lonnet::plaintext($role);	$rolename = &Apache::lonnet::plaintext($role);
}	}
Line 2330 sub get_all_courseroles {	Line 2446 sub get_all_courseroles {
}	}

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

sub jump_to_role {	sub jump_to_role {
my ($cdom,$cnum,$seccount,$courseroles,$courseprivs,$privref) = @_;	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 2573 sub required_privs {	Line 2707 sub required_privs {

sub countdown_timer {	sub countdown_timer {
if (($env{'request.course.id'}) && ($env{'request.symb'} ne '') &&	if (($env{'request.course.id'}) && ($env{'request.symb'} ne '') &&
($env{'request.filename'}=~/$LONCAPA::assess_re/)) {	(($env{'request.filename'}=~/$LONCAPA::assess_re/) \|\|
	(($env{'request.symb'} =~ /ext\.tool$/) &&
	(&Apache::lonnet::EXT('resource.0.gradable',$env{'request.symb'}) =~ /^yes$/i)))) {
my ($type,$hastimeleft,$slothastime);	my ($type,$hastimeleft,$slothastime);
my $now = time;	my $now = time;
if ($env{'request.filename'} =~ /\.task$/) {	if ($env{'request.filename'} =~ /\.task$/) {
Line 2684 BEGIN {	Line 2820 BEGIN {
} 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=~/^scndsub\:/) {
	my ($parent,@entries) = (split(/\:/, $configline))[1..4];
	push(@{$secondary_submenu{$parent}},\@entries);
} elsif ($configline) {	} elsif ($configline) {
push(@desklines,$configline);	push(@desklines,$configline);
}	}

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

Removed from v.1.461
changed lines
	Added in v.1.484