version 1.683, 2022/10/19 02:10:20
|
version 1.708, 2024/01/08 18:17:50
|
Line 45 use Apache::lontemplate();
|
Line 45 use Apache::lontemplate();
|
use Apache::lonsimplepage(); |
use Apache::lonsimplepage(); |
use Apache::lonhomework(); |
use Apache::lonhomework(); |
use Apache::lonpublisher(); |
use Apache::lonpublisher(); |
use Apache::lonparmset(); |
|
use Apache::loncourserespicker(); |
use Apache::loncourserespicker(); |
use HTML::Entities; |
use HTML::Entities; |
use HTML::TokeParser; |
use HTML::TokeParser; |
Line 183 sub default_folderpath {
|
Line 182 sub default_folderpath {
|
} |
} |
} |
} |
|
|
sub validate_folderpath { |
sub validate_supppath { |
my ($supplementalflag) = @_; |
my ($coursenum,$coursedom) = @_; |
if ($env{'form.folderpath'} ne '') { |
my $backto; |
my @items = split(/\&/,$env{'form.folderpath'}); |
|
my $badpath; |
|
for (my $i=0; $i<@items; $i++) { |
|
my $odd = $i%2; |
|
if (($odd) && (!$supplementalflag) && ($items[$i] !~ /^[^:]*:(|\d+):(|1):(|1):(|1):(|1)$/)) { |
|
$badpath = 1; |
|
} elsif ((!$odd) && ($items[$i] !~ /^(default|supplemental)(|_\d+)$/)) { |
|
$badpath = 1; |
|
} |
|
last if ($badpath); |
|
} |
|
if ($badpath) { |
|
delete($env{'form.folderpath'}); |
|
} |
|
} |
|
return; |
|
} |
|
|
|
sub validate_suppath { |
|
if ($env{'form.supppath'} ne '') { |
if ($env{'form.supppath'} ne '') { |
my @items = split(/\&/,$env{'form.supppath'}); |
my @items = split(/\&/,$env{'form.supppath'}); |
my $badpath; |
my ($badpath,$got_supp,$supppath,%supphidden,%suppids); |
for (my $i=0; $i<@items; $i++) { |
for (my $i=0; $i<@items; $i++) { |
my $odd = $i%2; |
my $odd = $i%2; |
if ((!$odd) && ($items[$i] !~ /^supplemental(|_\d+)$/)) { |
if ((!$odd) && ($items[$i] !~ /^supplemental(|_\d+)$/)) { |
$badpath = 1; |
$badpath = 1; |
|
last; |
|
} elsif ($odd) { |
|
my $suffix; |
|
my $idx = $i-1; |
|
if ($items[$i] =~ /^([^:]*)::(|1):::$/) { |
|
$backto .= '&'.$1; |
|
} elsif ($items[$idx] eq 'supplemental') { |
|
$backto .= '&'.$items[$i]; |
|
} else { |
|
$backto .= '&'.$items[$i]; |
|
my $is_hidden; |
|
unless ($got_supp) { |
|
my ($supplemental) = &Apache::loncommon::get_supplemental($coursenum,$coursedom); |
|
if (ref($supplemental) eq 'HASH') { |
|
if (ref($supplemental->{'hidden'}) eq 'HASH') { |
|
%supphidden = %{$supplemental->{'hidden'}}; |
|
} |
|
if (ref($supplemental->{'ids'}) eq 'HASH') { |
|
%suppids = %{$supplemental->{'ids'}}; |
|
} |
|
} |
|
$got_supp = 1; |
|
} |
|
if (ref($suppids{"/uploaded/$coursedom/$coursenum/$items[$idx].sequence"}) eq 'ARRAY') { |
|
my $mapid = $suppids{"/uploaded/$coursedom/$coursenum/$items[$idx].sequence"}->[0]; |
|
if ($supphidden{$mapid}) { |
|
$is_hidden = 1; |
|
} |
|
} |
|
$suffix = '::'.$is_hidden.':::'; |
|
} |
|
$supppath .= '&'.$items[$i].$suffix; |
|
} else { |
|
$supppath .= '&'.$items[$i]; |
|
$backto .= '&'.$items[$i]; |
} |
} |
last if ($badpath); |
|
} |
} |
if ($badpath) { |
if ($badpath) { |
delete($env{'form.supppath'}); |
delete($env{'form.supppath'}); |
|
} else { |
|
$supppath =~ s/^\&//; |
|
$backto =~ s/^\&//; |
|
$env{'form.supppath'} = $supppath; |
} |
} |
} |
} |
return; |
return $backto; |
} |
} |
|
|
sub dumpcourse { |
sub dumpcourse { |
Line 700 sub group_import {
|
Line 718 sub group_import {
|
$url = $1; |
$url = $1; |
my $marker = $2; |
my $marker = $2; |
my $info = $3; |
my $info = $3; |
my ($toolid,%toolhash,%toolsettings); |
my ($toolid,$toolprefix,$tooltype,%toolhash,%toolsettings); |
my @extras = ('linktext','explanation','crslabel','crstitle','crsappend'); |
my @extras = ('linktext','explanation','crslabel','crstitle','crsappend'); |
my @toolinfo = split(/:/,$info); |
my @toolinfo = split(/:/,$info); |
if ($residx) { |
if ($residx) { |
Line 709 sub group_import {
|
Line 727 sub group_import {
|
} else { |
} else { |
$toolid = shift(@toolinfo); |
$toolid = shift(@toolinfo); |
} |
} |
|
if ($toolid =~ /^c/) { |
|
$tooltype = 'crs'; |
|
$toolprefix = 'c'; |
|
} else { |
|
$tooltype = 'dom'; |
|
} |
$toolid =~ s/\D//g; |
$toolid =~ s/\D//g; |
($toolhash{'target'},$toolhash{'width'},$toolhash{'height'}, |
($toolhash{'target'},$toolhash{'width'},$toolhash{'height'}, |
$toolhash{'linktext'},$toolhash{'explanation'},$toolhash{'crslabel'}, |
$toolhash{'linktext'},$toolhash{'explanation'},$toolhash{'crslabel'}, |
Line 722 sub group_import {
|
Line 746 sub group_import {
|
$toolhash{'gradable'} =~ s/\D+//g; |
$toolhash{'gradable'} =~ s/\D+//g; |
} |
} |
if (ref($ltitoolsref) eq 'HASH') { |
if (ref($ltitoolsref) eq 'HASH') { |
if (ref($ltitoolsref->{$toolid}) eq 'HASH') { |
if (ref($ltitoolsref->{$tooltype}) eq 'HASH') { |
my @deleted; |
if (ref($ltitoolsref->{$tooltype}->{$toolid}) eq 'HASH') { |
$toolhash{'id'} = $toolid; |
my %tools = %{$ltitoolsref->{$tooltype}->{$toolid}}; |
if (($toolhash{'target'} eq 'iframe') || ($toolhash{'target'} eq 'tab') || |
my @deleted; |
($toolhash{'target'} eq 'window')) { |
$toolhash{'id'} = $toolprefix.$toolid; |
if ($toolhash{'target'} eq 'window') { |
if (($toolhash{'target'} eq 'iframe') || ($toolhash{'target'} eq 'tab') || |
foreach my $item ('width','height') { |
($toolhash{'target'} eq 'window')) { |
$toolhash{$item} =~ s/^\s+//; |
if ($toolhash{'target'} eq 'window') { |
$toolhash{$item} =~ s/\s+$//; |
foreach my $item ('width','height') { |
if ($toolhash{$item} =~ /\D/) { |
$toolhash{$item} =~ s/^\s+//; |
delete($toolhash{$item}); |
$toolhash{$item} =~ s/\s+$//; |
if ($residx) { |
if ($toolhash{$item} =~ /\D/) { |
if ($toolsettings{$item}) { |
delete($toolhash{$item}); |
push(@deleted,$item); |
if ($residx) { |
|
if ($toolsettings{$item}) { |
|
push(@deleted,$item); |
|
} |
} |
} |
} |
} |
} |
} |
} |
} |
} |
} elsif ($residx) { |
} elsif ($residx) { |
$toolhash{'target'} = $toolsettings{'target'}; |
$toolhash{'target'} = $toolsettings{'target'}; |
if ($toolhash{'target'} eq 'window') { |
if ($toolhash{'target'} eq 'window') { |
foreach my $item ('width','height') { |
foreach my $item ('width','height') { |
$toolhash{$item} = $toolsettings{$item}; |
$toolhash{$item} = $toolsettings{$item}; |
} |
|
} |
|
} elsif (ref($tools{'display'}) eq 'HASH') { |
|
$toolhash{'target'} = $tools{'display'}{'target'}; |
|
if ($toolhash{'target'} eq 'window') { |
|
$toolhash{'width'} = $tools{'display'}{'width'}; |
|
$toolhash{'height'} = $tools{'display'}{'height'}; |
} |
} |
} |
} |
} elsif (ref($ltitoolsref->{$toolid}->{'display'}) eq 'HASH') { |
if ($toolhash{'target'} eq 'iframe') { |
$toolhash{'target'} = $ltitoolsref->{$toolid}->{'display'}->{'target'}; |
foreach my $item ('width','height','linktext','explanation') { |
if ($toolhash{'target'} eq 'window') { |
delete($toolhash{$item}); |
$toolhash{'width'} = $ltitoolsref->{$toolid}->{'display'}->{'width'}; |
if ($residx) { |
$toolhash{'height'} = $ltitoolsref->{$toolid}->{'display'}->{'height'}; |
if ($toolsettings{$item}) { |
} |
push(@deleted,$item); |
} |
} |
if ($toolhash{'target'} eq 'iframe') { |
|
foreach my $item ('width','height','linktext','explanation') { |
|
delete($toolhash{$item}); |
|
if ($residx) { |
|
if ($toolsettings{$item}) { |
|
push(@deleted,$item); |
|
} |
} |
} |
} |
} |
} elsif ($toolhash{'target'} eq 'tab') { |
} elsif ($toolhash{'target'} eq 'tab') { |
foreach my $item ('width','height') { |
foreach my $item ('width','height') { |
delete($toolhash{$item}); |
delete($toolhash{$item}); |
if ($residx) { |
if ($residx) { |
if ($toolsettings{$item}) { |
if ($toolsettings{$item}) { |
push(@deleted,$item); |
push(@deleted,$item); |
} |
} |
} |
} |
} |
} |
} |
} |
if (ref($tools{'crsconf'}) eq 'HASH') { |
if (ref($ltitoolsref->{$toolid}->{'crsconf'}) eq 'HASH') { |
foreach my $item ('label','title','linktext','explanation') { |
foreach my $item ('label','title','linktext','explanation') { |
my $crsitem; |
my $crsitem; |
if (($item eq 'label') || ($item eq 'title')) { |
if (($item eq 'label') || ($item eq 'title')) { |
$crsitem = 'crs'.$item; |
$crsitem = 'crs'.$item; |
} else { |
} else { |
$crsitem = $item; |
$crsitem = $item; |
} |
} |
if ($tools{'crsconf'}{$item}) { |
if ($ltitoolsref->{$toolid}->{'crsconf'}->{$item}) { |
$toolhash{$crsitem} =~ s/^\s+//; |
$toolhash{$crsitem} =~ s/^\s+//; |
$toolhash{$crsitem} =~ s/\s+$//; |
$toolhash{$crsitem} =~ s/\s+$//; |
if ($toolhash{$crsitem} eq '') { |
if ($toolhash{$crsitem} eq '') { |
delete($toolhash{$crsitem}); |
|
} |
|
} else { |
delete($toolhash{$crsitem}); |
delete($toolhash{$crsitem}); |
} |
} |
} else { |
if (($residx) && (exists($toolsettings{$crsitem}))) { |
delete($toolhash{$crsitem}); |
unless (exists($toolhash{$crsitem})) { |
} |
push(@deleted,$crsitem); |
if (($residx) && (exists($toolsettings{$crsitem}))) { |
} |
unless (exists($toolhash{$crsitem})) { |
|
push(@deleted,$crsitem); |
|
} |
} |
} |
} |
} |
} |
} |
if ($toolhash{'passback'}) { |
if ($toolhash{'passback'}) { |
my $gradesecret = UUID::Tiny::create_uuid_as_string(UUID_V4); |
my $gradesecret = UUID::Tiny::create_uuid_as_string(UUID_V4); |
$toolhash{'gradesecret'} = $gradesecret; |
$toolhash{'gradesecret'} = $gradesecret; |
$toolhash{'gradesecretdate'} = time; |
$toolhash{'gradesecretdate'} = time; |
} |
} |
if ($toolhash{'roster'}) { |
if ($toolhash{'roster'}) { |
my $rostersecret = UUID::Tiny::create_uuid_as_string(UUID_V4); |
my $rostersecret = UUID::Tiny::create_uuid_as_string(UUID_V4); |
$toolhash{'rostersecret'} = $rostersecret; |
$toolhash{'rostersecret'} = $rostersecret; |
$toolhash{'rostersecretdate'} = time; |
$toolhash{'rostersecretdate'} = time; |
|
} |
|
my $changegradable; |
|
if (($residx) && ($folder =~ /^default/)) { |
|
if ($toolsettings{'gradable'}) { |
|
unless (($toolhash{'gradable'}) || (defined($LONCAPA::map::zombies[$residx]))) { |
|
push(@deleted,'gradable'); |
|
$changegradable = 1; |
|
} |
|
} elsif ($toolhash{'gradable'}) { |
|
$changegradable = 1; |
|
} |
} |
if (($caller eq 'londocs') && (defined($LONCAPA::map::zombies[$residx]))) { |
my $changegradable; |
$changegradable = 1; |
if (($residx) && ($folder =~ /^default/)) { |
if ($toolsettings{'gradable'}) { |
if ($toolsettings{'gradable'}) { |
$toolhash{'gradable'} = 1; |
unless (($toolhash{'gradable'}) || (defined($LONCAPA::map::zombies[$residx]))) { |
|
push(@deleted,'gradable'); |
|
$changegradable = 1; |
|
} |
|
} elsif ($toolhash{'gradable'}) { |
|
$changegradable = 1; |
|
} |
|
if (($caller eq 'londocs') && (defined($LONCAPA::map::zombies[$residx]))) { |
|
$changegradable = 1; |
|
if ($toolsettings{'gradable'}) { |
|
$toolhash{'gradable'} = 1; |
|
} |
} |
} |
} |
} |
} |
my $putres = &Apache::lonnet::put('exttool_'.$marker,\%toolhash,$coursedom,$coursenum); |
my $putres = &Apache::lonnet::put('exttool_'.$marker,\%toolhash,$coursedom,$coursenum); |
if ($putres eq 'ok') { |
if ($putres eq 'ok') { |
if (@deleted) { |
if (@deleted) { |
&Apache::lonnet::del('exttool_'.$marker,\@deleted,$coursedom,$coursenum); |
&Apache::lonnet::del('exttool_'.$marker,\@deleted,$coursedom,$coursenum); |
} |
} |
if (($changegradable) && ($folder =~ /^default/)) { |
if (($changegradable) && ($folder =~ /^default/)) { |
my $val; |
my $val; |
if ($toolhash{'gradable'}) { |
if ($toolhash{'gradable'}) { |
$val = 'yes'; |
$val = 'yes'; |
} else { |
} else { |
$val = 'no'; |
$val = 'no'; |
} |
|
&LONCAPA::map::storeparameter($residx,'parameter_0_gradable',$val, |
|
'string_yesno'); |
|
&remember_parms($residx,'gradable','set',$val); |
} |
} |
&LONCAPA::map::storeparameter($residx,'parameter_0_gradable',$val, |
} else { |
'string_yesno'); |
return (&mt('Failed to save update to external tool.'),1); |
&remember_parms($residx,'gradable','set',$val); |
|
} |
} |
} else { |
|
return (&mt('Failed to save update to external tool.'),1); |
|
} |
} |
} |
} |
} |
} |
Line 1188 sub docs_change_log {
|
Line 1215 sub docs_change_log {
|
} |
} |
$r->print('</ul>'); |
$r->print('</ul>'); |
if ($docslog{$id}{'logentry'}{'parameter_res'}) { |
if ($docslog{$id}{'logentry'}{'parameter_res'}) { |
$r->print(&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'parameter_res'}))[0]).':<ul>'); |
my ($title,$url) = split(/\:/,$docslog{$id}{'logentry'}{'parameter_res'},3); |
|
if ($title eq '') { |
|
($title) = ($url =~ m{/([^/]+)$}); |
|
} elsif ($is_supp) { |
|
$title = &Apache::loncommon::parse_supplemental_title($title); |
|
} |
|
$r->print(&LONCAPA::map::qtescape($title).':<ul>'); |
foreach my $parameter ('randompick','hiddenresource','encrypturl','randomorder','gradable') { |
foreach my $parameter ('randompick','hiddenresource','encrypturl','randomorder','gradable') { |
if ($docslog{$id}{'logentry'}{'parameter_action_'.$parameter}) { |
if ($docslog{$id}{'logentry'}{'parameter_action_'.$parameter}) { |
# FIXME: internationalization seems wrong here |
# FIXME: internationalization seems wrong here |
Line 1386 sub print_paste_buffer {
|
Line 1419 sub print_paste_buffer {
|
} |
} |
|
|
my @currpaste = split(/,/,$env{'docs.markedcopies'}); |
my @currpaste = split(/,/,$env{'docs.markedcopies'}); |
my ($pasteitems,@pasteable); |
my ($pasteitems,@pasteable,$same_institution,$checkedsameinst); |
my $clipboardcount = 0; |
my $clipboardcount = 0; |
|
|
# Construct identifiers for current contents of user's paste buffer |
# Construct identifiers for current contents of user's paste buffer |
Line 1399 sub print_paste_buffer {
|
Line 1432 sub print_paste_buffer {
|
($url ne '')) { |
($url ne '')) { |
$clipboardcount ++; |
$clipboardcount ++; |
my ($is_external,$othercourse,$fromsupp,$is_uploaded_map,$parent, |
my ($is_external,$othercourse,$fromsupp,$is_uploaded_map,$parent, |
$canpaste,$nopaste,$othercrs,$areachange,$is_exttool); |
$canpaste,$nopaste,$othercrs,$areachange,$is_exttool,$toolcdom, |
|
$toolcnum,$marker); |
my $extension = (split(/\./,$env{'docs.markedcopy_url_'.$suffix}))[-1]; |
my $extension = (split(/\./,$env{'docs.markedcopy_url_'.$suffix}))[-1]; |
if ($url =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?::|:))//} ) { |
if ($url =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?::|:))//} ) { |
$is_external = 1; |
$is_external = 1; |
} elsif ($url =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$}) { |
} elsif ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) { |
|
($toolcdom,$toolcnum,$marker) = ($1,$2,$3); |
$is_exttool = 1; |
$is_exttool = 1; |
} |
} |
if ($folder =~ /^supplemental/) { |
if ($folder =~ /^supplemental/) { |
Line 1441 sub print_paste_buffer {
|
Line 1476 sub print_paste_buffer {
|
if ($cid ne $env{'request.course.id'}) { |
if ($cid ne $env{'request.course.id'}) { |
my ($srcdom,$srcnum) = split(/_/,$cid); |
my ($srcdom,$srcnum) = split(/_/,$cid); |
if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) { |
if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) { |
if (($is_exttool) && ($srcdom ne $coursedom)) { |
if ($is_exttool) { |
$canpaste = 0; |
if ($toolcdom ne $coursedom) { |
$nopaste = &mt('Paste from another domain unavailable.'); |
$canpaste = 0; |
} else { |
$nopaste = &mt('Paste from another domain unavailable.'); |
$othercrs = '<br />'.&mt('(from another course)'); |
} elsif ($toolcnum ne $coursenum) { |
|
my %toolsettings = |
|
&Apache::lonnet::dump('exttool_'.$marker,$toolcdom,$toolcnum); |
|
my %tooltypes = &Apache::loncommon::usable_exttools(); |
|
if ((($toolsettings{'id'} =~ /^c\d+$/) && (!$tooltypes{'crs'})) || |
|
(($toolsettings{'id'} =~ /^\d+$/) && (!$tooltypes{'dom'}))) { |
|
$canpaste = 0; |
|
$nopaste = &mt('Paste from another course unavailable.'); |
|
} elsif ($toolsettings{'id'} =~ /^c\d+$/) { |
|
unless ($checkedsameinst) { |
|
my $primary_id = &Apache::lonnet::domain($coursedom,'primary'); |
|
my $intdom = &Apache::lonnet::internet_dom($primary_id); |
|
if ($intdom ne '') { |
|
my $internet_names = |
|
&Apache::lonnet::get_internet_names($Apache::lonnet::perlvar{'lonHostID'}); |
|
if (ref($internet_names) eq 'ARRAY') { |
|
if (grep(/^\Q$intdom\E$/,@{$internet_names})) { |
|
$same_institution = 1; |
|
} |
|
} |
|
} |
|
$checkedsameinst = 1; |
|
} |
|
if ($same_institution) { |
|
$othercrs = '<br />'.&mt('(from another course)'); |
|
} else { |
|
$nopaste = &mt('Paste from another course unavailable.'); |
|
} |
|
} else { |
|
$othercrs = '<br />'.&mt('(from another course)'); |
|
} |
|
} |
} |
} |
} else { |
} else { |
$canpaste = 0; |
$canpaste = 0; |
$nopaste = &mt('Paste from another course unavailable.'); |
$nopaste = &mt('Paste from another course unavailable.'); |
} |
} |
} |
} |
|
} elsif ($url =~ m{/res/($match_domain)/($match_username)/}) { |
|
my ($audom,$auname) = ($1,$2); |
|
unless (($auname eq $coursenum) && ($audom eq $coursedom)) { |
|
if (&Apache::lonnet::is_course($audom,$auname)) { |
|
$canpaste = 0; |
|
$nopaste = &mt('Paste from another course unavailable.'); |
|
} |
|
} |
} |
} |
if ($canpaste) { |
if ($canpaste) { |
push(@pasteable,$suffix); |
push(@pasteable,$suffix); |
Line 1744 sub do_paste_from_buffer {
|
Line 1818 sub do_paste_from_buffer {
|
return(); |
return(); |
} |
} |
|
|
my (%msgs,%before,%after,@dopaste,%is_map,%notinsupp,%notincrs,%notindom,%duplicate, |
my (%msgs,%before,%after,@dopaste,%is_map,%notinsupp,%notincrs,%notindom, |
%prefixchg,%srcdom,%srcnum,%srcmapidx,%marktomove,$save_err,$lockerrors,$allresult); |
%othcrstool,%othcrsres,%duplicate,%prefixchg,%srcdom,%srcnum,%srcmapidx, |
|
%marktomove,$save_err,$lockerrors,$allresult,%currcrsltitools, |
|
%currltititles,$currltimax,$gotcrsltitools); |
|
$currltimax = 0; |
|
$gotcrsltitools = 0; |
foreach my $suffix (@topaste) { |
foreach my $suffix (@topaste) { |
my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix}); |
my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix}); |
my $cid=&LONCAPA::map::qtescape($env{'docs.markedcopy_crs_'.$suffix}); |
my $cid=&LONCAPA::map::qtescape($env{'docs.markedcopy_crs_'.$suffix}); |
Line 1785 sub do_paste_from_buffer {
|
Line 1862 sub do_paste_from_buffer {
|
} |
} |
} |
} |
# When buffer was populated using an active role in a different course |
# When buffer was populated using an active role in a different course |
# disallow pasting of External Tool if course is in a different domain. |
# disallow pasting of External Tool if course is in a different domain, |
if (($url =~ m{/ext\.tool$}) && ($srcd ne $coursedom)) { |
# or if External Tool use is not permitted in this course. |
$notindom{$suffix} = 1; |
if ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) { |
next; |
my ($toolcdom,$toolcnum,$marker) = ($1,$2,$3); |
|
if ($toolcdom ne $coursedom) { |
|
$notindom{$suffix} = 1; |
|
next; |
|
} elsif ($toolcnum ne $coursenum) { |
|
my %toolsettings = |
|
&Apache::lonnet::dump('exttool_'.$marker,$toolcdom,$toolcnum); |
|
my %tooltypes = &Apache::loncommon::usable_exttools(); |
|
if ((($toolsettings{'id'} =~ /^c\d+$/) && (!$tooltypes{'crs'})) || |
|
(($toolsettings{'id'} =~ /^\d+$/) && (!$tooltypes{'dom'}))) { |
|
$othcrstool{$suffix} = 1; |
|
next; |
|
} |
|
if ($toolsettings{'id'} =~ /^c\d+$/) { |
|
unless ($gotcrsltitools) { |
|
%currcrsltitools = |
|
&Apache::lonnet::get_course_lti($coursenum,$coursedom,'consumer'); |
|
foreach my $item (sort(keys(%currcrsltitools))) { |
|
if (ref($currcrsltitools{$item}) eq 'HASH') { |
|
$currltimax ++; |
|
if (ref($currltititles{$currcrsltitools{$item}{'title'}}) eq 'ARRAY') { |
|
push(@{$currltititles{$currcrsltitools{$item}{'title'}}},$item); |
|
} else { |
|
$currltititles{$currcrsltitools{$item}{'title'}} = [$item]; |
|
} |
|
} |
|
} |
|
$gotcrsltitools = 1; |
|
} |
|
} |
|
} |
} |
} |
$srcdom{$suffix} = $srcd; |
$srcdom{$suffix} = $srcd; |
$srcnum{$suffix} = $srcn; |
$srcnum{$suffix} = $srcn; |
|
} elsif ($url =~ m{^/res/($match_domain)/($match_courseid)/}) { |
|
my ($audom,$auname) = ($1,$2); |
|
# When buffer was populated using an active role in a different course |
|
# disallow pasting of published resources from Course Authoring Space |
|
unless (($auname eq $coursenum) && ($audom eq $coursedom)) { |
|
if (&Apache::lonnet::is_course($audom,$auname)) { |
|
$othcrsres{$suffix} = 1; |
|
next; |
|
} |
|
} |
} |
} |
$srcmapidx{$suffix} = $mapidx; |
$srcmapidx{$suffix} = $mapidx; |
push(@dopaste,$suffix); |
push(@dopaste,$suffix); |
Line 1843 sub do_paste_from_buffer {
|
Line 1960 sub do_paste_from_buffer {
|
notinsupp => 'Paste failed: content type is not supported within Supplemental Content', |
notinsupp => 'Paste failed: content type is not supported within Supplemental Content', |
notincrs => 'Paste failed: Item is from a different course which you do not have rights to edit.', |
notincrs => 'Paste failed: Item is from a different course which you do not have rights to edit.', |
notindom => 'Paste failed: Item is an external tool from a course in a different domain.', |
notindom => 'Paste failed: Item is an external tool from a course in a different domain.', |
|
othcrstool => 'Paste failed: Item is an external tool from a different course, for which use is not allowed in this course.', |
|
othcrsres => 'Paste failed: Item is a course-authored resource from a different course', |
duplicate => 'Paste failed: only one instance of a particular published sequence or page is allowed within each course.', |
duplicate => 'Paste failed: only one instance of a particular published sequence or page is allowed within each course.', |
); |
); |
|
|
Line 1871 sub do_paste_from_buffer {
|
Line 1990 sub do_paste_from_buffer {
|
# Retrieve information about all course maps in main content area |
# Retrieve information about all course maps in main content area |
|
|
my $allmaps = {}; |
my $allmaps = {}; |
my (@toclear,%mapurls,%lockerrs,%msgerrs,%results,$donechk); |
my (@toclear,%mapurls,%lockerrs,%msgerrs,%results,$donechk, |
|
@updatetoolsenc,$updatetoolscache,$checkedsameinst, |
|
$same_institution); |
|
|
# Loop over the items to paste |
# Loop over the items to paste |
foreach my $suffix (@dopaste) { |
foreach my $suffix (@dopaste) { |
Line 1970 sub do_paste_from_buffer {
|
Line 2091 sub do_paste_from_buffer {
|
$fromothercrs = 1; |
$fromothercrs = 1; |
$info{'cdom'} = $srcdom{$suffix}; |
$info{'cdom'} = $srcdom{$suffix}; |
$info{'cnum'} = $srcnum{$suffix}; |
$info{'cnum'} = $srcnum{$suffix}; |
|
unless ($checkedsameinst) { |
|
my $primary_id = &Apache::lonnet::domain($coursedom,'primary'); |
|
my $intdom = &Apache::lonnet::internet_dom($primary_id); |
|
if ($intdom ne '') { |
|
my $internet_names = |
|
&Apache::lonnet::get_internet_names($Apache::lonnet::perlvar{'lonHostID'}); |
|
if (ref($internet_names) eq 'ARRAY') { |
|
if (grep(/^\Q$intdom\E$/,@{$internet_names})) { |
|
$same_institution = 1; |
|
} |
|
} |
|
} |
|
$checkedsameinst = 1; |
|
} |
} |
} |
} |
} |
unless (($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') && (!$fromothercrs)) { |
unless (($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') && (!$fromothercrs)) { |
my (%lockerr,$msg); |
my (%lockerr,$msg); |
my ($newurl,$result,$errtext) = |
my ($newurl,$result,$errtext) = |
&dbcopy(\%info,$coursedom,$coursenum,\%lockerr); |
&dbcopy(\%info,$coursedom,$coursenum,\%lockerr,\%currltititles, |
|
\$currltimax,\@updatetoolsenc,\$updatetoolscache,$same_institution); |
if ($result eq 'ok') { |
if ($result eq 'ok') { |
$url = $newurl; |
$url = $newurl; |
$title=&mt('Copy of').' '.$title; |
$title=&mt('Copy of').' '.$title; |
Line 2144 sub do_paste_from_buffer {
|
Line 2280 sub do_paste_from_buffer {
|
} |
} |
} |
} |
} |
} |
|
if (($updatetoolscache) || (@updatetoolsenc)) { |
|
&update_ltitools_caches($coursedom,$coursenum,$updatetoolscache, |
|
\@updatetoolsenc); |
|
} |
&clear_from_buffer(\@toclear,\@currpaste); |
&clear_from_buffer(\@toclear,\@currpaste); |
my $msgsarray; |
my $msgsarray; |
foreach my $suffix (keys(%msgs)) { |
foreach my $suffix (keys(%msgs)) { |
Line 2192 sub clear_from_buffer {
|
Line 2332 sub clear_from_buffer {
|
return $numdel; |
return $numdel; |
} |
} |
|
|
|
sub update_ltitools_caches { |
|
my ($coursedom,$coursenum,$updatetoolscache,$updatetoolsenc) = @_; |
|
my $hashid=$coursedom.'_'.$coursenum; |
|
if ($updatetoolscache) { |
|
&Apache::lonnet::devalidate_cache_new('courseltitools',$hashid); |
|
} |
|
if ((ref($updatetoolsenc) eq 'ARRAY') && |
|
(@{$updatetoolsenc})) { |
|
my @ids=&Apache::lonnet::current_machine_ids(); |
|
my $updatedone; |
|
foreach my $lonhost (@{$updatetoolsenc}) { |
|
if (grep(/^\Q$lonhost\E$/,@ids)) { |
|
unless ($updatedone) { |
|
&Apache::lonnet::devalidate_cache_new('crsltitoolsenc',$hashid); |
|
} |
|
$updatedone = 1; |
|
} else { |
|
&Apache::lonnet::remote_devalidate_cache($lonhost,["crsltitoolsenc:$hashid"]); |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|
sub get_newmap_url { |
sub get_newmap_url { |
my ($url,$folder,$prefixchg,$coursedom,$coursenum,$srcdom,$srcnum, |
my ($url,$folder,$prefixchg,$coursedom,$coursenum,$srcdom,$srcnum, |
$titleref,$allmaps,$newurls) = @_; |
$titleref,$allmaps,$newurls) = @_; |
Line 2253 sub get_newmap_url {
|
Line 2417 sub get_newmap_url {
|
} |
} |
|
|
sub dbcopy { |
sub dbcopy { |
my ($dbref,$coursedom,$coursenum,$lockerrorsref) = @_; |
my ($dbref,$coursedom,$coursenum,$lockerrorsref,$currltititles, |
|
$currltimax,$updatetoolsenc,$updatetoolscache,$same_institution) = @_; |
my ($url,$result,$errtext); |
my ($url,$result,$errtext); |
if (ref($dbref) eq 'HASH') { |
if (ref($dbref) eq 'HASH') { |
$url = $dbref->{'src'}; |
$url = $dbref->{'src'}; |
Line 2297 sub dbcopy {
|
Line 2462 sub dbcopy {
|
my %contents=&Apache::lonnet::dump($db_name, |
my %contents=&Apache::lonnet::dump($db_name, |
$dbref->{'cdom'}, |
$dbref->{'cdom'}, |
$dbref->{'cnum'}); |
$dbref->{'cnum'}); |
|
my ($toolcopyerror,$toolpassback,$toolroster,%toolinfo,$oldtoolid,$defincrs); |
|
if ($url eq '/adm/'.$dbref->{'cdom'}.'/'.$dbref->{'cnum'}."/$marker/ext.tool") { |
|
if ($contents{'id'} =~ /^(|c)(\d+)$/) { |
|
$oldtoolid = $2; |
|
if ($1 eq 'c') { |
|
$defincrs = 1; |
|
%toolinfo = |
|
&Apache::lonnet::get('ltitools',[$oldtoolid],$dbref->{'cdom'},$dbref->{'cnum'}); |
|
} else { |
|
%toolinfo= &Apache::lonnet::get_domain_lti($dbref->{'cdom'},'consumer'); |
|
} |
|
if (ref($toolinfo{$oldtoolid}) eq 'HASH') { |
|
if ($toolinfo{$oldtoolid}{'passback'}) { |
|
$toolpassback = 1; |
|
} |
|
if ($toolinfo{$oldtoolid}{'roster'}) { |
|
$toolroster = 1; |
|
} |
|
} else { |
|
$toolcopyerror = 1; |
|
$errtext = &mt('Could not retrieve original settings for pasted external tool.'); |
|
} |
|
} |
|
unless (($dbref->{'cnum'} eq $coursenum) && ($dbref->{'cdom'} eq $coursedom)) { |
|
$url = "/adm/$coursedom/$coursenum/$marker/ext.tool"; |
|
if ($contents{'crstitle'} ne '') { |
|
$contents{'crstitle'} = $env{'course.'.$coursedom.'_'.$coursenum.'.description'}; |
|
} |
|
if (($defincrs) && (!$toolcopyerror)) { |
|
my %newtool; |
|
my $oldcdom = $dbref->{'cdom'}; |
|
my $oldcnum = $dbref->{'cnum'}; |
|
my $title = $toolinfo{$oldtoolid}{'title'}; |
|
if (ref($currltititles) eq 'HASH') { |
|
if (exists($currltititles->{$title})) { |
|
$title .= ' (copied from another course)'; |
|
} |
|
} |
|
my ($newid,$iderror) = |
|
&Apache::lonnet::get_ltitools_id('course',$coursedom,$coursenum,$title); |
|
if ($newid =~ /^\d+$/) { |
|
%{$newtool{$newid}} = %{$toolinfo{$oldtoolid}}; |
|
$newtool{$newid}{'title'} = $title; |
|
if (ref($currltimax)) { |
|
$newtool{$newid}{'order'} = $$currltimax; |
|
} |
|
if ($newtool{$newid}{'image'} =~ m{^\Q/uploaded/$oldcdom/$oldcnum/toollogo/$oldtoolid/\E([^/]+)$}) { |
|
my $fname = $1; |
|
my $content = &Apache::lonnet::getfile($newtool{$newid}{'image'}); |
|
if ($content eq '-1') { |
|
delete($newtool{$newid}{'image'}); |
|
} else { |
|
$env{'form.'.$suffix.'.image'} = $content; |
|
my $newlogo = |
|
&Apache::lonnet::finishuserfileupload($coursenum,$coursedom,$suffix.'.image',"toollogo/$newid/$fname"); |
|
delete($env{'form.'.$suffix.'.image'}); |
|
if ($newlogo =~ m{^/uploaded/}) { |
|
$newtool{$newid}{'image'} = $newlogo; |
|
} else { |
|
delete($newtool{$newid}{'image'}); |
|
} |
|
} |
|
} |
|
my $newusable; |
|
if ($same_institution) { |
|
my %oldtoolsenc = &Apache::lonnet::eget('nohist_toolsenc',[$oldtoolid],$oldcdom,$oldcnum); |
|
if (ref($oldtoolsenc{$oldtoolid}) eq 'HASH') { |
|
my %newtoolsenc; |
|
%{$newtoolsenc{$newid}} = %{$oldtoolsenc{$oldtoolid}}; |
|
my $putres = &Apache::lonnet::put('nohist_toolsenc',\%newtoolsenc,$coursedom,$coursenum,1); |
|
if ($putres eq 'ok') { |
|
if (ref($updatetoolsenc) eq 'ARRAY') { |
|
my $newhome = &Apache::lonnet::homeserver($coursenum,$coursedom); |
|
unless (grep(/^\Q$newhome\E$/,@{$updatetoolsenc})) { |
|
push(@{$updatetoolsenc},$newhome); |
|
} |
|
} |
|
$newusable = 1; |
|
} |
|
} |
|
} |
|
if ($newtool{$newid}{'usable'}) { |
|
unless ($newusable) { |
|
delete($newtool{$newid}{'usable'}); |
|
} |
|
} |
|
my $putres = &Apache::lonnet::put('ltitools',\%newtool,$coursedom,$coursenum); |
|
if ($putres eq 'ok') { |
|
$contents{'id'} = "c$newid"; |
|
if (ref($updatetoolscache)) { |
|
$$updatetoolscache ++; |
|
} |
|
if (ref($currltititles->{$title}) eq 'ARRAY') { |
|
push(@{$currltititles->{$title}},$newid); |
|
} else { |
|
$currltititles->{$title} = [$newid]; |
|
} |
|
if (ref($currltimax)) { |
|
$$currltimax ++; |
|
} |
|
} else { |
|
$toolcopyerror = 1; |
|
$errtext = &mt('Unable to save external tool definition in Course Settings.'); |
|
} |
|
} else { |
|
$toolcopyerror = 1; |
|
$errtext = &mt('Unable to retrieve new tool ID when adding external tool definition to Course Settings.'); |
|
} |
|
} |
|
} |
|
} |
if (exists($contents{'uploaded.photourl'})) { |
if (exists($contents{'uploaded.photourl'})) { |
my $photo = $contents{'uploaded.photourl'}; |
my $photo = $contents{'uploaded.photourl'}; |
my ($subdir,$fname) = |
my ($subdir,$fname) = |
Line 2316 sub dbcopy {
|
Line 2592 sub dbcopy {
|
} |
} |
} |
} |
$db_name =~ s{_\d*$ }{_$suffix}x; |
$db_name =~ s{_\d*$ }{_$suffix}x; |
if (($prefix eq 'exttool') && ($dbref->{'delgradable'}) && ($contents{'gradable'})) { |
if ($prefix eq 'exttool') { |
delete($contents{'gradable'}); |
unless ($toolcopyerror) { |
|
foreach my $key ('oldgradesecret','gradesecret','gradesecretdate','oldrostersecret','rostersecret','rostersecretdate') { |
|
if (exists($contents{$key})) { |
|
delete($contents{$key}); |
|
} |
|
} |
|
if ($dbref->{'delgradable'}) { |
|
if (exists($contents{'gradable'})) { |
|
delete($contents{'gradable'}); |
|
} |
|
} |
|
if ($toolpassback) { |
|
if ($contents{'gradable'}) { |
|
my $gradesecret = UUID::Tiny::create_uuid_as_string(UUID_V4); |
|
$contents{'gradesecret'} = $gradesecret; |
|
$contents{'gradesecretdate'} = time; |
|
} |
|
} |
|
if ($toolroster) { |
|
my $rostersecret = UUID::Tiny::create_uuid_as_string(UUID_V4); |
|
$contents{'rostersecret'} = $rostersecret; |
|
$contents{'rostersecretdate'} = time; |
|
} |
|
} |
} |
} |
$result=&Apache::lonnet::put($db_name,\%contents, |
if (($prefix eq 'exttool') && ($toolcopyerror)) { |
$coursedom,$coursenum); |
$result = 'error'; |
if ($result eq 'ok') { |
} else { |
$url =~ s{/(\d*)/(smppg|bulletinboard|ext\.tool)$}{/$suffix/$2}x; |
$result=&Apache::lonnet::put($db_name,\%contents, |
|
$coursedom,$coursenum); |
|
if ($result eq 'ok') { |
|
$url =~ s{/(\d*)/(smppg|bulletinboard|ext\.tool)$}{/$suffix/$2}x; |
|
} |
} |
} |
} |
} |
if (($freedlock ne 'ok') && (ref($lockerrorsref) eq 'HASH')) { |
if (($freedlock ne 'ok') && (ref($lockerrorsref) eq 'HASH')) { |
Line 2477 sub contained_map_check {
|
Line 2780 sub contained_map_check {
|
if ($token->[1] eq 'resource') { |
if ($token->[1] eq 'resource') { |
next if ($token->[2]->{'type'} eq 'zombie'); |
next if ($token->[2]->{'type'} eq 'zombie'); |
my $ressrc = $token->[2]->{'src'}; |
my $ressrc = $token->[2]->{'src'}; |
if ($ressrc =~ m{^/adm/($match_domain)/$match_courseid/\d+/ext\.tool$}) { |
if ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) { |
my $srcdom = $1; |
my ($srcdom,$srcnum,$marker) = ($1,$2,$3); |
unless ($srcdom eq $coursedom) { |
unless ($srcdom eq $coursedom) { |
$removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; |
$removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; |
next; |
next; |
} |
} |
|
unless ($srcnum eq $coursenum) { |
|
my %toolsettings = |
|
&Apache::lonnet::dump('exttool_'.$marker,$srcdom,$srcnum); |
|
my %tooltypes = &Apache::loncommon::usable_exttools(); |
|
if ((($toolsettings{'id'} =~ /^c\d+$/) && (!$tooltypes{'crs'})) || |
|
(($toolsettings{'id'} =~ /^\d+$/) && (!$tooltypes{'dom'}))) { |
|
$removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; |
|
next; |
|
} |
|
} |
} elsif ($folder =~ /^supplemental/) { |
} elsif ($folder =~ /^supplemental/) { |
unless (&supp_pasteable($ressrc)) { |
unless (&supp_pasteable($ressrc)) { |
$removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; |
$removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; |
next; |
next; |
} |
} |
} |
} |
|
if ($ressrc =~ m{^/res/($match_domain)/($match_courseid)/}) { |
|
my ($srcdom,$srcnum) = ($1,$2); |
|
unless (($srcnum eq $coursenum) && ($srcdom eq $coursedom)) { |
|
if (&Apache::lonnet::is_course($srcdom,$srcnum)) { |
|
$removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; |
|
next; |
|
} |
|
} |
|
} |
if ($ressrc =~ m{^/(res|uploaded)/.+\.(sequence|page)$}) { |
if ($ressrc =~ m{^/(res|uploaded)/.+\.(sequence|page)$}) { |
if ($1 eq 'uploaded') { |
if ($1 eq 'uploaded') { |
$hierarchy->{$url}{$token->[2]->{'id'}} = $ressrc; |
$hierarchy->{$url}{$token->[2]->{'id'}} = $ressrc; |
Line 2623 sub url_paste_fixups {
|
Line 2945 sub url_paste_fixups {
|
if ($is_exttool) { |
if ($is_exttool) { |
$exttoolchg = 1; |
$exttoolchg = 1; |
} |
} |
} elsif (($rem =~ m{\d+/ext\.tool$}) && |
} elsif (($is_exttool) && |
($env{'form.docs.markedcopy_options'} ne 'move')) { |
($env{'form.docs.markedcopy_options'} ne 'move')) { |
$dbcopies->{$oldurl}{$id}{'src'} = $ressrc; |
$dbcopies->{$oldurl}{$id}{'src'} = $ressrc; |
$dbcopies->{$oldurl}{$id}{'cdom'} = $srcdom; |
$dbcopies->{$oldurl}{$id}{'cdom'} = $srcdom; |
Line 2683 sub apply_fixups {
|
Line 3005 sub apply_fixups {
|
$oldurl,$url,$caller) = @_; |
$oldurl,$url,$caller) = @_; |
my (%rewrites,%zombies,%removefrommap,%removeparam,%dbcopies,%retitles, |
my (%rewrites,%zombies,%removefrommap,%removeparam,%dbcopies,%retitles, |
%params,%newsubdir,%before,%after,%copies,%docmoves,%mapmoves,@msgs, |
%params,%newsubdir,%before,%after,%copies,%docmoves,%mapmoves,@msgs, |
%resdatacopy,%lockerrors,$lockmsg); |
%resdatacopy,%lockerrors,$lockmsg,%currcrsltitools,$gotcrsltitools, |
|
%currltititles,$currltimax); |
|
$currltimax = 0; |
if (ref($updated) eq 'HASH') { |
if (ref($updated) eq 'HASH') { |
if (ref($updated->{'rewrites'}) eq 'HASH') { |
if (ref($updated->{'rewrites'}) eq 'HASH') { |
%rewrites = %{$updated->{'rewrites'}}; |
%rewrites = %{$updated->{'rewrites'}}; |
Line 2834 sub apply_fixups {
|
Line 3158 sub apply_fixups {
|
} |
} |
} |
} |
} |
} |
|
my ($updatetoolscache,@updatetoolsenc,$same_institution,$checkedsameinst); |
foreach my $key (keys(%updates)) { |
foreach my $key (keys(%updates)) { |
my (%torewrite,%toretitle,%toremove,%remparam,%currparam,%zombie,%newdb); |
my (%torewrite,%toretitle,%toremove,%remparam,%currparam,%zombie,%newdb); |
if (ref($rewrites{$key}) eq 'HASH') { |
if (ref($rewrites{$key}) eq 'HASH') { |
Line 2854 sub apply_fixups {
|
Line 3179 sub apply_fixups {
|
if (ref($dbcopies{$key}) eq 'HASH') { |
if (ref($dbcopies{$key}) eq 'HASH') { |
foreach my $idx (keys(%{$dbcopies{$key}})) { |
foreach my $idx (keys(%{$dbcopies{$key}})) { |
if (ref($dbcopies{$key}{$idx}) eq 'HASH') { |
if (ref($dbcopies{$key}{$idx}) eq 'HASH') { |
|
my $oldurl = $dbcopies{$key}{$idx}{'src'}; |
|
my $oldcdom = $dbcopies{$key}{$idx}{'cdom'}; |
|
my $oldcnum = $dbcopies{$key}{$idx}{'cnum'}; |
|
my $oldmarker; |
|
if ($oldurl =~ m{^\Q/adm/$oldcdom/$oldcnum/\E(\d+)/ext\.tool$}) { |
|
$oldmarker = $1; |
|
unless (($gotcrsltitools) || |
|
(($oldcnum eq $cnum) && ($oldcdom eq $cdom))) { |
|
my %oldtoolsettings=&Apache::lonnet::dump('exttool_'.$oldmarker,$oldcdom,$oldcnum); |
|
if ($oldtoolsettings{'id'} =~ /^c\d+$/) { |
|
unless ($gotcrsltitools) { |
|
%currcrsltitools = |
|
&Apache::lonnet::get_course_lti($cnum,$cdom,'consumer'); |
|
foreach my $item (sort(keys(%currcrsltitools))) { |
|
if (ref($currcrsltitools{$item}) eq 'HASH') { |
|
$currltimax ++; |
|
if (ref($currltititles{$currcrsltitools{$item}{'title'}}) eq 'ARRAY') { |
|
push(@{$currltititles{$currcrsltitools{$item}{'title'}}},$item); |
|
} else { |
|
$currltititles{$currcrsltitools{$item}{'title'}} = [$item]; |
|
} |
|
} |
|
} |
|
$gotcrsltitools = 1; |
|
} |
|
unless ($checkedsameinst) { |
|
my $primary_id = &Apache::lonnet::domain($cdom,'primary'); |
|
my $intdom = &Apache::lonnet::internet_dom($primary_id); |
|
if ($intdom ne '') { |
|
my $internet_names = |
|
&Apache::lonnet::get_internet_names($Apache::lonnet::perlvar{'lonHostID'}); |
|
if (ref($internet_names) eq 'ARRAY') { |
|
if (grep(/^\Q$intdom\E$/,@{$internet_names})) { |
|
$same_institution = 1; |
|
} |
|
} |
|
} |
|
$checkedsameinst = 1; |
|
} |
|
} |
|
} |
|
} |
my ($newurl,$result,$errtext) = |
my ($newurl,$result,$errtext) = |
&dbcopy($dbcopies{$key}{$idx},$cdom,$cnum,\%lockerrors); |
&dbcopy($dbcopies{$key}{$idx},$cdom,$cnum,\%lockerrors,\%currltititles, |
|
\$currltimax,\@updatetoolsenc,\$updatetoolscache,$same_institution); |
if ($result eq 'ok') { |
if ($result eq 'ok') { |
$newdb{$idx} = $newurl; |
$newdb{$idx} = $newurl; |
|
if ($newurl =~ /ext\.tool$/) { |
|
if ($torewrite{$idx} eq "/adm/$oldcdom/$oldcnum/$oldmarker/ext.tool") { |
|
if ($newurl =~ m{^\Q/adm/$cdom/$cnum/\E(\d+)/ext.tool$}) { |
|
my $newmarker = $1; |
|
unless ($oldmarker eq $newmarker) { |
|
$torewrite{$idx} = "/adm/$oldcdom/$oldcnum/$newmarker/ext.tool"; |
|
} |
|
} |
|
} |
|
} |
} elsif (ref($errors) eq 'HASH') { |
} elsif (ref($errors) eq 'HASH') { |
$errors->{$key} = 1; |
$errors->{$key} = 1; |
} |
} |
Line 2996 sub apply_fixups {
|
Line 3374 sub apply_fixups {
|
} |
} |
} |
} |
} |
} |
|
if (($updatetoolscache) || (@updatetoolsenc)) { |
|
&update_ltitools_caches($cdom,$cnum,$updatetoolscache, |
|
\@updatetoolsenc); |
|
} |
} |
} |
return ('ok',\@msgs,$lockmsg); |
return ('ok',\@msgs,$lockmsg); |
} |
} |
Line 3090 sub update_parameter {
|
Line 3472 sub update_parameter {
|
my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]); |
my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]); |
$name=&LONCAPA::map::qtescape($name); |
$name=&LONCAPA::map::qtescape($name); |
$url=&LONCAPA::map::qtescape($url); |
$url=&LONCAPA::map::qtescape($url); |
next unless ($name && $url); |
next unless $url; |
my $is_map; |
my $is_map; |
if ($url =~ m{/uploaded/.+\.(page|sequence)$}) { |
if ($url =~ m{/uploaded/.+\.(page|sequence)$}) { |
$is_map = 1; |
$is_map = 1; |
Line 3277 sub editor {
|
Line 3659 sub editor {
|
return $errtext if ($fatal); |
return $errtext if ($fatal); |
} |
} |
|
|
my (%supphidden,%suppids,$suppmapid); |
|
|
|
if ($#LONCAPA::map::order<1) { |
if ($#LONCAPA::map::order<1) { |
my $idx=&LONCAPA::map::getresidx(); |
my $idx=&LONCAPA::map::getresidx(); |
if ($idx<=0) { $idx=1; } |
if ($idx<=0) { $idx=1; } |
$LONCAPA::map::order[0]=$idx; |
$LONCAPA::map::order[0]=$idx; |
$LONCAPA::map::resources[$idx]=''; |
$LONCAPA::map::resources[$idx]=''; |
} elsif ($supplementalflag && !$allowed) { |
|
my ($supplemental) = &Apache::lonnet::get_supplemental($coursenum,$coursedom); |
|
if (ref($supplemental) eq 'HASH') { |
|
if (ref($supplemental->{'hidden'}) eq 'HASH') { |
|
%supphidden = %{$supplemental->{'hidden'}}; |
|
} |
|
if (ref($supplemental->{'ids'}) eq 'HASH') { |
|
%suppids = %{$supplemental->{'ids'}}; |
|
} |
|
} |
|
if ($folder eq 'supplemental') { |
|
$suppmapid = 0; |
|
} elsif ($folder =~ /^supplemental_(\d+)$/) { |
|
$suppmapid = $1; |
|
} |
|
} |
} |
|
|
# ------------------------------------------------------------ Process commands |
# ------------------------------------------------------------ Process commands |
Line 3559 sub editor {
|
Line 3924 sub editor {
|
$r->print('</div>'); |
$r->print('</div>'); |
} |
} |
|
|
|
if ((!$allowed) && ($folder =~ /^supplemental_\d+$/)) { |
|
my ($supplemental) = &Apache::loncommon::get_supplemental($coursenum,$coursedom); |
|
if (ref($supplemental) eq 'HASH') { |
|
if ((ref($supplemental->{'hidden'}) eq 'HASH') && |
|
(ref($supplemental->{'ids'}) eq 'HASH')) { |
|
if (ref($supplemental->{'ids'}->{"/uploaded/$coursedom/$coursenum/$folder.$container"}) eq 'ARRAY') { |
|
my $mapnum = $supplemental->{'ids'}->{"/uploaded/$coursedom/$coursenum/$folder.$container"}->[0]; |
|
if ($supplemental->{'hidden'}->{$mapnum}) { |
|
$ishidden = 1; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
|
my ($to_show,$output,@allidx,@allmapidx,%filters,%lists,%curr_groups); |
my ($to_show,$output,@allidx,@allmapidx,%filters,%lists,%curr_groups); |
%filters = ( |
%filters = ( |
canremove => [], |
canremove => [], |
Line 3583 sub editor {
|
Line 3963 sub editor {
|
} |
} |
|
|
if (($supplementalflag) && (!$allowed) && (!$env{'request.role.adv'})) { |
if (($supplementalflag) && (!$allowed) && (!$env{'request.role.adv'})) { |
next if ($supphidden{$suppmapid.':'.$res}); |
if (($ishidden) || ((&LONCAPA::map::getparameter($res,'parameter_hiddenresource'))[0]=~/^yes$/i)) { |
|
$idx++; |
|
next; |
|
} |
} |
} |
$output .= &entryline($idx,$name,$url,$folder,$allowed,$res, |
$output .= &entryline($idx,$name,$url,$folder,$allowed,$res, |
$coursenum,$coursedom,$crstype, |
$coursenum,$coursedom,$crstype, |
$pathitem,$supplementalflag,$container, |
$pathitem,$supplementalflag,$container, |
\%filters,\%curr_groups,$ltitoolsref,$canedit, |
\%filters,\%curr_groups,$ltitoolsref,$canedit, |
$isencrypted,$navmapref,$hostname, |
$isencrypted,$ishidden,$navmapref,$hostname); |
\%supphidden,\%suppids,$suppmapid); |
|
$idx++; |
$idx++; |
$shown++; |
$shown++; |
} |
} |
Line 3720 sub multiple_check_form {
|
Line 4102 sub multiple_check_form {
|
return unless (ref($listsref) eq 'HASH'); |
return unless (ref($listsref) eq 'HASH'); |
my $disabled; |
my $disabled; |
unless ($canedit) { |
unless ($canedit) { |
$disabled = 'disabled="disabled"'; |
$disabled = ' disabled="disabled"'; |
} |
} |
my $output = |
my $output = |
'<form action="/adm/coursedocs" method="post" name="togglemult'.$caller.'">'. |
'<form action="/adm/coursedocs" method="post" name="togglemult'.$caller.'">'. |
Line 3758 sub multiple_check_form {
|
Line 4140 sub multiple_check_form {
|
'</label></span></td>'."\n". |
'</label></span></td>'."\n". |
'<td class="LC_docs_entry_parameter">'. |
'<td class="LC_docs_entry_parameter">'. |
'<span class="LC_nobreak LC_docs_copy">'. |
'<span class="LC_nobreak LC_docs_copy">'. |
'<label><input type="checkbox" name="copyall" id="copyall" onclick="propagateState(this.form,'."'copy'".')"'. $disabled.' />'.&mt('Copy'). |
'<label><input type="checkbox" name="copyall" id="copyall" onclick="propagateState(this.form,'."'copy'".')"'.$disabled.' />'.&mt('Copy'). |
'</label></span></td>'. |
'</label></span></td>'. |
'</tr></table>'."\n"; |
'</tr></table>'."\n"; |
} |
} |
Line 3972 sub is_supplemental_title {
|
Line 4354 sub is_supplemental_title {
|
sub entryline { |
sub entryline { |
my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom, |
my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom, |
$crstype,$pathitem,$supplementalflag,$container,$filtersref,$currgroups, |
$crstype,$pathitem,$supplementalflag,$container,$filtersref,$currgroups, |
$ltitoolsref,$canedit,$isencrypted,$navmapref,$hostname, |
$ltitoolsref,$canedit,$isencrypted,$ishidden,$navmapref,$hostname)=@_; |
$supphidden,$suppids,$suppmapid)=@_; |
my ($foldertitle,$renametitle,$oldtitle,$encodedtitle); |
my ($foldertitle,$renametitle,$oldtitle); |
|
if (&is_supplemental_title($title)) { |
if (&is_supplemental_title($title)) { |
($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title); |
($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title); |
|
$encodedtitle=$title; |
} else { |
} else { |
$title=&HTML::Entities::encode($title,'"<>&\''); |
$title=&HTML::Entities::encode($title,'"<>&\''); |
|
$encodedtitle=$title; |
$renametitle=$title; |
$renametitle=$title; |
$foldertitle=$title; |
$foldertitle=$title; |
} |
} |
Line 4205 END
|
Line 4588 END
|
my $ispage; |
my $ispage; |
my $containerarg; |
my $containerarg; |
my $folderurl; |
my $folderurl; |
|
my $plainurl; |
if ($uploaded) { |
if ($uploaded) { |
if (($extension eq 'sequence') || ($extension eq 'page')) { |
if (($extension eq 'sequence') || ($extension eq 'page')) { |
$url=~/\Q$coursenum\E\/([\/\w]+)\.\Q$extension\E$/; |
$url=~/\Q$coursenum\E\/([\/\w]+)\.\Q$extension\E$/; |
Line 4223 END
|
Line 4607 END
|
$url='/adm/supplemental?'; |
$url='/adm/supplemental?'; |
} |
} |
} else { |
} else { |
&Apache::lonnet::allowuploaded('/adm/coursedoc',$url); |
$plainurl = $url; |
} |
} |
} |
} |
|
|
Line 4273 END
|
Line 4657 END
|
$nomodal = 1; |
$nomodal = 1; |
} |
} |
} |
} |
my ($checkencrypt,$shownurl); |
my $checkencrypt; |
if (!$env{'request.role.adv'}) { |
if (!$env{'request.role.adv'}) { |
if (((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) || |
if (((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) || |
($isencrypted) || (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i)) { |
($isencrypted) || (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i)) { |
Line 4293 END
|
Line 4677 END
|
my $currenc = $env{'request.enc'}; |
my $currenc = $env{'request.enc'}; |
$env{'request.enc'} = 1; |
$env{'request.enc'} = 1; |
$shownsymb = &Apache::lonenc::encrypted($symb); |
$shownsymb = &Apache::lonenc::encrypted($symb); |
$shownurl = &Apache::lonenc::encrypted($url); |
my $shownurl = &Apache::lonenc::encrypted($url); |
if (&Apache::lonnet::symbverify($symb,$url)) { |
if (&Apache::lonnet::symbverify($symb,$url)) { |
$url = $shownurl; |
$url = $shownurl; |
} else { |
} else { |
Line 4308 END
|
Line 4692 END
|
$url = &Apache::lonnet::clutter($url); |
$url = &Apache::lonnet::clutter($url); |
} |
} |
} |
} |
$shownurl = $url; |
} else { |
|
$url = ''; |
} |
} |
unless ($env{'request.role.adv'}) { |
unless ($env{'request.role.adv'}) { |
if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { |
if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { |
Line 4319 END
|
Line 4704 END
|
$hiddenres = 1; |
$hiddenres = 1; |
} |
} |
} |
} |
if ($url ne '') { |
if (($url ne '') && ($shownsymb ne '')) { |
$url = $shownurl.(($shownurl=~/\?/)?'&':'?').'symb='.&escape($shownsymb); |
$url .= (($url=~/\?/)?'&':'?').'symb='.&escape($shownsymb); |
} |
} |
} |
} |
} elsif ($supplementalflag) { |
} elsif ($supplementalflag) { |
Line 4349 END
|
Line 4734 END
|
} |
} |
$nomodal = 1; |
$nomodal = 1; |
} |
} |
|
} elsif (($uploaded) && ($url ne '/adm/supplemental?') && ($url ne '/adm/coursedocs?')) { |
|
my $embstyle=&Apache::loncommon::fileembstyle($extension); |
|
unless ($embstyle eq 'ssi') { |
|
if (($embstyle eq 'img') |
|
|| ($embstyle eq 'emb') |
|
|| ($embstyle eq 'wrp')) { |
|
$url='/adm/wrapper'.$url; |
|
} elsif ($url !~ /\.(sequence|page)$/) { |
|
$url='/adm/coursedocs/showdoc'.$url; |
|
} |
|
} |
|
} |
|
unless ($allowed && $env{'request.role.adv'}) { |
|
if ($ishidden || (&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { |
|
$hiddenres = 1; |
|
} |
} |
} |
} |
} |
my ($rand_pick_text,$rand_order_text,$hiddenfolder); |
my ($rand_pick_text,$rand_order_text,$hiddenfolder); |
Line 4360 END
|
Line 4761 END
|
if (!$allowed && $supplementalflag) { |
if (!$allowed && $supplementalflag) { |
$folderpath.=$containerarg.'&'.$foldername; |
$folderpath.=$containerarg.'&'.$foldername; |
$url.='folderpath='.&escape($folderpath); |
$url.='folderpath='.&escape($folderpath); |
if (ref($supphidden) eq 'HASH') { |
if ($ishidden || (&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { |
if ($supphidden->{$suppmapid.':'.$residx}) { |
$hiddenfolder = 1; |
$hiddenfolder = 1; |
|
} |
|
} |
} |
} else { |
} else { |
my $rpicknum = (&LONCAPA::map::getparameter($orderidx, |
my $rpicknum = (&LONCAPA::map::getparameter($orderidx, |
Line 4441 $form_common."\n".
|
Line 4840 $form_common."\n".
|
'<span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" id="randomorder_'.$orderidx.'" onclick="checkForSubmit(this.form,'."'randomorder','settings'".');" '.$ro_set.$disabled.' /> '.&mt('Random Order').' </label></span>'. |
'<span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" id="randomorder_'.$orderidx.'" onclick="checkForSubmit(this.form,'."'randomorder','settings'".');" '.$ro_set.$disabled.' /> '.&mt('Random Order').' </label></span>'. |
$form_end; |
$form_end; |
} |
} |
} elsif ($supplementalflag && !$allowed) { |
} elsif ($supplementalflag) { |
my $isexttool; |
my $isexttool; |
if ($url=~m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) { |
if ($url=~m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) { |
$url='/adm/wrapper'.$url; |
$url='/adm/wrapper'.$url; |
Line 4450 $form_end;
|
Line 4849 $form_end;
|
$url .= ($url =~ /\?/) ? '&':'?'; |
$url .= ($url =~ /\?/) ? '&':'?'; |
$url .= 'folderpath='.&HTML::Entities::encode($esc_path,'<>&"'); |
$url .= 'folderpath='.&HTML::Entities::encode($esc_path,'<>&"'); |
if ($title) { |
if ($title) { |
$url .= '&title='.&HTML::Entities::encode($renametitle,'<>&"'); |
$url .= '&title='.$encodedtitle; |
} |
} |
if ((($isexternal) || ($isexttool)) && $orderidx) { |
if ((($isexternal) || ($isexttool)) && $orderidx) { |
$url .= '&idx='.$orderidx; |
$url .= '&idx='.$orderidx; |
Line 4458 $form_end;
|
Line 4857 $form_end;
|
if ($anchor ne '') { |
if ($anchor ne '') { |
$url .= '&anchor='.&HTML::Entities::encode($anchor,'"<>&'); |
$url .= '&anchor='.&HTML::Entities::encode($anchor,'"<>&'); |
} |
} |
if (ref($supphidden) eq 'HASH') { |
|
if ($supphidden->{$suppmapid.':'.$residx}) { |
|
$hiddenres = 1; |
|
} |
|
} |
|
} |
} |
my ($tdalign,$tdwidth); |
my ($tdalign,$tdwidth); |
if ($allowed) { |
if ($allowed) { |
Line 4509 $form_end;
|
Line 4903 $form_end;
|
} else { |
} else { |
$reinit = &mt('(re-initialize course to access)'); |
$reinit = &mt('(re-initialize course to access)'); |
} |
} |
$line.='<td class="LC_docs_entry_commands"'.$tdalign.'><span class="LC_nobreak">'.$editlink.$renamelink; |
$line.='<td class="LC_docs_entry_commands"'.$tdalign.'><span class="LC_nobreak">'.$editlink.$renamelink.'</span>'; |
if ($orig_url =~ /$LONCAPA::assess_re/) { |
if ($orig_url =~ /$LONCAPA::assess_re/) { |
$line.= '<br />'; |
$line.= '<br />'; |
if ($curralias ne '') { |
if ($curralias ne '') { |
Line 4520 $form_end;
|
Line 4914 $form_end;
|
$lt{'sa'}.'</a></span>'; |
$lt{'sa'}.'</a></span>'; |
} |
} |
} |
} |
$line.='</td><td>'; |
$line.='</td><td><span class="LC_nobreak">'; |
my $link; |
my ($link,$nolink); |
if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) { |
if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) { |
$line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>'; |
if ($allowed && !$env{'request.role.adv'} && !$isfolder && !$ispage) { |
|
if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { |
|
$nolink = 1; |
|
} |
|
} |
|
if ($nolink) { |
|
$line .= '<img src="'.$icon.'" alt="" class="LC_icon" /></a>'; |
|
} else { |
|
$line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>'; |
|
} |
} elsif ($url) { |
} elsif ($url) { |
if ($anchor ne '') { |
if ($anchor ne '') { |
if ($supplementalflag) { |
if ($supplementalflag) { |
Line 4532 $form_end;
|
Line 4935 $form_end;
|
$anchor = '#'.&HTML::Entities::encode($anchor,'"<>&'); |
$anchor = '#'.&HTML::Entities::encode($anchor,'"<>&'); |
} |
} |
} |
} |
if ((!$supplementalflag) && ($nomodal) && ($hostname ne '')) { |
if (($nomodal) && ($hostname ne '')) { |
$link = 'http://'.$hostname.$url; |
$link = 'http://'.$hostname.$url; |
} else { |
} else { |
$link = $url; |
$link = $url; |
} |
} |
$link = &js_escape($link.(($url=~/\?/)?'&':'?').'inhibitmenu=yes'.$anchor); |
my $inhibitmenu; |
if ($nomodal) { |
if ((($supplementalflag) && ($allowed) && ($url =~ m{^/adm/wrapper/})) || |
|
(($allowed) && (($url =~ m{^/adm/(viewclasslist|$match_domain/$match_username/aboutme)(\?|$)}) || |
|
($url =~ m{^/public/$match_domain/$match_courseid/syllabus(\?|$)})))) { |
|
$inhibitmenu = 'only_body=1'; |
|
} else { |
|
$inhibitmenu = 'inhibitmenu=yes'; |
|
} |
|
$link = &js_escape($link.(($url=~/\?/)?'&':'?').$inhibitmenu.$anchor); |
|
if ($allowed && !$env{'request.role.adv'} && !$isfolder && !$ispage && !$uploaded) { |
|
if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { |
|
$nolink = 1; |
|
} |
|
} |
|
if ($nolink) { |
|
$line.='<img src="'.$icon.'" alt="" class="LC_icon" />'; |
|
} elsif ($nomodal) { |
$line.='<a href="#" onclick="javascript:window.open('."'$link','syllabuspreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1')".'; return false;" />'. |
$line.='<a href="#" onclick="javascript:window.open('."'$link','syllabuspreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1')".'; return false;" />'. |
'<img src="'.$icon.'" alt="" class="LC_icon" border="0" /></a>'; |
'<img src="'.$icon.'" alt="" class="LC_icon" border="0" /></a>'; |
} else { |
} else { |
Line 4550 $form_end;
|
Line 4968 $form_end;
|
} |
} |
$line.='</span></td><td'.$tdwidth.'>'; |
$line.='</span></td><td'.$tdwidth.'>'; |
if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) { |
if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) { |
$line.='<a href="'.$url.'">'.$title.'</a>'; |
if ($nolink) { |
|
$line.=$title; |
|
} else { |
|
$line.='<a href="'.$url.'">'.$title.'</a>'; |
|
} |
if (!$allowed && $supplementalflag && $canedit && $isfolder) { |
if (!$allowed && $supplementalflag && $canedit && $isfolder) { |
my $editicon = &Apache::loncommon::lonhttpdurl('/res/adm/pages').'/editmap.png'; |
my $editicon = &Apache::loncommon::lonhttpdurl('/res/adm/pages').'/editmap.png'; |
my $editurl = $url; |
my $editurl = $url; |
Line 4563 $form_end;
|
Line 4985 $form_end;
|
$line.= ' <span class="LC_warning">('.&mt('hidden').')</span> '; |
$line.= ' <span class="LC_warning">('.&mt('hidden').')</span> '; |
} |
} |
} elsif ($url) { |
} elsif ($url) { |
if ($nomodal) { |
if ($nolink) { |
|
$line.=$title; |
|
} elsif ($nomodal) { |
$line.='<a href="#" onclick="javascript:window.open('."'$link','syllabuspreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1')".'; return false;" />'. |
$line.='<a href="#" onclick="javascript:window.open('."'$link','syllabuspreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1')".'; return false;" />'. |
$title.'</a>'; |
$title.'</a>'; |
} else { |
} else { |
Line 4582 $form_end;
|
Line 5006 $form_end;
|
$line .= '</td>'; |
$line .= '</td>'; |
$rand_pick_text = ' ' if ($rand_pick_text eq ''); |
$rand_pick_text = ' ' if ($rand_pick_text eq ''); |
$rand_order_text = ' ' if ($rand_order_text eq ''); |
$rand_order_text = ' ' if ($rand_order_text eq ''); |
|
if ($uploaded && $url && !$isfolder && !$ispage) { |
|
if (($plainurl ne '') && ($env{'request.role.adv'} || $allowed || !$hiddenres)) { |
|
&Apache::lonnet::allowuploaded('/adm/coursedoc',$plainurl); |
|
} |
|
} |
if ($allowed) { |
if ($allowed) { |
my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
'hd' => 'Hidden', |
'hd' => 'Hidden', |
Line 4589 $form_end;
|
Line 5018 $form_end;
|
my ($enctext,$hidtext,$formhidden,$formurlhidden); |
my ($enctext,$hidtext,$formhidden,$formurlhidden); |
if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { |
if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { |
$hidtext = ' checked="checked"'; |
$hidtext = ' checked="checked"'; |
if (($ishash) && (ref($filtersref->{'randomorder'}) eq 'ARRAY')) { |
if (($ishash) && (ref($filtersref->{'hiddenresource'}) eq 'ARRAY')) { |
push(@{$filtersref->{'hiddenresource'}},$orderidx); |
push(@{$filtersref->{'hiddenresource'}},$orderidx); |
} |
} |
} |
} |
Line 5463 sub handler {
|
Line 5892 sub handler {
|
'Load_Map','Supplemental','Score_Upload_Form', |
'Load_Map','Supplemental','Score_Upload_Form', |
'Adding_Pages','Importing_LON-CAPA_Resource', |
'Adding_Pages','Importing_LON-CAPA_Resource', |
'Importing_IMS_Course','Uploading_From_Harddrive', |
'Importing_IMS_Course','Uploading_From_Harddrive', |
'Course_Roster','Web_Page','Dropbox','Simple_Problem') { |
'Course_Roster','Web_Page','Dropbox','Simple_Problem', |
|
'Standard_Problem','Course_Resources', |
|
'Search_LON-CAPA_Resource','Import_Stored_Links') { |
$help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic); |
$help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic); |
} |
} |
# Composite help files |
# Composite help files |
Line 5638 sub handler {
|
Line 6069 sub handler {
|
} |
} |
if ($env{'form.forcesupplement'}) { $supplementalflag=1; } |
if ($env{'form.forcesupplement'}) { $supplementalflag=1; } |
if ($env{'form.forcestandard'}) { $supplementalflag=0; } |
if ($env{'form.forcestandard'}) { $supplementalflag=0; } |
unless ($allowed) { $supplementalflag=1; } |
unless (($supplementalflag) || |
unless ($standard) { $supplementalflag=1; } |
($r->uri =~ m{^/adm/coursedocs/showdoc/uploaded/\Q$coursedom\E/\Q$coursenum\E/docs/})) { |
|
unless ($allowed) { $supplementalflag=1; } |
|
unless ($standard) { $supplementalflag=1; } |
|
} |
my $toolsflag=0; |
my $toolsflag=0; |
if ($env{'form.tools'}) { $toolsflag=1; } |
if ($env{'form.tools'}) { $toolsflag=1; } |
|
|
if ($env{'form.folderpath'} ne '') { |
if ($env{'form.folderpath'} ne '') { |
&validate_folderpath($supplementalflag); |
&Apache::loncommon::validate_folderpath($supplementalflag,$allowed,$coursenum,$coursedom); |
} |
} |
|
|
|
my $backto_supppath; |
if ($env{'form.supppath'} ne '') { |
if ($env{'form.supppath'} ne '') { |
&validate_suppath(); |
if ($supplementalflag && $allowed) { |
|
$backto_supppath = &validate_supppath($coursenum,$coursedom); |
|
} |
} |
} |
|
|
my $script=''; |
my $script=''; |
Line 5658 sub handler {
|
Line 6095 sub handler {
|
my $containertag; |
my $containertag; |
my $pathitem; |
my $pathitem; |
my %ltitools; |
my %ltitools; |
|
my $posslti; |
my $hiddentop; |
my $hiddentop; |
my $navmap; |
my $navmap; |
my $filterFunc = sub { my $res = shift; return (!$res->randomout() && !$res->is_map()) }; |
my $filterFunc = sub { my $res = shift; return (!$res->randomout() && !$res->is_map()) }; |
Line 5669 sub handler {
|
Line 6107 sub handler {
|
&Apache::loncommon::symb_to_docspath($env{'form.symb'},\$navmap); |
&Apache::loncommon::symb_to_docspath($env{'form.symb'},\$navmap); |
&Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => |
&Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => |
$env{'form.command'}.'_'.$env{'form.symb'}}); |
$env{'form.command'}.'_'.$env{'form.symb'}}); |
} elsif ($env{'form.supppath'} ne '') { |
} elsif (($env{'form.supppath'} ne '') && $supplementalflag && $allowed) { |
$env{'form.folderpath'}=$env{'form.supppath'}; |
$env{'form.folderpath'}=$env{'form.supppath'}; |
&Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => |
&Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => |
$env{'form.command'}.'_'.$env{'form.supppath'}}); |
$env{'form.command'}.'_'.$backto_supppath}); |
} |
} |
} elsif ($env{'form.command'} eq 'editdocs') { |
} elsif ($env{'form.command'} eq 'editdocs') { |
$env{'form.folderpath'} = &default_folderpath($coursenum,$coursedom,\$navmap); |
$env{'form.folderpath'} = &default_folderpath($coursenum,$coursedom,\$navmap); |
Line 5708 sub handler {
|
Line 6146 sub handler {
|
undef($env{'form.folderpath'}); |
undef($env{'form.folderpath'}); |
} |
} |
if ($env{'form.folderpath'} ne '') { |
if ($env{'form.folderpath'} ne '') { |
&validate_folderpath($supplementalflag); |
&Apache::loncommon::validate_folderpath($supplementalflag,$allowed,$coursenum,$coursedom); |
} |
} |
} |
} |
|
|
# If we are not allowed to make changes, all we can see are supplemental docs |
# Set folderpath if we are not allowed to make changes and this is supplemental content |
if (!$allowed) { |
if ((!$allowed) && ($supplementalflag)) { |
unless ($env{'form.folderpath'} =~ /^supplemental/) { |
unless ($env{'form.folderpath'} =~ /^supplemental/) { |
$env{'form.folderpath'} = &supplemental_base(); |
$env{'form.folderpath'} = &supplemental_base(); |
} |
} |
Line 5724 sub handler {
|
Line 6162 sub handler {
|
.'&'. |
.'&'. |
$env{'form.folderpath'}; |
$env{'form.folderpath'}; |
} |
} |
# If allowed and user's role is not advanced check folderpath is not hidden |
# If allowed and user's role is not advanced check folderpath is not hidden |
if (($allowed) && (!$env{'request.role.adv'}) && |
my $hidden_and_empty; |
($env{'form.folderpath'} ne '') && (!$supplementalflag)) { |
if (($allowed) && (!$env{'request.role.adv'}) && ($env{'form.folderpath'} ne '')) { |
my $folderurl; |
my ($folderurl,$foldername,$hiddenfolder); |
my @pathitems = split(/\&/,$env{'form.folderpath'}); |
my @pathitems = split(/\&/,$env{'form.folderpath'}); |
my $folder = $pathitems[-2]; |
my $folder = $pathitems[-2]; |
if ($folder eq '') { |
if ($folder eq '') { |
Line 5739 sub handler {
|
Line 6177 sub handler {
|
} else { |
} else { |
$folderurl .= '.sequence'; |
$folderurl .= '.sequence'; |
} |
} |
unless (ref($navmap)) { |
if ($supplementalflag) { |
$navmap = Apache::lonnavmaps::navmap->new(); |
($foldername,$hiddenfolder) = ($pathitems[-1] =~ /^([^:]*)::(|1):::$/); |
} |
$foldername = &HTML::Entities::decode(&unescape($foldername)); |
if (ref($navmap)) { |
my ($supplemental) = &Apache::loncommon::get_supplemental($coursenum,$coursedom); |
if (lc($navmap->get_mapparam(undef,$folderurl,"0.hiddenresource")) eq 'yes') { |
if (ref($supplemental) eq 'HASH') { |
my @resources = $navmap->retrieveResources($folderurl,$filterFunc,1,1); |
my ($suppmap,$suppmapnum); |
unless (@resources) { |
if ($folder eq 'supplemental') { |
undef($env{'form.folderpath'}); |
$suppmap = 'default'; |
|
$suppmapnum = 0; |
|
} elsif ($folder =~ /^supplemental_(\d+)$/) { |
|
$suppmap = $1; |
|
$suppmapnum = $suppmap; |
|
} |
|
if ($hiddenfolder) { |
|
my $hascontent; |
|
foreach my $key (reverse(sort(keys(%{$supplemental->{'ids'}})))) { |
|
if ($key =~ m{^\Q/uploaded/$coursedom/$coursenum/supplemental/$suppmap/\E}) { |
|
$hascontent = 1; |
|
} elsif (ref($supplemental->{'ids'}->{$key}) eq 'ARRAY') { |
|
foreach my $id (@{$supplemental->{'ids'}->{$key}}) { |
|
if ($id =~ /^$suppmapnum\:/) { |
|
$hascontent = 1; |
|
last; |
|
} |
|
} |
|
} |
|
last if ($hascontent); |
|
} |
|
unless ($hascontent) { |
|
if ($foldername ne '') { |
|
$hidden_and_empty = $foldername; |
|
} else { |
|
$hidden_and_empty = $folder; |
|
} |
|
} |
|
} |
|
} |
|
} else { |
|
unless (ref($navmap)) { |
|
$navmap = Apache::lonnavmaps::navmap->new(); |
|
} |
|
($foldername,$hiddenfolder) = ($pathitems[-1] =~ /^([^:]*):|\d+:|1:(|1):|1:|1$/); |
|
$foldername = &HTML::Entities::decode(&unescape($foldername)); |
|
if (ref($navmap)) { |
|
if ($hiddenfolder || |
|
(lc($navmap->get_mapparam(undef,$folderurl,"0.hiddenresource")) eq 'yes')) { |
|
my @resources = $navmap->retrieveResources($folderurl,$filterFunc,1,1); |
|
unless (@resources) { |
|
if ($foldername ne '') { |
|
$hidden_and_empty = $foldername; |
|
} else { |
|
$hidden_and_empty = $folder; |
|
} |
|
} |
} |
} |
} |
} |
} |
} |
|
if ($hidden_and_empty ne '') { |
|
splice(@pathitems,-2); |
|
if (@pathitems) { |
|
$env{'form.folderpath'} = join('&',@pathitems); |
|
} else { |
|
undef($env{'form.folderpath'}); |
|
} |
|
} |
} |
} |
} |
} |
|
|
|
|
# If after all of this, we still don't have any paths, make them |
# If after all of this, we still don't have any paths, make them |
unless ($env{'form.folderpath'}) { |
unless ($env{'form.folderpath'}) { |
if ($supplementalflag) { |
if ($supplementalflag) { |
Line 5838 sub handler {
|
Line 6329 sub handler {
|
} |
} |
} |
} |
my $tabidstr = join("','",@tabids); |
my $tabidstr = join("','",@tabids); |
%ltitools = &Apache::lonnet::get_domain_lti($coursedom,'consumer'); |
my (%domtools,%crstools); |
my $posslti = keys(%ltitools); |
my %tooltypes = &Apache::loncommon::usable_exttools(); |
|
if ($tooltypes{'dom'}) { |
|
%domtools = &Apache::lonnet::get_domain_lti($coursedom,'consumer'); |
|
} |
|
if ($tooltypes{'crs'}) { |
|
%crstools = &Apache::lonnet::get_course_lti($coursenum,$coursedom,'consumer'); |
|
} |
|
%ltitools = ( |
|
dom => \%domtools, |
|
crs => \%crstools, |
|
); |
|
$posslti = scalar(keys(%domtools)) + scalar(keys(%crstools)); |
my $hostname = $r->hostname(); |
my $hostname = $r->hostname(); |
$script .= &editing_js($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti, |
$script .= &editing_js($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti, |
$londocroot,$canedit,$hostname,\$navmap). |
$londocroot,$canedit,$hostname,\$navmap). |
Line 5847 sub handler {
|
Line 6349 sub handler {
|
&inject_data_js(). |
&inject_data_js(). |
&Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr,$tid). |
&Apache::lonhtmlcommon::resize_scrollbox_js('docs',$tabidstr,$tid). |
&Apache::lonextresedit::extedit_javascript(\%ltitools); |
&Apache::lonextresedit::extedit_javascript(\%ltitools); |
|
my $onload = "javascript:resize_scrollbox('contentscroll','1','1');"; |
|
if ($hidden_and_empty ne '') { |
|
my $alert = &mt("Additional privileges required to edit empty and hidden folder: '[_1]'", |
|
$hidden_and_empty); |
|
$onload .= "javascript:alert('".&js_escape($alert)."');"; |
|
} |
$addentries = { |
$addentries = { |
onload => "javascript:resize_scrollbox('contentscroll','1','1');", |
onload => $onload, |
}; |
}; |
} |
} |
$script .= &paste_popup_js(); |
$script .= &paste_popup_js(); |
Line 5872 sub handler {
|
Line 6380 sub handler {
|
if ($showdoc) { |
if ($showdoc) { |
my $args; |
my $args; |
if ($supplementalflag) { |
if ($supplementalflag) { |
my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$env{'form.title'},1); |
my $title = &HTML::Entities::encode($env{'form.title'},'\'"<>&'); |
$args = {'bread_crumbs' => $brcrum}; |
my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); |
|
$args = {'bread_crumbs' => $brcrum, |
|
'bread_crumbs_nomenu' => 1}; |
} else { |
} else { |
$args = {'force_register' => $showdoc}; |
$args = {'force_register' => $showdoc}; |
} |
} |
Line 5902 sub handler {
|
Line 6412 sub handler {
|
} |
} |
} |
} |
my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype); |
my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype); |
|
my $args = {'bread_crumbs' => $brcrum}; |
|
unless (($env{'form.folderpath'} eq '') || |
|
($env{'form.folder'} eq 'supplemental')) { |
|
$args->{'bread_crumbs_nomenu'} = 1; |
|
} |
$r->print(&Apache::loncommon::start_page("Supplemental $crstype Content",undef, |
$r->print(&Apache::loncommon::start_page("Supplemental $crstype Content",undef, |
{'bread_crumbs' => $brcrum,})); |
$args)); |
} else { |
} else { |
my ($breadtext,$breadtitle,$helpitem); |
my ($breadtext,$breadtitle,$helpitem); |
$breadtext = "$crstype Editor"; |
$breadtext = "$crstype Editor"; |
Line 5931 sub handler {
|
Line 6446 sub handler {
|
my %codebase = (); |
my %codebase = (); |
my ($upload_result,$upload_output,$uploadphase); |
my ($upload_result,$upload_output,$uploadphase); |
if ($canedit) { |
if ($canedit) { |
|
undef($suppchanges); |
if (($env{'form.uploaddoc.filename'}) && |
if (($env{'form.uploaddoc.filename'}) && |
($env{'form.cmd'}=~/^upload_(\w+)/)) { |
($env{'form.cmd'}=~/^upload_(\w+)/)) { |
my $context = $1; |
my $context = $1; |
Line 5942 sub handler {
|
Line 6458 sub handler {
|
if ($hadchanges) { |
if ($hadchanges) { |
&mark_hash_old(); |
&mark_hash_old(); |
} |
} |
|
if ($suppchanges) { |
|
&Apache::lonnet::update_supp_caches($coursedom,$coursenum); |
|
undef($suppchanges); |
|
} |
$r->print($upload_output); |
$r->print($upload_output); |
} elsif ($env{'form.phase'} eq 'upload_embedded') { |
} elsif ($env{'form.phase'} eq 'upload_embedded') { |
# Process file upload - phase two - upload embedded objects |
# Process file upload - phase two - upload embedded objects |
Line 5983 sub handler {
|
Line 6503 sub handler {
|
|
|
if ($allowed && $toolsflag) { |
if ($allowed && $toolsflag) { |
$r->print(&startContentScreen('tools')); |
$r->print(&startContentScreen('tools')); |
$r->print(&generate_admin_menu($crstype,$canedit)); |
$r->print(&generate_admin_menu($crstype,$canedit,$coursenum,$coursedom)); |
$r->print(&endContentScreen()); |
$r->print(&endContentScreen()); |
} elsif ((!$showdoc) && (!$uploadphase)) { |
} elsif ((!$showdoc) && (!$uploadphase)) { |
# ----------------------------------------------------------------------------- |
# ----------------------------------------------------------------------------- |
Line 5991 sub handler {
|
Line 6511 sub handler {
|
'copm' => 'All documents out of a published map into this folder', |
'copm' => 'All documents out of a published map into this folder', |
'upfi' => 'Upload File', |
'upfi' => 'Upload File', |
'upld' => 'Upload Content', |
'upld' => 'Upload Content', |
'srch' => 'Search', |
'srch' => 'Search Repository', |
'impo' => 'Import', |
'impo' => 'Import from Repository', |
'lnks' => 'Import from Stored Links', |
'lnks' => 'Import from Stored Links', |
'impm' => 'Import from Assembled Map', |
'impm' => 'Import from Assembled Map', |
'imcr' => 'Import from Course Resources', |
'imcr' => 'Import from Course Resources', |
Line 6010 sub handler {
|
Line 6530 sub handler {
|
'stpr' => 'Standard Problem', |
'stpr' => 'Standard Problem', |
'news' => 'New sub-directory', |
'news' => 'New sub-directory', |
'crpr' => 'Create Problem', |
'crpr' => 'Create Problem', |
|
'swit' => 'Switch Server', |
'drbx' => 'Drop Box', |
'drbx' => 'Drop Box', |
'scuf' => 'External Scores (handgrade, upload, clicker)', |
'scuf' => 'External Scores (handgrade, upload, clicker)', |
'bull' => 'Discussion Board', |
'bull' => 'Discussion Board', |
Line 6030 sub handler {
|
Line 6551 sub handler {
|
'dire' => 'Directory:', |
'dire' => 'Directory:', |
'cate' => 'Category:', |
'cate' => 'Category:', |
'tmpl' => 'Template:', |
'tmpl' => 'Template:', |
|
'empd' => 'No resources found', |
'comment' => 'Comment', |
'comment' => 'Comment', |
'parse' => 'Upload embedded images/multimedia files if HTML file', |
'parse' => 'Upload embedded images/multimedia files if HTML file', |
'bb5' => 'Blackboard 5', |
'bb5' => 'Blackboard 5', |
Line 6079 sub handler {
|
Line 6601 sub handler {
|
my $fileupload=(<<FIUP); |
my $fileupload=(<<FIUP); |
$quotainfo |
$quotainfo |
$lt{'file'}:<br /> |
$lt{'file'}:<br /> |
<input type="file" name="uploaddoc" class="LC_flUpload" size="40" $disabled /> |
|
<input type="hidden" id="LC_free_space" value="$free_space" /> |
|
FIUP |
FIUP |
|
|
my $checkbox=(<<CHBO); |
my $checkbox=(<<CHBO); |
<!-- <label>$lt{'parse'}? |
<!-- <label>$lt{'parse'}? |
<input type="checkbox" name="parserflag" /> |
<input type="checkbox" name="parserflag" /> |
Line 6102 CHBO
|
Line 6621 CHBO
|
<fieldset id="uploadimsform" style="display: none;"> |
<fieldset id="uploadimsform" style="display: none;"> |
<legend>$lt{'imsf'}</legend> |
<legend>$lt{'imsf'}</legend> |
$fileupload |
$fileupload |
|
<input type="file" name="uploaddoc" id="uploaddocims" class="LC_flUpload LC_uploaddoc" size="40" $disabled /> |
|
<input type="hidden" id="LC_free_space_ims" value="$free_space" /> |
<br /> |
<br /> |
<p> |
<p> |
$lt{'cms'}: |
$lt{'cms'}: |
Line 6128 IMSFORM
|
Line 6649 IMSFORM
|
<legend>$lt{'upfi'}</legend> |
<legend>$lt{'upfi'}</legend> |
<input type="hidden" name="active" value="aa" /> |
<input type="hidden" name="active" value="aa" /> |
$fileupload |
$fileupload |
|
<input type="file" name="uploaddoc" class="LC_flUpload" size="40" $disabled /> |
|
<input type="hidden" id="LC_free_space" value="$free_space" /> |
<br /> |
<br /> |
$lt{'title'}:<br /> |
$lt{'title'}:<br /> |
<input type="text" size="60" name="comment" $disabled /> |
<input type="text" size="60" name="comment" $disabled /> |
Line 6166 FUFORM
|
Line 6689 FUFORM
|
</form> |
</form> |
|
|
SEDFFORM |
SEDFFORM |
my $importcrsresform; |
my ($importcrsresform,$checkcrsres); |
my ($numdirs,$pickfile) = |
if ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.crsauthor'}) { |
&Apache::loncommon::import_crsauthor_form('crsresimportform','coursepath','coursefile', |
$checkcrsres = 1; |
"resize_scrollbox('contentscroll','1','0');", |
} elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.crsauthor'} ne '0') { |
undef,'res'); |
my %domdefs=&Apache::lonnet::get_domain_defaults($coursedom); |
if ($pickfile) { |
if ($domdefs{'crsauthor'}) { |
$importcrsresform=(<<CRSFORM); |
$checkcrsres = 1; |
<a class="LC_menubuttons_link" href="javascript:toggleImportCrsres('res','$numdirs');"> |
} |
|
} |
|
if ($checkcrsres) { |
|
my ($numdirs,$pickfile) = |
|
&Apache::loncommon::import_crsauthor_form('coursepath','coursefile', |
|
"resize_scrollbox('contentscroll','1','0');", |
|
undef,'res'); |
|
if ($pickfile) { |
|
$importcrsresform=(<<CRSFORM); |
|
<a class="LC_menubuttons_link" href="javascript:toggleImportCrsres('res');"> |
$lt{'imcr'}</a>$help{'Course_Resources'} |
$lt{'imcr'}</a>$help{'Course_Resources'} |
<form action="/adm/coursedocs" method="post" name="crsresimportform" onsubmit="return validImportCrsRes();"> |
<form action="/adm/coursedocs" method="post" name="crsresimportform" onsubmit="return validImportCrsRes();"> |
<fieldset id="importcrsresform" style="display: none;"> |
<fieldset id="importcrsresform" style="display: none;"> |
<legend>$lt{'imcr'}</legend> |
<legend>$lt{'imcr'}</legend> |
|
<div id="importcrsrescontent" style="display: none;"> |
<input type="hidden" name="active" value="bb" /> |
<input type="hidden" name="active" value="bb" /> |
$pickfile |
$pickfile |
<p> |
<p> |
$lt{'title'}: <input type="textbox" name="crsrestitle" value="" $disabled /> |
$lt{'title'}: <input type="text" name="crsrestitle" value="" $disabled /> |
</p> |
</p> |
<input type="hidden" name="importdetail" value="" /> |
<input type="hidden" name="importdetail" value="" /> |
<input type="submit" name="crsres" value="$lt{'impo'}" $disabled /> |
<input type="submit" name="crsres" value="$lt{'impo'}" $disabled /><br /> |
|
</div> |
|
<div id="importcrsresempty" style="display: none;"> |
|
<p> |
|
$lt{'empd'} |
|
</p> |
|
</div> |
</fieldset> |
</fieldset> |
</form> |
</form> |
CRSFORM |
CRSFORM |
|
} |
} |
} |
|
|
my $fromstoredjs; |
my $fromstoredjs; |
Line 6198 CRSFORM
|
Line 6738 CRSFORM
|
} |
} |
|
|
my @importpubforma = ( |
my @importpubforma = ( |
{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'" onclick="javascript:groupsearch()" />' => $pathitem."<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" }, |
{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'" onclick="javascript:groupsearch()" />' => $pathitem."<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>$help{'Search_LON-CAPA_Resource'}" }, |
{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'" onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" }, |
{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'" onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" }, |
{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{lnks}.'" onclick="javascript:'.$fromstoredjs.';" />' => '<a class="LC_menubuttons_link" href="javascript:'.$fromstoredjs.';">'.$lt{'lnks'}.'</a>' }, |
{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{lnks}.'" onclick="javascript:'.$fromstoredjs.';" />' => '<a class="LC_menubuttons_link" href="javascript:'.$fromstoredjs.';">'.$lt{'lnks'}.'</a>'.$help{'Import_Stored_Links'} }, |
{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/sequence.png" alt="'.$lt{impm}.'" onclick="javascript:toggleMap(\'map\');" />' => $importpubform }, |
{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/sequence.png" alt="'.$lt{impm}.'" onclick="javascript:toggleMap(\'map\');" />' => $importpubform }, |
); |
); |
if ($pickfile) { |
if ($importcrsresform) { |
push(@importpubforma,{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{imcr}.'" onclick="javascript:toggleImportCrsres(\'res\','."'$numdirs'".');"/>' => $importcrsresform}); |
push(@importpubforma,{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/impcrsau.png" alt="'.$lt{imcr}.'" onclick="javascript:toggleImportCrsres(\'res\');" />' => $importcrsresform}); |
} |
} |
$importpubform = &create_form_ul(&create_list_elements(@importpubforma)); |
$importpubform = &create_form_ul(&create_list_elements(@importpubforma)); |
my $extresourcesform = |
my $extresourcesform = |
Line 6404 NROSTFORM
|
Line 6944 NROSTFORM
|
$help{'Web_Page'} |
$help{'Web_Page'} |
</form> |
</form> |
NWEBFORM |
NWEBFORM |
|
my $showpath = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); |
my @ids=&Apache::lonnet::current_machine_ids(); |
my @ids=&Apache::lonnet::current_machine_ids(); |
my %select_menus; |
my $machines_str = "'".join("','",@ids)."'"; |
my $numauthor = 0; |
my (%is_home,%toppath,$rolehomes); |
my $numcrsdirs = 0; |
|
my $toppath = "/priv/$env{'user.domain'}/$env{'user.name'}"; |
|
if ($env{'user.author'}) { |
if ($env{'user.author'}) { |
$numauthor ++; |
|
$select_menus{'author'}->{'text'} = &Apache::lonnet::plaintext('au'); |
|
if (grep(/^\Q$env{'user.home'}\E$/,@ids)) { |
if (grep(/^\Q$env{'user.home'}\E$/,@ids)) { |
my $is_home = 1; |
$is_home{'author'} = 1; |
my %subdirs; |
|
&Apache::lonnet::recursedirs($is_home,'priv',$londocroot,$toppath,'',\%subdirs); |
|
$select_menus{'author'}->{'default'} = '/'; |
|
$select_menus{'author'}->{'select2'}->{'/'} = '/'; |
|
my @ordered = ('/'); |
|
foreach my $relpath (sort { lc($a) cmp lc($b) } (keys(%subdirs))) { |
|
$select_menus{'author'}->{'select2'}->{$relpath} = $relpath; |
|
push(@ordered,$relpath); |
|
} |
|
$select_menus{'author'}->{'order'} = \@ordered; |
|
} else { |
|
$select_menus{'author'}->{'select2'}->{'switch'} = &mt('Switch server required'); |
|
$select_menus{'author'}->{'default'} = 'switch'; |
|
$select_menus{'author'}->{'order'} = ['switch']; |
|
} |
} |
|
$rolehomes = '<input type="hidden" id="rolehome_author" name="rolehome_author" value="'.$env{'user.home'}.'" />'."\n"; |
} |
} |
my %roleshash = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},'userroles', |
my %roleshash = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},'userroles', |
['active'],['ca','aa']); |
['active'],['ca','aa']); |
my $crshome = $env{'course.'.$env{'request.course.id'}.'.home'}; |
|
my %by_roletype; |
my %by_roletype; |
if (keys(%roleshash)) { |
if (keys(%roleshash)) { |
foreach my $entry (keys(%roleshash)) { |
foreach my $entry (keys(%roleshash)) { |
my ($auname,$audom,$roletype) = split(/:/,$entry); |
my ($auname,$audom,$roletype) = split(/:/,$entry); |
my $key = $entry; |
my $key = $entry; |
$key =~ s/:/___/g; |
$key =~ s/:/___/g; |
$by_roletype{$roletype}{$auname.'___'.$audom} = 1; |
my $author = $auname.'___'.$audom; |
$select_menus{$key}->{'text'} = &Apache::lonnet::plaintext($roletype)." ($audom/$auname)"; |
$by_roletype{$roletype}{$author} = 1; |
my $rolehome = &Apache::lonnet::homeserver($auname,$audom); |
my $rolehome = &Apache::lonnet::homeserver($auname,$audom); |
if (grep(/^\Q$rolehome\E$/,@ids)) { |
$toppath{$author} = "/priv/$audom/$auname"; |
my $is_home = 1; |
if (grep(/^\Q$rolehome\E$/,@ids)) { |
my (%subdirs,@ordered); |
$is_home{$author} = 1; |
my $toppath="/priv/$audom/$auname"; |
|
&Apache::lonnet::recursedirs($is_home,'priv',$londocroot,$toppath,'',\%subdirs); |
|
$select_menus{$key}->{'default'} = '/'; |
|
$select_menus{$key}->{'select2'}->{'/'} = '/'; |
|
my @ordered = ('/'); |
|
foreach my $relpath (sort { lc($a) cmp lc($b) } (keys(%subdirs))) { |
|
$select_menus{$key}->{'select2'}->{$relpath} = $relpath; |
|
push(@ordered,$relpath); |
|
} |
|
$select_menus{$key}->{'order'} = \@ordered; |
|
} else { |
|
$select_menus{$key}->{'select2'}->{'switch'} = &mt('Switch server required'); |
|
$select_menus{$key}->{'default'} = 'switch'; |
|
$select_menus{$key}->{'order'} = ['switch']; |
|
} |
|
$numauthor ++; |
|
} |
|
} |
|
my ($pickdir,$showtitle); |
|
if ($numauthor) { |
|
my @order; |
|
my $defrole; |
|
if ($env{'user.author'}) { |
|
push(@order,'author'); |
|
$defrole = 'author'; |
|
} |
|
if (keys(%by_roletype)) { |
|
foreach my $possrole ('ca','aa') { |
|
if (ref($by_roletype{$possrole}) eq 'HASH') { |
|
foreach my $author (sort { lc($a) cmp lc($b) } (keys(%{$by_roletype{$possrole}}))) { |
|
unless ($defrole) { |
|
$defrole = $author; |
|
} |
|
push(@order,$author.'___'.$possrole); |
|
} |
|
} |
|
} |
} |
|
$rolehomes .= '<input type="hidden" id="rolehome_coauthor_'.$roletype.'_'.$audom.'/'.$auname.'" '. |
|
'name="rolehome_coauthor" value="'.$roletype.'='.$audom.'/'.$auname.'='.$rolehome.'" />'."\n"; |
} |
} |
$select_menus{'course'}->{'text'} = &mt('Course Resource'); |
} |
if (grep(/^\Q$crshome\E$/,@ids)) { |
my $crshome = $env{'course.'.$env{'request.course.id'}.'.home'}; |
my $is_home = 1; |
if (grep(/^\Q$crshome\E$/,@ids)) { |
my %subdirs; |
$is_home{'course'} = 1; |
my $toppath="/priv/$coursedom/$coursenum"; |
} |
&Apache::lonnet::recursedirs($is_home,'priv',$londocroot,$toppath,'',\%subdirs); |
$rolehomes .= '<input type="hidden" id="rolehome_course" name="rolehome_course" value="'.$crshome.'" />'."\n"; |
$numcrsdirs = keys(%subdirs); |
my $pickdir = $lt{'loca'}. |
$select_menus{'course'}->{'default'} = '/'; |
'<select name="authorrole" onchange="populateDirSelects(this.form,'."'authorrole','authorpath'".',1,1,0);">'."\n". |
$select_menus{'course'}->{'select2'}->{'/'} = '/'; |
'<option value="" selected="selected">'.&mt('Select').'</option>'."\n"; |
my @ordered = ('/'); |
if ($env{'user.author'}) { |
foreach my $relpath (sort { lc($a) cmp lc($b) } (keys(%subdirs))) { |
$pickdir .= '<option value="author">'.&Apache::lonnet::plaintext('au').'</option>'."\n"; |
$select_menus{'course'}->{'select2'}->{$relpath} = $relpath; |
} |
push(@ordered,$relpath); |
if (keys(%by_roletype)) { |
} |
foreach my $possrole ('ca','aa') { |
$select_menus{'course'}->{'order'} = \@ordered; |
if (ref($by_roletype{$possrole}) eq 'HASH') { |
} else { |
my $roletitle = &Apache::lonnet::plaintext($possrole); |
$select_menus{'course'}->{'select2'}->{'switch'} = &mt('Switch server required'); |
foreach my $author (sort { lc($a) cmp lc($b) } (keys(%{$by_roletype{$possrole}}))) { |
$select_menus{'course'}->{'default'} = 'switch'; |
my ($none,$where,$auname,$audom) = split(/\//,$toppath{$author}); |
$select_menus{'course'}->{'order'} = ['switch']; |
$pickdir .= '<option value="'.$author.'___'.$possrole.'">'. |
} |
$roletitle." ($audom/$auname)</option>\n"; |
push(@order,'course'); |
|
$pickdir = $lt{'loca'}. |
|
&Apache::loncommon::linked_select_forms('courseresform','<br />'.$lt{'dire'}, |
|
$defrole,'authorrole','authorpath', |
|
\%select_menus,\@order,'toggleCrsResTitle();', |
|
'','priv').'<br />'; |
|
$showtitle = 'none'; |
|
} else { |
|
my $is_home; |
|
$showtitle = 'inline'; |
|
if (grep(/^\Q$crshome\E$/,@ids)) { |
|
$is_home = 1; |
|
$pickdir .= '<input type="hidden" name="authorrole" value="course" />'; |
|
my $toppath="/priv/$coursedom/$coursenum'}"; |
|
my %subdirs; |
|
&Apache::lonnet::recursedirs($is_home,'priv',$londocroot,$toppath,'',\%subdirs); |
|
$numcrsdirs = keys(%subdirs); |
|
if ($numcrsdirs) { |
|
$pickdir .= &mt('Directory: ').'<select name="authorpath">'."\n". |
|
'<option value="/">/</option>'."\n"; |
|
foreach my $key (sort { lc($a) cmp lc($b) } (keys(%subdirs))) { |
|
$pickdir .= '<option value="'.$key.'">'.$key.'</option>'."\n"; |
|
} |
} |
$pickdir .= '</select>'; |
|
} else { |
|
$pickdir .= '<input type="hidden" name="authorpath" value="/" />'."\n"; |
|
} |
} |
} |
} |
} |
} |
|
if ($checkcrsres) { |
|
$pickdir .= '<option value="course">'.&mt('Course Resource').'</option>'."\n"; |
|
} |
|
$pickdir .= '</select><br />'."\n". |
|
$lt{'dire'}. |
|
'<select name="authorpath" onchange="toggleCrsResTitle();">'. |
|
'<option value=""></option>'. |
|
'</select><br />'."\n"; |
my %seltemplate_menus; |
my %seltemplate_menus; |
my @files = &Apache::lonhomework::get_template_list('problem'); |
my @files = &Apache::lonhomework::get_template_list('problem'); |
my @noexamplelink = ('blank.problem','blank.library','script.library'); |
my @noexamplelink = ('blank.problem','blank.library','script.library'); |
Line 6573 NWEBFORM
|
Line 7043 NWEBFORM
|
"resize_scrollbox('contentscroll','1','0');", |
"resize_scrollbox('contentscroll','1','0');", |
"toggleExampleText();",'template').'<br />'; |
"toggleExampleText();",'template').'<br />'; |
my $templatepreview = '<a href="#" target="sample" onclick="javascript:getExample(600,420,\'yes\',true); return false;">'. |
my $templatepreview = '<a href="#" target="sample" onclick="javascript:getExample(600,420,\'yes\',true); return false;">'. |
'<span id="newresexample">'.&mt('Example').'<span></a>'; |
'<span id="newresexample">'.&mt('Example').'</span></a>'; |
my $crsresform=(<<RESFORM); |
my $crsresform; |
<a class="LC_menubuttons_link" href="javascript:toggleCrsRes('res','$numauthor','$numcrsdirs');"> |
if (($env{'user.author'}) || ($checkcrsres)) { |
$lt{'stpr'}</a>$help{'Course_Resource'} |
$crsresform=(<<RESFORM); |
|
<a class="LC_menubuttons_link" href="javascript:toggleCrsRes('res');"> |
|
$lt{'stpr'}</a>$help{'Standard_Problem'} |
<form action="/adm/coursedocs" method="post" name="courseresform"> |
<form action="/adm/coursedocs" method="post" name="courseresform"> |
<fieldset id="crsresform" style="display:none;"> |
<fieldset id="crsresform" style="display:none;"> |
<legend>$lt{'stpr'}</legend> |
<legend>$lt{'stpr'}</legend> |
<input type="hidden" name="active" value="bb" /> |
<input type="hidden" name="active" value="bb" /> |
<p> |
<p> |
$pickdir |
$pickdir |
|
</p> |
|
<div id="newstdproblem" style="display:none;"> |
|
<p> |
<span class="LC_nobreak">$lt{'news'}? |
<span class="LC_nobreak">$lt{'news'}? |
<label><input type="radio" name="newsubdir" value="0" onclick="toggleNewsubdir(this.form);" checked="checked" $disabled />No</label> |
<label><input type="radio" name="newsubdir" value="0" onclick="toggleNewsubdir(this.form);" checked="checked" $disabled />No</label> |
|
|
Line 6590 NWEBFORM
|
Line 7065 NWEBFORM
|
</span><span id="newsubdir"></span> |
</span><span id="newsubdir"></span> |
<input type="hidden" name="newsubdirname" id="newsubdirname" value="" autocomplete="off" /> |
<input type="hidden" name="newsubdirname" id="newsubdirname" value="" autocomplete="off" /> |
</p> |
</p> |
|
</div> |
$lt{'fnam'} |
$lt{'fnam'} |
<input type="text" size="20" name="newresourcename" autocomplete="off" $disabled /> |
<input type="text" size="20" name="newresourcename" autocomplete="off" $disabled /> |
|
<div id="newresource" style="display:none"> |
<p> |
<p> |
<div id="newresource" style="display:$showtitle"> |
|
$lt{'addp'} |
$lt{'addp'} |
<label><input type="radio" name="newresourceadd" value="0" checked="checked" onclick="toggleNewInCourse(this.form);" $disabled /> |
<label><input type="radio" name="newresourceadd" value="0" checked="checked" onclick="toggleNewInCourse(this.form);" $disabled /> |
$lt{'no'}</label> |
$lt{'no'}</label> |
Line 6601 NWEBFORM
|
Line 7077 NWEBFORM
|
$lt{'yes'}</label> |
$lt{'yes'}</label> |
<span id="newrestitle"></span> |
<span id="newrestitle"></span> |
<input type="hidden" size="20" name="newresourcetitle" id="newresourcetitle" autocomplete="off" $disabled /> |
<input type="hidden" size="20" name="newresourcetitle" id="newresourcetitle" autocomplete="off" $disabled /> |
</div> |
|
</p> |
</p> |
|
</div> |
<p> |
<p> |
$lt{'uste'} |
$lt{'uste'} |
<label><input type="radio" name="newresusetemp" value="0" checked="checked" onclick="toggleWithTemplate(this.form);" $disabled /> |
<label><input type="radio" name="newresusetemp" value="0" checked="checked" onclick="toggleWithTemplate(this.form);" $disabled /> |
$lt{'no'}</label> |
$lt{'no'}</label> |
<label><input type="radio" name="newresusetemp" value="1" onclick="toggleWithTemplate(this.form);" $disabled /> |
<label><input type="radio" name="newresusetemp" value="1" onclick="toggleWithTemplate(this.form);" $disabled /> |
$lt{'yes'}</label> |
$lt{'yes'}</label> |
|
</p> |
<div id="newrestemplate" style="display:none"> |
<div id="newrestemplate" style="display:none"> |
$templates |
$templates |
$templatepreview |
$templatepreview |
</div> |
</div> |
</p> |
|
<span class="LC_nobreak"> |
<span class="LC_nobreak"> |
<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" /> |
<input type="hidden" name="folderpath" value="$showpath" /> |
<input type="submit" name="newcrs" value="$lt{'crpr'}" $disabled /> |
<input type="submit" name="newcrs" value="$lt{'crpr'}" $disabled /> |
</span> |
</span> |
|
<div id="stdprobswitch" style="display:none;"> |
|
$rolehomes |
|
<input type="button" name="switchfornewprob" value="$lt{'swit'}" onclick="switchForProb();" /> |
|
</div> |
</fieldset> |
</fieldset> |
</form> |
</form> |
|
|
RESFORM |
RESFORM |
|
} |
|
|
my $specialdocumentsform; |
my $specialdocumentsform; |
my @specialdocumentsforma; |
my @specialdocumentsforma; |
Line 6694 NGFFORM
|
Line 7175 NGFFORM
|
my @external = ( |
my @external = ( |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="toggleExternal(\'ext\');" />'=>$extresourcesform} |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="toggleExternal(\'ext\');" />'=>$extresourcesform} |
); |
); |
if (keys(%ltitools)) { |
if ($posslti) { |
push(@external, |
push(@external, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/exttool.png" alt="'.$lt{extt}.'" onclick="toggleExternal(\'tool\');" />'=>$exttoolform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/exttool.png" alt="'.$lt{extt}.'" onclick="toggleExternal(\'tool\');" />'=>$exttoolform}, |
); |
); |
Line 6715 NGFFORM
|
Line 7196 NGFFORM
|
@gradingforma=( |
@gradingforma=( |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{sipr}.'" onclick="javascript:makesmpproblem();" />'=>$newsmpproblemform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{sipr}.'" onclick="javascript:makesmpproblem();" />'=>$newsmpproblemform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/dropbox.png" alt="'.$lt{drbx}.'" onclick="javascript:makedropbox();" />'=>$newdropboxform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/dropbox.png" alt="'.$lt{drbx}.'" onclick="javascript:makedropbox();" />'=>$newdropboxform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/scoreupfrm.png" alt="'.$lt{scuf}.'" onclick="javascript:makeexamupload();" />'=>$newexuploadform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/scoreupfrm.png" alt="'.$lt{scuf}.'" onclick="javascript:makeexamupload();" />'=>$newexuploadform} |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{stpr}.'" onclick="javascript:toggleCrsRes(\'res\','."'$numauthor','$numcrsdirs'".');" />'=>$crsresform}, |
|
); |
); |
|
if ($crsresform) { |
|
push(@gradingforma, |
|
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{stpr}.'" onclick="javascript:toggleCrsRes(\'res\');" />'=>$crsresform} |
|
); |
|
} |
$gradingform = &create_form_ul(&create_list_elements(@gradingforma)); |
$gradingform = &create_form_ul(&create_list_elements(@gradingforma)); |
|
|
@communityforma=( |
@communityforma=( |
Line 6731 NGFFORM
|
Line 7216 NGFFORM
|
|
|
my %orderhash = ( |
my %orderhash = ( |
'aa' => ['Upload',$fileuploadform], |
'aa' => ['Upload',$fileuploadform], |
'bb' => ['Import',$importpubform], |
'bb' => ['External',$externalform], |
'cc' => ['External',$externalform], |
'cc' => ['Import',$importpubform], |
'dd' => ['Grading',$gradingform], |
'dd' => ['Assessment',$gradingform], |
'ff' => ['Other',$specialdocumentsform], |
'ff' => ['Other',$specialdocumentsform], |
); |
); |
unless ($container eq 'page') { |
unless ($container eq 'page') { |
Line 6766 unless ($container eq 'page') {
|
Line 7251 unless ($container eq 'page') {
|
unless ($supplementalflag) { |
unless ($supplementalflag) { |
$folder='supplemental'; |
$folder='supplemental'; |
} |
} |
if ($folder =~ /^supplemental$/ && |
if (($folder eq 'supplemental') && |
(($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) { |
(($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) { |
$env{'form.folderpath'} = &supplemental_base(); |
$env{'form.folderpath'} = &supplemental_base(); |
} elsif ($allowed) { |
} elsif ($allowed) { |
Line 6786 unless ($container eq 'page') {
|
Line 7271 unless ($container eq 'page') {
|
<legend>$lt{'upfi'}</legend> |
<legend>$lt{'upfi'}</legend> |
<input type="hidden" name="active" value="ee" /> |
<input type="hidden" name="active" value="ee" /> |
$fileupload |
$fileupload |
|
<input type="file" name="uploaddoc" id="uploaddocsupp" class="LC_flUpload LC_uploaddoc" size="40" $disabled /> |
|
<input type="hidden" id="LC_free_space_supp" value="$free_space" /> |
<br /> |
<br /> |
<br /> |
<br /> |
<span class="LC_nobreak"> |
<span class="LC_nobreak"> |
Line 6798 unless ($container eq 'page') {
|
Line 7285 unless ($container eq 'page') {
|
$pathitem |
$pathitem |
<input type="hidden" name="cmd" value="upload_supplemental" /> |
<input type="hidden" name="cmd" value="upload_supplemental" /> |
<input type='submit' value="$lt{'upld'}" /> |
<input type='submit' value="$lt{'upld'}" /> |
|
</fieldset> |
</form> |
</form> |
SUPDOCFORM |
SUPDOCFORM |
|
|
Line 6877 my @specialdocs = (
|
Line 7365 my @specialdocs = (
|
my @supexternal = ( |
my @supexternal = ( |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:toggleExternal(\'suppext\')" />' |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:toggleExternal(\'suppext\')" />' |
=>$supextform}); |
=>$supextform}); |
if (keys(%ltitools)) { |
if ($posslti) { |
push(@supexternal, |
push(@supexternal, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/exttool.png" alt="'.$lt{extt}.'" onclick="javascript:toggleExternal(\'supptool\')" />' |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/exttool.png" alt="'.$lt{extt}.'" onclick="javascript:toggleExternal(\'supptool\')" />' |
=>$supexttoolform}); |
=>$supexttoolform}); |
Line 6903 my %suporderhash = (
|
Line 7391 my %suporderhash = (
|
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
} |
} |
if ($suppchanges) { |
if ($suppchanges) { |
my %servers = &Apache::lonnet::internet_dom_servers($coursedom); |
&Apache::lonnet::update_supp_caches($coursedom,$coursenum); |
my @ids=&Apache::lonnet::current_machine_ids(); |
|
foreach my $server (keys(%servers)) { |
|
next if (grep(/^\Q$server\E$/,@ids)); |
|
my $hashid=$coursenum.':'.$coursedom; |
|
my $cachekey = &escape('showsupp').':'.&escape($hashid); |
|
&Apache::lonnet::remote_devalidate_cache($server,[$cachekey]); |
|
} |
|
&Apache::lonnet::has_unhidden_suppfiles($coursenum,$coursedom,1); |
|
&Apache::lonnet::count_supptools($coursenum,$coursedom,1); |
|
my $now = time; |
|
if ($env{'request.course.id'} eq $coursedom.'_'.$coursenum) { |
|
&Apache::lonnet::appenv({'request.course.suppupdated' => $now}); |
|
} |
|
&Apache::lonnet::put('environment',{'internal.supplementalchange' => $now}, |
|
$coursedom,$coursenum); |
|
&Apache::lonnet::appenv( |
|
{'course.'.$coursedom.'_'.$coursenum.'.internal.supplementalchange' => $now}); |
|
&Apache::lonnet::do_cache_new('suppchange',$coursedom.'_'.$coursenum,$now,600); |
|
undef($suppchanges); |
undef($suppchanges); |
} |
} |
} |
} |
Line 7092 sub remove_archive {
|
Line 7562 sub remove_archive {
|
if ($url eq $env{'form.archiveurl'}) { |
if ($url eq $env{'form.archiveurl'}) { |
if (&handle_edit_cmd($docuname,$docudom)) { |
if (&handle_edit_cmd($docuname,$docudom)) { |
($errtext,$fatal) = &storemap($docuname,$docudom,$map,1); |
($errtext,$fatal) = &storemap($docuname,$docudom,$map,1); |
|
if ($suppchanges) { |
|
&Apache::lonnet::update_supp_caches($docudom,$docuname); |
|
undef($suppchanges); |
|
} |
if ($fatal) { |
if ($fatal) { |
if ($container eq 'page') { |
if ($container eq 'page') { |
$delwarning = &mt('An error occurred updating the contents of the current page.'); |
$delwarning = &mt('An error occurred updating the contents of the current page.'); |
Line 7123 sub remove_archive {
|
Line 7597 sub remove_archive {
|
} |
} |
|
|
sub generate_admin_menu { |
sub generate_admin_menu { |
my ($crstype,$canedit) = @_; |
my ($crstype,$canedit,$coursenum,$coursedom) = @_; |
my $lc_crstype = lc($crstype); |
my $lc_crstype = lc($crstype); |
my ($home,$other,%outhash)=&authorhosts(); |
my ($home,$other,%outhash)=&authorhosts(); |
my %lt= ( # do not translate here |
my %lt= ( # do not translate here |
Line 7131 sub generate_admin_menu {
|
Line 7605 sub generate_admin_menu {
|
'cv' => 'Check/Set Resource Versions', |
'cv' => 'Check/Set Resource Versions', |
'ls' => 'List Resource Identifiers', |
'ls' => 'List Resource Identifiers', |
'ct' => 'Display/Set Shortened URLs for Deep-linking', |
'ct' => 'Display/Set Shortened URLs for Deep-linking', |
|
'ca' => "Enter $crstype Authoring Space", |
'imse' => 'Export contents to IMS Archive', |
'imse' => 'Export contents to IMS Archive', |
'dcd' => "Copy $crstype Content to Authoring Space", |
'dcd' => "Copy $crstype Content to Authoring Space", |
); |
); |
Line 7191 sub generate_admin_menu {
|
Line 7666 sub generate_admin_menu {
|
] |
] |
}); |
}); |
if ($canedit) { |
if ($canedit) { |
|
my ($crsauname,$crsaudom,$crshome); |
|
if (($coursenum ne '') && ($coursedom ne '')) { |
|
my $crsauthorurl = "/priv/$coursedom/$coursenum/"; |
|
($crsauname,$crsaudom,$crshome) = &Apache::lonnet::constructaccess($crsauthorurl); |
|
if (($crsauname eq $coursenum) && ($crsaudom eq $coursedom)) { |
|
my @ids=&Apache::lonnet::current_machine_ids(); |
|
my $linkurl; |
|
if (grep(/^\Q$crshome\E$/,@ids)) { |
|
$linkurl = $crsauthorurl; |
|
} else { |
|
$linkurl = |
|
&Apache::lonhtmlcommon::jump_to_editres($crsauthorurl,$crshome,1); |
|
} |
|
if ((ref($menu[0]) eq 'HASH') && (ref($menu[0]->{'items'}) eq 'ARRAY')) { |
|
push(@{$menu[0]->{items}}, |
|
{ linktext => $lt{'ca'}, |
|
url => $linkurl, |
|
permission => 'F', |
|
help => 'Docs_Course_Authorspace', |
|
icon => 'impcrsau.png', |
|
linktitle => $lt{'ca'}, |
|
}); |
|
} |
|
} |
|
} |
push(@menu, |
push(@menu, |
{ categorytitle=>'Export', |
{ categorytitle=>'Export', |
items =>[ |
items =>[ |
Line 7366 sub editing_js {
|
Line 7866 sub editing_js {
|
tinc => 'Title in course', |
tinc => 'Title in course', |
sunm => 'Sub-directory name', |
sunm => 'Sub-directory name', |
edri => 'Editing rights unavailable for your current role.', |
edri => 'Editing rights unavailable for your current role.', |
|
sele => 'Select', |
|
swit => 'Switch server required', |
); |
); |
&js_escape(\%js_lt); |
&js_escape(\%js_lt); |
my $crstype = &Apache::loncommon::course_type(); |
my $crstype = &Apache::loncommon::course_type(); |
Line 7377 sub editing_js {
|
Line 7879 sub editing_js {
|
my $backtourl; |
my $backtourl; |
my $toplevelmain = &escape(&default_folderpath($coursenum,$coursedom,$navmapref)); |
my $toplevelmain = &escape(&default_folderpath($coursenum,$coursedom,$navmapref)); |
my $toplevelsupp = &supplemental_base(); |
my $toplevelsupp = &supplemental_base(); |
|
my $showfile_js = &Apache::loncommon::show_crsfiles_js(); |
|
my @ids=&Apache::lonnet::current_machine_ids(); |
|
my $machines_str = "'".join("','",@ids)."'"; |
if ($env{'docs.exit.'.$env{'request.course.id'}} =~ /^direct_(.+)$/) { |
if ($env{'docs.exit.'.$env{'request.course.id'}} =~ /^direct_(.+)$/) { |
my $caller = $1; |
my $caller = $1; |
if ($caller =~ /^supplemental/) { |
if ($caller =~ /^supplemental/) { |
Line 7724 function toggleMap(caller) {
|
Line 8228 function toggleMap(caller) {
|
} |
} |
} |
} |
document.getElementById('importmapform').style.display=disp; |
document.getElementById('importmapform').style.display=disp; |
|
if (disp == 'block') { |
|
if (document.getElementById('importcrsresform')) { |
|
if (document.getElementById('importcrsresform').style.display == 'block') { |
|
document.getElementById('importcrsresform').style.display = 'none'; |
|
} |
|
} |
|
} |
resize_scrollbox('contentscroll','1','1'); |
resize_scrollbox('contentscroll','1','1'); |
} |
} |
return; |
return; |
} |
} |
|
|
function toggleCrsRes(caller,numauthorrole,numcrsdirs) { |
function toggleCrsRes(caller) { |
var disp = 'none'; |
var disp = 'none'; |
if (document.getElementById('crsresform')) { |
if (document.getElementById('crsresform')) { |
if (caller == 'res') { |
if (caller == 'res') { |
var curr = document.getElementById('crsresform').style.display; |
var form = document.getElementById('crsresform'); |
|
var curr = form.style.display; |
if (curr == 'none') { |
if (curr == 'none') { |
disp='block'; |
disp='block'; |
numauthor = parseInt(numauthorrole); |
document.courseresform.authorrole.selectedIndex = 0; |
if (numauthor > 0) { |
document.courseresform.authorpath.selectedIndex = 0; |
document.courseresform.authorrole.selectedIndex = 0; |
document.courseresform.newresourceadd.selectedIndex = 0; |
select1priv_changed(); |
populateDirSelects(form,'authorrole','authorpath',1,0,0); |
document.courseresform.authorpath.selectedIndex = 0; |
toggleNewInCourse(document.courseresform); |
document.courseresform.newresourceadd.selectedIndex = 0; |
if (document.getElementById('newresource')) { |
toggleNewInCourse(document.courseresform); |
document.getElementById('newresource').style.display = 'none'; |
if (document.getElementById('newresource')) { |
|
document.getElementById('newresource').style.display = 'none'; |
|
} |
|
} else { |
|
if (numcrsdirs) { |
|
document.courseresform.authorpath.selectedIndex = 0; |
|
} |
|
} |
} |
if (document.courseresform.newresusetemp.length) { |
if (document.courseresform.newresusetemp.length) { |
document.courseresform.newresusetemp[0].checked = true; |
document.courseresform.newresusetemp[0].checked = true; |
Line 7803 function toggleNewsubdir(form) {
|
Line 8308 function toggleNewsubdir(form) {
|
|
|
function toggleCrsResTitle() { |
function toggleCrsResTitle() { |
if (document.getElementById('newresource')) { |
if (document.getElementById('newresource')) { |
if (document.courseresform.authorrole.options[document.courseresform.authorrole.selectedIndex].value == 'course') { |
var selloc = document.courseresform.authorrole.options[document.courseresform.authorrole.selectedIndex].value; |
|
if (selloc == 'course') { |
document.getElementById('newresource').style.display = 'inline'; |
document.getElementById('newresource').style.display = 'inline'; |
document.courseresform.newresourceadd[0].checked = true; |
document.courseresform.newresourceadd[0].checked = true; |
toggleNewInCourse(document.courseresform); |
toggleNewInCourse(document.courseresform); |
} else { |
} else { |
document.getElementById('newresource').style.display = 'none'; |
document.getElementById('newresource').style.display = 'none'; |
} |
} |
} |
} |
|
if (document.getElementById('newstdproblem')) { |
|
if (document.courseresform.authorpath.options[document.courseresform.authorpath.selectedIndex].value == 'switch') { |
|
document.getElementById('newstdproblem').style.display = 'none'; |
|
if (document.getElementById('stdprobswitch')) { |
|
document.getElementById('stdprobswitch').style.display = 'block'; |
|
} |
|
} else { |
|
document.getElementById('newstdproblem').style.display = 'block'; |
|
if (document.getElementById('stdprobswitch')) { |
|
document.getElementById('stdprobswitch').style.display = 'none'; |
|
} |
|
} |
|
} |
} |
} |
|
|
function toggleNewInCourse(form) { |
function toggleNewInCourse(form) { |
Line 7890 function getExample(width,height,scrolli
|
Line 8409 function getExample(width,height,scrolli
|
} |
} |
} |
} |
|
|
function toggleImportCrsres(caller,dircount) { |
function toggleImportCrsres(caller) { |
var disp = 'none'; |
var disp = 'none'; |
if (document.getElementById('importcrsresform')) { |
if (document.getElementById('importcrsresform')) { |
if (caller == 'res') { |
if (caller == 'res') { |
var numdirs = parseInt(dircount); |
|
var curr = document.getElementById('importcrsresform').style.display; |
var curr = document.getElementById('importcrsresform').style.display; |
if (curr == 'none') { |
if (curr == 'none') { |
disp='block'; |
disp='block'; |
if (numdirs > 1) { |
populateCrsSelects(document.crsresimportform,'coursepath','coursefile',1,'',1,0,1,1,0); |
select1res_changed(); |
if ((document.getElementById('importcrsrescontent')) && |
|
(document.getElementById('importcrsresempty'))) { |
|
var selelem = document.crsresimportform.elements['coursepath']; |
|
var numdirs = 0; |
|
if (selelem.options.length) { |
|
numdirs = selelem.options.length - 1; |
|
} |
|
if (numdirs) { |
|
document.getElementById('importcrsrescontent').style.display='block'; |
|
document.getElementById('importcrsresempty').style.display='none'; |
|
} else { |
|
document.getElementById('importcrsrescontent').style.display='none'; |
|
document.getElementById('importcrsresempty').style.display='block'; |
|
} |
} |
} |
} |
} |
} |
} |
document.getElementById('importcrsresform').style.display=disp; |
document.getElementById('importcrsresform').style.display=disp; |
|
if (disp == 'block') { |
|
if (document.getElementById('importmapform')) { |
|
if (document.getElementById('importmapform').style.display == 'block') { |
|
document.getElementById('importmapform').style.display = 'none'; |
|
} |
|
} |
|
} |
resize_scrollbox('contentscroll','1','0'); |
resize_scrollbox('contentscroll','1','0'); |
} |
} |
return; |
return; |
} |
} |
|
|
|
$showfile_js |
|
|
|
function populateDirSelects(form,locsel,dirsel,setdir,recurse,nonemptydir) { |
|
var location = form.elements[locsel].options[form.elements[locsel].selectedIndex].value; |
|
if ((setdir) && (dirsel != null) && (dirsel != 'undefined') && (dirsel != '')) { |
|
var selelem = form.elements[dirsel]; |
|
var i, numfiles = selelem.options.length -1; |
|
if (numfiles >=0) { |
|
for (i = numfiles; i >= 0; i--) { |
|
selelem.remove(i); |
|
} |
|
} |
|
if ((location == '') || (location == null) || (location == 'undefined')) { |
|
if (selelem.options.length == 0) { |
|
selelem.options[selelem.options.length] = new Option('',''); |
|
selelem.selectedIndex = 0; |
|
} |
|
if (document.getElementById('newstdproblem')) { |
|
document.getElementById('newstdproblem').style.display = 'none'; |
|
} |
|
return; |
|
} |
|
var machineIds = new Array($machines_str); |
|
var athome = 0; |
|
var role = location; |
|
if ((location == 'author') || (location == 'course')) { |
|
if (document.getElementById('rolehome_'+location)) { |
|
var currhome = document.getElementById('rolehome_'+location).value; |
|
if ((currhome != '') && (currhome != null) && (currhome != 'undefined')) { |
|
if (machineIds.includes(currhome)) { |
|
athome = 1; |
|
} |
|
} |
|
} |
|
} else { |
|
const roleinfo = location.split('___'); |
|
role = encodeURIComponent(roleinfo[0]+'./'+roleinfo[1]); |
|
if (document.getElementById('rolehome_coauthor_'+roleinfo[1]+'_'+roleinfo[0])) { |
|
var currhome = document.getElementById('rolehome_coauthor_'+roleinfo[1]+'_'+roleinfo[0]).value; |
|
if ((currhome != '') && (currhome != null) && (currhome != 'undefined')) { |
|
if (machineIds.includes(currhome)) { |
|
athome = 1; |
|
} |
|
} |
|
} |
|
} |
|
var templateradio = document.courseresform.elements['newresusetemp']; |
|
if (athome) { |
|
if (document.getElementById('stdprobswitch')) { |
|
document.getElementById('stdprobswitch').style.display = 'none'; |
|
} |
|
if (document.getElementById('newstdproblem')) { |
|
document.getElementById('newstdproblem').style.display = 'none'; |
|
} |
|
var canedit = '$canedit'; |
|
if (canedit) { |
|
if (templateradio.length > 1) { |
|
for (var i=0; i<templateradio.length; i++) { |
|
templateradio[i].disabled = false; |
|
} |
|
} |
|
document.courseresform.newresourcename.disabled = false; |
|
document.courseresform.newcrs.disabled = false; |
|
} |
|
var http = new XMLHttpRequest(); |
|
var url = "/adm/courseauthor"; |
|
var params = "role="+role+"&rec="+recurse+"&nonempty="+nonemptydir+"&addtop=1"; |
|
http.open("POST", url, true); |
|
http.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); |
|
http.onreadystatechange = function() { |
|
if (http.readyState == 4 && http.status == 200) { |
|
var data = JSON.parse(http.responseText); |
|
if (Array.isArray(data.dirs)) { |
|
var len = data.dirs.length; |
|
if (len) { |
|
if (len > 1) { |
|
selelem.options[selelem.options.length] = new Option('$js_lt{sele}',''); |
|
} |
|
} |
|
if (len) { |
|
var j; |
|
for (j = 0; j < len; j++) { |
|
selelem.options[selelem.options.length] = new Option(data.dirs[j],data.dirs[j]); |
|
} |
|
selelem.selectedIndex = 0; |
|
if (len == 1) { |
|
toggleCrsResTitle(); |
|
} |
|
} |
|
} |
|
} |
|
} |
|
http.send(params); |
|
} else { |
|
selelem.options[selelem.options.length] = new Option('$js_lt{swit}','switch'); |
|
selelem.selectedIndex = 0; |
|
if (document.getElementById('stdprobswitch')) { |
|
document.getElementById('stdprobswitch').style.display = 'block'; |
|
} |
|
if (document.getElementById('newstdproblem')) { |
|
document.getElementById('newstdproblem').style.display = 'none'; |
|
} |
|
if (templateradio.length > 1) { |
|
for (var i=0; i<templateradio.length; i++) { |
|
templateradio[i].disabled = true; |
|
} |
|
} |
|
document.courseresform.newresourcename.disabled = true; |
|
document.courseresform.newcrs.disabled = true; |
|
} |
|
} |
|
return; |
|
} |
|
|
|
function switchForProb() { |
|
if (document.courseresform.authorpath.options[document.courseresform.authorpath.selectedIndex].value == 'switch') { |
|
var url = '/adm/switchserver?otherserver='; |
|
var newhostid = ''; |
|
var role = ''; |
|
var selloc = document.courseresform.authorrole.options[document.courseresform.authorrole.selectedIndex].value; |
|
if (selloc == 'author') { |
|
newhostid = document.courseresform.rolehome_author.value; |
|
role = "au./&js_escape($env{'user.domain'})/"; |
|
} else if (selloc == 'course') { |
|
newhostid = document.courseresform.rolehome_course.value; |
|
role = "&js_escape($env{'request.role'})"; |
|
} else { |
|
var items = new Array(); |
|
items = selloc.split('___'); |
|
var len = document.courseresform.rolehome_coauthor.length; |
|
if (null == len) { |
|
var currval = document.courseresform.rolehome_coauthor.value; |
|
if (null != currval) { |
|
var info = new Array(); |
|
info = currval.split('='); |
|
newhostid = info[2]; |
|
role = info[0]+'./'+info[1]; |
|
} |
|
} else { |
|
for (var i=0; i<len; i++) { |
|
var currval = document.courseresform.rolehome_coauthor[i].value; |
|
if (null != currval) { |
|
var info = new Array(); |
|
info = currval.split('='); |
|
if ((info[1] == items[1]+'/'+items[0]) && (info[0] == items[2])) { |
|
newhostid = info[2]; |
|
role = info[0]+'./'+info[1]; |
|
break; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
if (newhostid != '') { |
|
url += newhostid; |
|
if (role != '') { |
|
url += '&role='+role; |
|
} |
|
document.location.href = url; |
|
} |
|
} |
|
return; |
|
} |
|
|
function makeims(imsform) { |
function makeims(imsform) { |
if ((imsform.uploaddoc.value == '') || (!imsform.uploaddoc.value)) { |
if ((imsform.uploaddoc.value == '') || (!imsform.uploaddoc.value)) { |
alert("$js_lt{'imsfile'}"); |
alert("$js_lt{'imsfile'}"); |
Line 8890 END
|
Line 9592 END
|
<sourceavail></sourceavail> |
<sourceavail></sourceavail> |
<standards></standards> |
<standards></standards> |
<subject></subject> |
<subject></subject> |
<title></title> |
<title>Course Authoring Rights</title> |
END |
END |
close($fh); |
close($fh); |
} |
} |