version 1.483, 2017/10/07 23:14:49
|
version 1.484, 2017/12/18 23:20:48
|
Line 805 sub innerregister {
|
Line 805 sub innerregister {
|
$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'}); |
$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 821 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 964 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|ext\.tool)(\?|$)/) { |
unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio)(\?|$)/) { |
if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) && ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/docs/})) { |
if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) && ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/docs/}) && ($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 2700 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$/) { |