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.79.2.1 and 1.369.2.79.2.2

version 1.369.2.79.2.1, 2020/01/19 00:54:47	version 1.369.2.79.2.2, 2020/07/19 00:24:36
Line 1019 if ($env{'browser.mobile'}) {	Line 1019 if ($env{'browser.mobile'}) {
}	}

unless ($env{'request.noversionuri'}=~/\/(bulletinboard\|smppg\|navmaps\|syllabus\|aboutme\|viewclasslist\|portfolio\|ext\.tool)(\?\|$)/) {	unless ($env{'request.noversionuri'}=~/\/(bulletinboard\|smppg\|navmaps\|syllabus\|aboutme\|viewclasslist\|portfolio\|ext\.tool)(\?\|$)/) {
if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) && ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/docs/})) {	if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) &&
	($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/(docs/\|default_\d+\.page$)})) {
$menuitems.=(<<ENDREALRES);	$menuitems.=(<<ENDREALRES);
s&6&3&catalog.png&$swtext{'catalog'}&info[_1]&catalog_info('$is_mobile')&Show Metadata	s&6&3&catalog.png&$swtext{'catalog'}&info[_1]&catalog_info('$is_mobile')&Show Metadata
ENDREALRES	ENDREALRES
}	}
unless (($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/docs/}) \|\|	unless (($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/(docs/\|default_\d+\.page$)}) \|\|
($env{'request.noversionuri'} =~ m{^\Q/adm/wrapper/\E(ext\|uploaded)/})) {	($env{'request.noversionuri'} =~ m{^\Q/adm/wrapper/\E(ext\|uploaded)/})) {
$menuitems.=(<<ENDREALRES);	$menuitems.=(<<ENDREALRES);
s&8&1&eval.png&$swtext{'eval'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource	s&8&1&eval.png&$swtext{'eval'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
Line 1611 sub prepare_functions {	Line 1612 sub prepare_functions {
if ((($cfile eq '') \|\| (!$editbutton)) &&	if ((($cfile eq '') \|\| (!$editbutton)) &&
($resurl =~ /$LONCAPA::assess_re/)) {	($resurl =~ /$LONCAPA::assess_re/)) {
my $showurl = &Apache::lonnet::clutter($resurl);	my $showurl = &Apache::lonnet::clutter($resurl);
	my $crs_sec = $env{'request.course.id'} . (($env{'request.course.sec'} ne '')
	? "/$env{'request.course.sec'}"
	: '');
if ((&Apache::lonnet::allowed('cre','/')) &&	if ((&Apache::lonnet::allowed('cre','/')) &&
(&Apache::lonnet::metadata($resurl,'sourceavail') eq 'open')) {	(&Apache::lonnet::metadata($resurl,'sourceavail') eq 'open')) {
$viewsrcbutton = 1;	$viewsrcbutton = 1;
} elsif (&Apache::lonnet::allowed('vxc',$env{'request.course.id'})) {	} elsif (&Apache::lonnet::allowed('vxc',$crs_sec)) {
if ($showurl =~ m{^\Q/res/$cdom/\E($match_username)/}) {	if ($showurl =~ m{^\Q/res/$cdom/\E($match_username)/}) {
my $auname = $1;	my $auname = $1;
if (($env{'request.course.adhocsrcaccess'} ne '') &&	if (($env{'request.course.adhocsrcaccess'} ne '') &&
(grep(/^\Q$auname\E$/,split(/,/,$env{'request.course.adhocsrcaccess'})))) {	(grep(/^\Q$auname\E$/,split(/,/,$env{'request.course.adhocsrcaccess'})))) {
$viewsrcbutton = 1;	$viewsrcbutton = 1;
} elsif ((&Apache::lonnet::metadata($resurl,'sourceavail') eq 'open') &&	} elsif ((&Apache::lonnet::metadata($resurl,'sourceavail') eq 'open') &&
(&Apache::lonnet::allowed('bre','/'))) {	(&Apache::lonnet::allowed('bre',$crs_sec))) {
$viewsrcbutton = 1;	$viewsrcbutton = 1;
}	}
}	}

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

Removed from v.1.369.2.79.2.1
changed lines
	Added in v.1.369.2.79.2.2