version 1.626, 2017/05/08 14:20: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::loncourserespicker(); |
use HTML::Entities; |
use HTML::Entities; |
use HTML::TokeParser; |
use HTML::TokeParser; |
use GDBM_File; |
use GDBM_File; |
Line 52 use File::MMagic;
|
Line 53 use File::MMagic;
|
use File::Copy; |
use File::Copy; |
use Apache::lonlocal; |
use Apache::lonlocal; |
use Cwd; |
use Cwd; |
|
use UUID::Tiny ':std'; |
use LONCAPA qw(:DEFAULT :match); |
use LONCAPA qw(:DEFAULT :match); |
|
|
my $iconpath; |
my $iconpath; |
Line 88 sub storemap {
|
Line 90 sub storemap {
|
|
|
if ($map =~ /^default/) { |
if ($map =~ /^default/) { |
$hadchanges=1; |
$hadchanges=1; |
} else { |
} elsif ($contentchg) { |
$suppchanges=1; |
$suppchanges=1; |
} |
} |
return ($errtext,0); |
return ($errtext,0); |
Line 180 sub default_folderpath {
|
Line 182 sub default_folderpath {
|
} |
} |
} |
} |
|
|
|
sub validate_supppath { |
|
my ($coursenum,$coursedom) = @_; |
|
my $backto; |
|
if ($env{'form.supppath'} ne '') { |
|
my @items = split(/\&/,$env{'form.supppath'}); |
|
my ($badpath,$got_supp,$supppath,%supphidden,%suppids); |
|
for (my $i=0; $i<@items; $i++) { |
|
my $odd = $i%2; |
|
if ((!$odd) && ($items[$i] !~ /^supplemental(|_\d+)$/)) { |
|
$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]; |
|
} |
|
} |
|
if ($badpath) { |
|
delete($env{'form.supppath'}); |
|
} else { |
|
$supppath =~ s/^\&//; |
|
$backto =~ s/^\&//; |
|
$env{'form.supppath'} = $supppath; |
|
} |
|
} |
|
return $backto; |
|
} |
|
|
sub dumpcourse { |
sub dumpcourse { |
my ($r) = @_; |
my ($r) = @_; |
my $crstype = &Apache::loncommon::course_type(); |
my $crstype = &Apache::loncommon::course_type(); |
Line 603 sub recurse_html {
|
Line 663 sub recurse_html {
|
} else { |
} else { |
$relfile = $dependency; |
$relfile = $dependency; |
$depurl = $currurlpath; |
$depurl = $currurlpath; |
$depurl =~ s{[^/]+$}{}; |
$depurl =~ s{[^/]+$}{}; |
$depurl .= $dependency; |
$depurl .= $dependency; |
($newcontainer) = ($depurl =~ m{^\Q$prefix\E(.+)$}); |
($newcontainer) = ($depurl =~ m{^\Q$prefix\E(.+)$}); |
} |
} |
next if ($relfile eq ''); |
next if ($relfile eq ''); |
my $newname = $replacehash->{$container}; |
my $newname = $replacehash->{$container}; |
Line 658 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'); |
my @extras = ('linktext','explanation','crslabel','crstitle','crsappend'); |
my @toolinfo = split(/:/,$info); |
my @toolinfo = split(/:/,$info); |
if ($residx) { |
if ($residx) { |
%toolsettings=&Apache::lonnet::dump('exttool_'.$marker,$coursedom,$coursenum); |
%toolsettings=&Apache::lonnet::dump('exttool_'.$marker,$coursedom,$coursenum); |
Line 667 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{'linktext'},$toolhash{'explanation'},$toolhash{'crslabel'}, |
$toolhash{'crslabel'},$toolhash{'crstitle'}) = @toolinfo; |
$toolhash{'crstitle'},$toolhash{'crsappend'},$toolhash{'gradable'}) = @toolinfo; |
foreach my $item (@extras) { |
foreach my $item (@extras) { |
$toolhash{$item} = &unescape($toolhash{$item}); |
$toolhash{$item} = &unescape($toolhash{$item}); |
} |
} |
|
if ($folder =~ /^supplemental/) { |
|
delete($toolhash{'gradable'}); |
|
} else { |
|
$toolhash{'gradable'} =~ s/\D+//g; |
|
} |
if (ref($ltitoolsref) eq 'HASH') { |
if (ref($ltitoolsref) eq 'HASH') { |
my @deleted; |
if (ref($ltitoolsref->{$tooltype}) eq 'HASH') { |
if (ref($ltitoolsref->{$toolid}) eq 'HASH') { |
if (ref($ltitoolsref->{$tooltype}->{$toolid}) eq 'HASH') { |
$toolhash{'id'} = $toolid; |
my %tools = %{$ltitoolsref->{$tooltype}->{$toolid}}; |
if (($toolhash{'target'} eq 'iframe') || ($toolhash{'target'} eq 'window')) { |
my @deleted; |
if ($toolhash{'target'} eq 'window') { |
$toolhash{'id'} = $toolprefix.$toolid; |
foreach my $item ('width','height') { |
if (($toolhash{'target'} eq 'iframe') || ($toolhash{'target'} eq 'tab') || |
$toolhash{$item} =~ s/^\s+//; |
($toolhash{'target'} eq 'window')) { |
$toolhash{$item} =~ s/\s+$//; |
if ($toolhash{'target'} eq 'window') { |
if ($toolhash{$item} =~ /\D/) { |
foreach my $item ('width','height') { |
delete($toolhash{$item}); |
$toolhash{$item} =~ s/^\s+//; |
if ($residx) { |
$toolhash{$item} =~ s/\s+$//; |
if ($toolsettings{$item}) { |
if ($toolhash{$item} =~ /\D/) { |
push(@deleted,$item); |
delete($toolhash{$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); |
|
} |
|
} |
|
} |
|
} elsif ($toolhash{'target'} eq 'tab') { |
|
foreach my $item ('width','height') { |
|
delete($toolhash{$item}); |
|
if ($residx) { |
|
if ($toolsettings{$item}) { |
|
push(@deleted,$item); |
|
} |
|
} |
|
} |
} |
} |
} |
if (ref($tools{'crsconf'}) eq 'HASH') { |
if ($toolhash{'target'} eq 'iframe') { |
foreach my $item ('label','title','linktext','explanation') { |
foreach my $item ('width','height','linktext','explanation') { |
my $crsitem; |
delete($toolhash{$item}); |
if (($item eq 'label') || ($item eq 'title')) { |
if ($residx) { |
$crsitem = 'crs'.$item; |
if ($toolsettings{$item}) { |
} else { |
push(@deleted,$item); |
$crsitem = $item; |
|
} |
|
if ($tools{'crsconf'}{$item}) { |
|
$toolhash{$crsitem} =~ s/^\s+//; |
|
$toolhash{$crsitem} =~ s/\s+$//; |
|
if ($toolhash{$crsitem} eq '') { |
|
delete($toolhash{$crsitem}); |
|
} |
|
} else { |
|
delete($toolhash{$crsitem}); |
|
} |
|
if (($residx) && (exists($toolsettings{$crsitem}))) { |
|
unless (exists($toolhash{$crsitem})) { |
|
push(@deleted,$crsitem); |
|
} |
} |
} |
} |
} |
} |
} |
} |
if ($toolhash{'passback'}) { |
if (ref($ltitoolsref->{$toolid}->{'crsconf'}) eq 'HASH') { |
my $gradesecret = UUID::Tiny::create_uuid_as_string(UUID_V4); |
foreach my $item ('label','title','linktext','explanation') { |
$toolhash{'gradesecret'} = $gradesecret; |
my $crsitem; |
$toolhash{'gradesecretdate'} = time; |
if (($item eq 'label') || ($item eq 'title')) { |
} |
$crsitem = 'crs'.$item; |
if ($toolhash{'roster'}) { |
} else { |
my $rostersecret = UUID::Tiny::create_uuid_as_string(UUID_V4); |
$crsitem = $item; |
$toolhash{'rostersecret'} = $rostersecret; |
|
$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 ($ltitoolsref->{$toolid}->{'crsconf'}->{$item}) { |
if (($caller eq 'londocs') && (defined($LONCAPA::map::zombies[$residx]))) { |
$toolhash{$crsitem} =~ s/^\s+//; |
$changegradable = 1; |
$toolhash{$crsitem} =~ s/\s+$//; |
if ($toolsettings{'gradable'}) { |
if ($toolhash{$crsitem} eq '') { |
$toolhash{'gradable'} = 1; |
delete($toolhash{$crsitem}); |
|
} |
} |
} else { |
|
delete($toolhash{$crsitem}); |
|
} |
} |
if (($residx) && (exists($toolsettings{$crsitem}))) { |
} |
unless (exists($toolhash{$crsitem})) { |
my $putres = &Apache::lonnet::put('exttool_'.$marker,\%toolhash,$coursedom,$coursenum); |
push(@deleted,$crsitem); |
if ($putres eq 'ok') { |
|
if (@deleted) { |
|
&Apache::lonnet::del('exttool_'.$marker,\@deleted,$coursedom,$coursenum); |
|
} |
|
if (($changegradable) && ($folder =~ /^default/)) { |
|
my $val; |
|
if ($toolhash{'gradable'}) { |
|
$val = 'yes'; |
|
} else { |
|
$val = 'no'; |
} |
} |
|
&LONCAPA::map::storeparameter($residx,'parameter_0_gradable',$val, |
|
'string_yesno'); |
|
&remember_parms($residx,'gradable','set',$val); |
} |
} |
|
} else { |
|
return (&mt('Failed to save update to external tool.'),1); |
} |
} |
} |
} |
my $putres = &Apache::lonnet::put('exttool_'.$marker,\%toolhash,$coursedom,$coursenum); |
|
if ($putres eq 'ok') { |
|
if (@deleted) { |
|
&Apache::lonnet::del('exttool_'.$marker,\@deleted,$coursedom,$coursenum); |
|
} |
|
} |
|
} |
} |
} |
} |
} |
} |
Line 761 sub group_import {
|
Line 885 sub group_import {
|
$donechk = 1; |
$donechk = 1; |
} |
} |
if ($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$}) { |
if ($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$}) { |
&contained_map_check($url,$folder,\%removefrommap,\%removeparam, |
&contained_map_check($url,$folder,$coursenum,$coursedom,\%removefrommap, |
\%addedmaps,\%hierarchy,\%titles,$allmaps); |
\%removeparam,\%addedmaps,\%hierarchy,\%titles,$allmaps); |
$importuploaded = 1; |
$importuploaded = 1; |
} elsif ($url =~ m{^/res/.+\.(page|sequence)$}) { |
} elsif ($url =~ m{^/res/.+\.(page|sequence)$}) { |
next if ($allmaps->{$url}); |
next if ($allmaps->{$url}); |
Line 775 sub group_import {
|
Line 899 sub group_import {
|
} |
} |
my $ext = 'false'; |
my $ext = 'false'; |
if ($url=~m{^http://} || $url=~m{^https://}) { $ext = 'true'; } |
if ($url=~m{^http://} || $url=~m{^https://}) { $ext = 'true'; } |
$name = &LONCAPA::map::qtunescape($name); |
|
if ($name eq '') { |
|
$name = &LONCAPA::map::qtunescape(&mt('Web Page')); |
|
} |
|
if ($url =~ m{^/uploaded/$coursedom/$coursenum/((?:docs|supplemental)/(?:default|\d+))/new\.html$}) { |
if ($url =~ m{^/uploaded/$coursedom/$coursenum/((?:docs|supplemental)/(?:default|\d+))/new\.html$}) { |
my $filepath = $1; |
my $filepath = $1; |
my $fname = $name; |
my $fname; |
if ($fname =~ /^\W+$/) { |
if ($name eq '') { |
|
$name = &mt('Web Page'); |
$fname = 'web'; |
$fname = 'web'; |
} else { |
} else { |
$fname =~ s/\W/_/g; |
$fname = $name; |
} |
$fname=&Apache::lonnet::clean_filename($fname); |
if (length($fname) > 15) { |
if ($fname eq '') { |
$fname = substr($fname,0,14); |
$fname = 'web'; |
|
} elsif (length($fname) > 15) { |
|
$fname = substr($fname,0,14); |
|
} |
} |
} |
|
my $title = &Apache::loncommon::cleanup_html($name); |
my $initialtext = &mt('Replace with your own content.'); |
my $initialtext = &mt('Replace with your own content.'); |
my $newhtml = <<END; |
my $newhtml = <<END; |
<html> |
<html> |
<head> |
<head> |
<title>$name</title> |
<title>$title</title> |
</head> |
</head> |
<body bgcolor="#ffffff"> |
<body bgcolor="#ffffff"> |
$initialtext |
$initialtext |
Line 802 $initialtext
|
Line 927 $initialtext
|
</html> |
</html> |
END |
END |
$env{'form.output'}=$newhtml; |
$env{'form.output'}=$newhtml; |
my $result = |
my $result = |
&Apache::lonnet::finishuserfileupload($coursenum,$coursedom, |
&Apache::lonnet::finishuserfileupload($coursenum,$coursedom, |
'output', |
'output', |
"$filepath/$residx/$fname.html"); |
"$filepath/$residx/$fname.html"); |
Line 816 END
|
Line 941 END
|
return (&mt('Failed to save new web page.'),1); |
return (&mt('Failed to save new web page.'),1); |
} |
} |
} |
} |
|
$name = &LONCAPA::map::qtunescape($name); |
$url = &LONCAPA::map::qtunescape($url); |
$url = &LONCAPA::map::qtunescape($url); |
$LONCAPA::map::resources[$residx] = |
$LONCAPA::map::resources[$residx] = |
join(':', ($name, $url, $ext, 'normal', 'res')); |
join(':', ($name, $url, $ext, 'normal', 'res')); |
Line 856 END
|
Line 982 END
|
&storemap($coursenum, $coursedom, $folder.'.'.$container,1); |
&storemap($coursenum, $coursedom, $folder.'.'.$container,1); |
unless ($fatal) { |
unless ($fatal) { |
if ($folder =~ /^supplemental/) { |
if ($folder =~ /^supplemental/) { |
&Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1); |
|
my ($errtext,$fatal) = &mapread($coursenum,$coursedom, |
my ($errtext,$fatal) = &mapread($coursenum,$coursedom, |
$folder.'.'.$container); |
$folder.'.'.$container); |
} |
} |
Line 961 sub docs_change_log {
|
Line 1086 sub docs_change_log {
|
if ($supplementalflag) { |
if ($supplementalflag) { |
$tid = 2; |
$tid = 2; |
} |
} |
my ($breadcrumbtrail) = |
my ($breadcrumbtrail) = |
&Apache::lonhtmlcommon::docs_breadcrumbs($allowed,$crstype,1); |
&Apache::lonhtmlcommon::docs_breadcrumbs($allowed,$crstype,1); |
$r->print($breadcrumbtrail. |
$r->print($breadcrumbtrail. |
&generate_edit_table($tid,\%orderhash,undef,$iconpath,$jumpto, |
&generate_edit_table($tid,\%orderhash,undef,$iconpath,$jumpto, |
Line 983 sub docs_change_log {
|
Line 1108 sub docs_change_log {
|
'encrypturl' => 'URL hidden', |
'encrypturl' => 'URL hidden', |
'randompick' => 'Randomly pick', |
'randompick' => 'Randomly pick', |
'randomorder' => 'Randomly ordered', |
'randomorder' => 'Randomly ordered', |
|
'gradable' => 'Grade can be assigned to External Tool', |
'set' => 'set to', |
'set' => 'set to', |
'del' => 'deleted'); |
'del' => 'deleted'); |
my $filter = &Apache::loncommon::display_filter('docslog')."\n". |
my $filter = &Apache::loncommon::display_filter('docslog')."\n". |
Line 1089 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); |
foreach my $parameter ('randompick','hiddenresource','encrypturl','randomorder') { |
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') { |
if ($docslog{$id}{'logentry'}{'parameter_action_'.$parameter}) { |
if ($docslog{$id}{'logentry'}{'parameter_action_'.$parameter}) { |
# FIXME: internationalization seems wrong here |
# FIXME: internationalization seems wrong here |
$r->print('<li>'. |
$r->print('<li>'. |
Line 1158 sub update_paste_buffer {
|
Line 1290 sub update_paste_buffer {
|
# Construct identifiers for current contents of user's paste buffer |
# Construct identifiers for current contents of user's paste buffer |
if (@currpaste) { |
if (@currpaste) { |
foreach my $suffix (@currpaste) { |
foreach my $suffix (@currpaste) { |
my $cid = $env{'docs.markedcopy_crs_'.$suffix}; |
my $cid = $env{'docs.markedcopy_crs_'.$suffix}; |
my $url = $env{'docs.markedcopy_url_'.$suffix}; |
my $url = $env{'docs.markedcopy_url_'.$suffix}; |
my $mapidx = $env{'docs.markedcopy_map_'.$suffix}; |
my $mapidx = $env{'docs.markedcopy_map_'.$suffix}; |
if (($cid =~ /^$match_domain(?:_)$match_courseid$/) && |
if (($cid =~ /^$match_domain(?:_)$match_courseid$/) && |
($url ne '')) { |
($url ne '')) { |
$pasteurls{$cid.'_'.$url.'_'.$mapidx} = 1; |
if ($url eq '/res/lib/templates/simpleproblem.problem') { |
} |
$pasteurls{$cid.'_'.$mapidx} = 1; |
|
} elsif ($url =~ m{^/res/$match_domain/$match_username/}) { |
|
$pasteurls{$url} = 1; |
|
} else { |
|
$pasteurls{$cid.'_'.$url} = 1; |
|
} |
|
} |
} |
} |
} |
} |
|
|
Line 1173 sub update_paste_buffer {
|
Line 1311 sub update_paste_buffer {
|
|
|
my @pathitems = split(/\&/,$env{'form.folderpath'}); |
my @pathitems = split(/\&/,$env{'form.folderpath'}); |
my @folderconf = split(/\:/,$pathitems[-1]); |
my @folderconf = split(/\:/,$pathitems[-1]); |
my $ispage = $folderconf[4]; |
my $ispage = $folderconf[5]; |
|
|
foreach my $item (@possibles) { |
foreach my $item (@possibles) { |
my ($orderidx,$cmd) = split(/:/,$item); |
my ($orderidx,$cmd) = split(/:/,$item); |
Line 1186 sub update_paste_buffer {
|
Line 1324 sub update_paste_buffer {
|
$env{'form.folderpath'},\%curr_groups); |
$env{'form.folderpath'},\%curr_groups); |
next if ($denied{'copy'}); |
next if ($denied{'copy'}); |
$url=~s{http(:|:)//https(:|:)//}{https$2//}; |
$url=~s{http(:|:)//https(:|:)//}{https$2//}; |
next if (exists($pasteurls{$coursedom.'_'.$coursenum.'_'.$mapidx})); |
if ($url eq '/res/lib/templates/simpleproblem.problem') { |
|
next if (exists($pasteurls{$coursedom.'_'.$coursenum.'_'.$mapidx})); |
|
} elsif ($url =~ m{^/res/$match_domain/$match_username/}) { |
|
next if (exists($pasteurls{$url})); |
|
} else { |
|
next if (exists($pasteurls{$coursedom.'_'.$coursenum.'_'.$url})); |
|
} |
my ($suffix,$errortxt,$locknotfreed) = |
my ($suffix,$errortxt,$locknotfreed) = |
&new_timebased_suffix($env{'user.domain'},$env{'user.name'},'paste'); |
&new_timebased_suffix($env{'user.domain'},$env{'user.name'},'paste'); |
if ($suffix ne '') { |
if ($suffix ne '') { |
Line 1213 sub update_paste_buffer {
|
Line 1357 sub update_paste_buffer {
|
$subdir = $prefix; |
$subdir = $prefix; |
} |
} |
my (%addedmaps,%removefrommap,%removeparam,%hierarchy,%titles,%allmaps); |
my (%addedmaps,%removefrommap,%removeparam,%hierarchy,%titles,%allmaps); |
&contained_map_check($url,$folder,\%removefrommap,\%removeparam,\%addedmaps, |
&contained_map_check($url,$folder,$coursenum,$coursedom,\%removefrommap, |
\%hierarchy,\%titles,\%allmaps); |
\%removeparam,\%addedmaps,\%hierarchy,\%titles,\%allmaps); |
if (ref($hierarchy{$url}) eq 'HASH') { |
if (ref($hierarchy{$url}) eq 'HASH') { |
my ($nested,$nestednames); |
my ($nested,$nestednames); |
&recurse_uploaded_maps($url,$subdir,\%hierarchy,\%titles,\$nested,\$nestednames); |
&recurse_uploaded_maps($url,$subdir,\%hierarchy,\%titles,\$nested,\$nestednames); |
Line 1275 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 1288 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 1326 sub print_paste_buffer {
|
Line 1472 sub print_paste_buffer {
|
$is_uploaded_map = 1; |
$is_uploaded_map = 1; |
} |
} |
} elsif (($url =~ m{^/res/lib/templates/\w+\.problem$}) || |
} elsif (($url =~ m{^/res/lib/templates/\w+\.problem$}) || |
($url =~ m{^/adm/($match_domain)/($match_username)/\d+/(bulletinboard|smppg)$})) { |
($url =~ m{^/adm/($match_domain)/($match_username)/\d+/(bulletinboard|smppg|ext\.tool)$})) { |
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/) { |
$othercrs = '<br />'.&mt('(from another course)'); |
if ($is_exttool) { |
|
if ($toolcdom ne $coursedom) { |
|
$canpaste = 0; |
|
$nopaste = &mt('Paste from another domain unavailable.'); |
|
} 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); |
} |
} |
} |
} |
my $buffer; |
my $buffer; |
if (($is_external) || ($is_exttool)) { |
if ($is_external) { |
$buffer = &mt('External Resource').': '. |
$buffer = &mt('External Resource').': '. |
&LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix}).' ('. |
&LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix}).' ('. |
&LONCAPA::map::qtescape($url).')'; |
&LONCAPA::map::qtescape($url).')'; |
|
} elsif ($is_exttool) { |
|
$buffer = &mt('External Tool').': '. |
|
&LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix}); |
} else { |
} else { |
my $icon = &Apache::loncommon::icon($extension); |
my $icon = &Apache::loncommon::icon($extension); |
if ($extension eq 'sequence' && |
if ($extension eq 'sequence' && |
Line 1375 sub print_paste_buffer {
|
Line 1568 sub print_paste_buffer {
|
} |
} |
$pasteitems .= '<label><input type="checkbox" name="pasting" id="pasting_'.$suffix.'" value="'.$suffix.'" '.$onclick.'/>'.$buffer.'</label>'; |
$pasteitems .= '<label><input type="checkbox" name="pasting" id="pasting_'.$suffix.'" value="'.$suffix.'" '.$onclick.'/>'.$buffer.'</label>'; |
if ($nopaste) { |
if ($nopaste) { |
$pasteitems .= $nopaste; |
$pasteitems .= ' <span class="LC_cusr_emph">'.$nopaste.'</span>'; |
} else { |
} else { |
if ($othercrs) { |
if ($othercrs) { |
$pasteitems .= $othercrs; |
$pasteitems .= $othercrs; |
Line 1625 sub do_paste_from_buffer {
|
Line 1818 sub do_paste_from_buffer {
|
return(); |
return(); |
} |
} |
|
|
my (%msgs,%before,%after,@dopaste,%is_map,%notinsupp,%notincrs,%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 1654 sub do_paste_from_buffer {
|
Line 1850 sub do_paste_from_buffer {
|
$srcdom{$suffix} = $srcd; |
$srcdom{$suffix} = $srcd; |
$srcnum{$suffix} = $srcn; |
$srcnum{$suffix} = $srcn; |
} elsif (($url =~ m{^/res/lib/templates/\w+\.problem$}) || |
} elsif (($url =~ m{^/res/lib/templates/\w+\.problem$}) || |
($url =~ m{^/adm/$match_domain/$match_username/\d+/(bulletinboard|smppg)$})) { |
($url =~ m{^/adm/$match_domain/$match_username/\d+/(bulletinboard|smppg)$}) || |
|
($url =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$})) { |
my ($srcd,$srcn) = split(/_/,$cid); |
my ($srcd,$srcn) = split(/_/,$cid); |
# When paste buffer was populated using an active role in a different course |
# When paste buffer was populated using an active role in a different course |
# check for mdc privilege in the course from which the resource was pasted |
# check for mdc privilege in the course from which the resource was pasted |
Line 1664 sub do_paste_from_buffer {
|
Line 1861 sub do_paste_from_buffer {
|
next; |
next; |
} |
} |
} |
} |
|
# When buffer was populated using an active role in a different course |
|
# disallow pasting of External Tool if course is in a different domain, |
|
# or if External Tool use is not permitted in this course. |
|
if ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) { |
|
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); |
if ($url=~/\.(page|sequence)$/) { |
if ($url=~/\.(page|sequence)$/) { |
$is_map{$suffix} = 1; |
$is_map{$suffix} = 1; |
} |
} |
|
|
if ($url =~ m{^/uploaded/$match_domain/$match_courseid/([^/]+)}) { |
if ($url =~ m{^/uploaded/$match_domain/$match_courseid/([^/]+)}) { |
my $oldprefix = $1; |
my $oldprefix = $1; |
# When pasting content from Main Content to Supplemental Content and vice versa |
# When pasting content from Main Content to Supplemental Content and vice versa |
Line 1717 sub do_paste_from_buffer {
|
Line 1959 sub do_paste_from_buffer {
|
%msgs = &Apache::lonlocal::texthash ( |
%msgs = &Apache::lonlocal::texthash ( |
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.', |
|
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 1745 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 = {}; |
if ($folder =~ /^default/) { |
my (@toclear,%mapurls,%lockerrs,%msgerrs,%results,$donechk, |
$allmaps = |
@updatetoolsenc,$updatetoolscache,$checkedsameinst, |
&Apache::loncommon::allmaps_incourse($coursedom,$coursenum, |
$same_institution); |
$env{"course.$env{'request.course.id'}.home"}, |
|
$env{'request.course.id'}); |
|
} |
|
|
|
my (@toclear,%mapurls,%lockerrs,%msgerrs,%results); |
|
|
|
# Loop over the items to paste |
# Loop over the items to paste |
foreach my $suffix (@dopaste) { |
foreach my $suffix (@dopaste) { |
Line 1770 sub do_paste_from_buffer {
|
Line 2010 sub do_paste_from_buffer {
|
if ($is_map{$suffix}) { |
if ($is_map{$suffix}) { |
# If pasting a map, check if map contains other maps |
# If pasting a map, check if map contains other maps |
my (%hierarchy,%titles); |
my (%hierarchy,%titles); |
&contained_map_check($url,$folder,\%removefrommap,\%removeparam, |
if (($folder =~ /^default/) && (!$donechk)) { |
\%addedmaps,\%hierarchy,\%titles,$allmaps); |
$allmaps = |
|
&Apache::loncommon::allmaps_incourse($coursedom,$coursenum, |
|
$env{"course.$env{'request.course.id'}.home"}, |
|
$env{'request.course.id'}); |
|
$donechk = 1; |
|
} |
|
&contained_map_check($url,$folder,$coursenum,$coursedom, |
|
\%removefrommap,\%removeparam,\%addedmaps, |
|
\%hierarchy,\%titles,$allmaps); |
if ($url=~ m{^/uploaded/}) { |
if ($url=~ m{^/uploaded/}) { |
my $newurl; |
my $newurl; |
unless ($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') { |
unless ($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') { |
Line 1824 sub do_paste_from_buffer {
|
Line 2072 sub do_paste_from_buffer {
|
} |
} |
} |
} |
} |
} |
if ($url=~ m{/(bulletinboard|smppg)$}) { |
if ($url=~ m{/(bulletinboard|smppg|ext\.tool)$}) { |
my $prefix = $1; |
my $prefix = $1; |
my $fromothercrs; |
my $fromothercrs; |
#need to copy the db contents to a new one, unless this is a move. |
#need to copy the db contents to a new one, unless this is a move. |
my %info = ( |
my %info = ( |
src => $url, |
src => $url, |
cdom => $coursedom, |
cdom => $coursedom, |
cnum => $coursenum, |
cnum => $coursenum, |
); |
); |
|
if ($prefix eq 'ext.tool') { |
|
if ($prefixchg{$suffix} eq 'docstosupp') { |
|
$info{'delgradable'} = 1; |
|
} |
|
} |
if (($srcdom{$suffix} =~ /^$match_domain$/) && ($srcnum{$suffix} =~ /^$match_courseid$/)) { |
if (($srcdom{$suffix} =~ /^$match_domain$/) && ($srcnum{$suffix} =~ /^$match_courseid$/)) { |
unless (($srcdom{$suffix} eq $coursedom) && ($srcnum{$suffix} eq $coursenum)) { |
unless (($srcdom{$suffix} eq $coursedom) && ($srcnum{$suffix} eq $coursenum)) { |
$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 1852 sub do_paste_from_buffer {
|
Line 2120 sub do_paste_from_buffer {
|
$msg = &mt('Paste failed: An error occurred when copying the simple page.').' '.$errtext; |
$msg = &mt('Paste failed: An error occurred when copying the simple page.').' '.$errtext; |
} elsif ($prefix eq 'bulletinboard') { |
} elsif ($prefix eq 'bulletinboard') { |
$msg = &mt('Paste failed: An error occurred when copying the discussion board.').' '.$errtext; |
$msg = &mt('Paste failed: An error occurred when copying the discussion board.').' '.$errtext; |
|
} elsif ($prefix eq 'ext.tool') { |
|
$msg = &mt('Paste failed: An error occurred when copying the external tool.').' '.$errtext; |
} |
} |
$results{$suffix} = $result; |
$results{$suffix} = $result; |
$msgerrs{$suffix} = $msg; |
$msgerrs{$suffix} = $msg; |
Line 1898 sub do_paste_from_buffer {
|
Line 2168 sub do_paste_from_buffer {
|
if ($newdocsdir eq '') { |
if ($newdocsdir eq '') { |
$newdocsdir = 'default'; |
$newdocsdir = 'default'; |
} |
} |
if (($prefixchg{$suffix}) || |
if (($prefixchg{$suffix}) || |
($srcdom{$suffix} ne $coursedom) || |
($srcdom{$suffix} ne $coursedom) || |
($srcnum{$suffix} ne $coursenum) || |
($srcnum{$suffix} ne $coursenum) || |
($env{'form.docs.markedcopy_options_'.$suffix} ne 'move')) { |
($env{'form.docs.markedcopy_options_'.$suffix} ne 'move')) { |
my $newpath = "$newprefix/$newdocsdir/$newidx/$rem"; |
my $newpath = "$newprefix/$newdocsdir/$newidx/$rem"; |
Line 1922 sub do_paste_from_buffer {
|
Line 2192 sub do_paste_from_buffer {
|
©_templated_files($url,$srcdom{$suffix},$srcnum{$suffix},$srcmapidx{$suffix}, |
©_templated_files($url,$srcdom{$suffix},$srcnum{$suffix},$srcmapidx{$suffix}, |
$coursedom,$coursenum,$template,$newidx,"$folder.$container"); |
$coursedom,$coursenum,$template,$newidx,"$folder.$container"); |
} |
} |
|
} elsif ($url =~ /ext\.tool$/) { |
|
if (($newidx) && ($folder=~/^default/)) { |
|
my $marker = (split(m{/},$url))[4]; |
|
my %toolsettings = &Apache::lonnet::dump('exttool_'.$marker,$coursedom,$coursenum); |
|
my $val = 'no'; |
|
if ($toolsettings{'gradable'}) { |
|
$val = 'yes'; |
|
} |
|
&LONCAPA::map::storeparameter($newidx,'parameter_0_gradable',$val, |
|
'string_yesno'); |
|
&remember_parms($newidx,'gradable','set',$val); |
|
} |
} |
} |
$LONCAPA::map::resources[$newidx]=$title.':'.&LONCAPA::map::qtunescape($url). |
$LONCAPA::map::resources[$newidx]=$title.':'.&LONCAPA::map::qtunescape($url). |
':'.$ext.':normal:res'; |
':'.$ext.':normal:res'; |
Line 1998 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 2046 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 2107 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'}; |
if ($url =~ m{/(smppg|bulletinboard)$}) { |
if ($url =~ m{/(smppg|bulletinboard|ext\.tool)$}) { |
my $prefix = $1; |
my $prefix = $1; |
|
if ($prefix eq 'ext.tool') { |
|
$prefix = 'exttool'; |
|
} |
if (($dbref->{'cdom'} =~ /^$match_domain$/) && |
if (($dbref->{'cdom'} =~ /^$match_domain$/) && |
($dbref->{'cnum'} =~ /^$match_courseid$/)) { |
($dbref->{'cnum'} =~ /^$match_courseid$/)) { |
my $db_name; |
my $db_name; |
Line 2123 sub dbcopy {
|
Line 2437 sub dbcopy {
|
&Apache::lonsimplepage::get_db_name($url,$marker, |
&Apache::lonsimplepage::get_db_name($url,$marker, |
$dbref->{'cdom'}, |
$dbref->{'cdom'}, |
$dbref->{'cnum'}); |
$dbref->{'cnum'}); |
|
} elsif ($dbref->{'src'} =~ m{/ext\.tool$}) { |
|
$db_name = 'exttool_'.$marker; |
} else { |
} else { |
$db_name = 'bulletinpage_'.$marker; |
$db_name = 'bulletinpage_'.$marker; |
} |
} |
Line 2133 sub dbcopy {
|
Line 2449 sub dbcopy {
|
if (!$suffix) { |
if (!$suffix) { |
if ($prefix eq 'smppg') { |
if ($prefix eq 'smppg') { |
$errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a simple page [_1].',$url); |
$errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a simple page [_1].',$url); |
|
} elsif ($prefix eq 'exttool') { |
|
$errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying an external tool [_1].',$url); |
} else { |
} else { |
$errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a discussion board [_1].',$url); |
$errtext = &mt('Failed to acquire a unique timestamp-based suffix when copying a discussion board [_1].',$url); |
} |
} |
Line 2144 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 2163 sub dbcopy {
|
Line 2592 sub dbcopy {
|
} |
} |
} |
} |
$db_name =~ s{_\d*$ }{_$suffix}x; |
$db_name =~ s{_\d*$ }{_$suffix}x; |
$result=&Apache::lonnet::put($db_name,\%contents, |
if ($prefix eq 'exttool') { |
$coursedom,$coursenum); |
unless ($toolcopyerror) { |
if ($result eq 'ok') { |
foreach my $key ('oldgradesecret','gradesecret','gradesecretdate','oldrostersecret','rostersecret','rostersecretdate') { |
$url =~ s{/(\d*)/(smppg|bulletinboard)$}{/$suffix/$2}x; |
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; |
|
} |
|
} |
|
} |
|
if (($prefix eq 'exttool') && ($toolcopyerror)) { |
|
$result = 'error'; |
|
} else { |
|
$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 2176 sub dbcopy {
|
Line 2635 sub dbcopy {
|
if ($prefix eq 'smppg') { |
if ($prefix eq 'smppg') { |
$lockerrorsref->{$prefix} .= |
$lockerrorsref->{$prefix} .= |
' '.&mt('This will prevent creation of additional simple pages in this course.'); |
' '.&mt('This will prevent creation of additional simple pages in this course.'); |
|
} elsif ($prefix eq 'exttool') { |
|
$lockerrorsref->{$prefix} .= |
|
' '.&mt('This will prevent addition of more external tools to this course.'); |
} else { |
} else { |
$lockerrorsref->{$prefix} .= ' '.&mt('This will prevent creation of additional discussion boards in this course.'); |
$lockerrorsref->{$prefix} .= ' '.&mt('This will prevent creation of additional discussion boards in this course.'); |
} |
} |
Line 2222 sub copy_templated_files {
|
Line 2684 sub copy_templated_files {
|
my @simpleprobqtypes = qw(radio option string essay numerical); |
my @simpleprobqtypes = qw(radio option string essay numerical); |
my $qtype=$srcparms{$srcprefix.'questiontype'}; |
my $qtype=$srcparms{$srcprefix.'questiontype'}; |
if (grep(/^\Q$qtype\E$/,@simpleprobqtypes)) { |
if (grep(/^\Q$qtype\E$/,@simpleprobqtypes)) { |
my %newdata; |
my %newdata = ( |
|
$newprefix.'questiontype' => $qtype, |
|
); |
foreach my $type (@simpleprobqtypes) { |
foreach my $type (@simpleprobqtypes) { |
if ($type eq $qtype) { |
if ($type eq $qtype) { |
$newdata{"$weightprefix.$type.weight"}=1; |
$newdata{"$weightprefix.$type.weight"}=1; |
Line 2305 sub uniqueness_check {
|
Line 2769 sub uniqueness_check {
|
} |
} |
|
|
sub contained_map_check { |
sub contained_map_check { |
my ($url,$folder,$removefrommap,$removeparam,$addedmaps,$hierarchy,$titles, |
my ($url,$folder,$coursenum,$coursedom,$removefrommap,$removeparam,$addedmaps, |
$allmaps) = @_; |
$hierarchy,$titles,$allmaps) = @_; |
my $content = &Apache::lonnet::getfile($url); |
my $content = &Apache::lonnet::getfile($url); |
unless ($content eq '-1') { |
unless ($content eq '-1') { |
my $parser = HTML::TokeParser->new(\$content); |
my $parser = HTML::TokeParser->new(\$content); |
Line 2316 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 ($folder =~ /^supplemental/) { |
if ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) { |
|
my ($srcdom,$srcnum,$marker) = ($1,$2,$3); |
|
unless ($srcdom eq $coursedom) { |
|
$removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; |
|
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/) { |
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 2335 sub contained_map_check {
|
Line 2824 sub contained_map_check {
|
$addedmaps->{$ressrc} = [$url]; |
$addedmaps->{$ressrc} = [$url]; |
} |
} |
} |
} |
&contained_map_check($ressrc,$folder,$removefrommap,$removeparam, |
&contained_map_check($ressrc,$folder,$coursenum,$coursedom,$removefrommap, |
$addedmaps,$hierarchy,$titles,$allmaps); |
$removeparam,$addedmaps,$hierarchy,$titles,$allmaps); |
} |
} |
} elsif ($token->[1] eq 'param') { |
} elsif ($token->[1] eq 'param') { |
if ($folder =~ /^supplemental/) { |
if ($folder =~ /^supplemental/) { |
Line 2438 sub url_paste_fixups {
|
Line 2927 sub url_paste_fixups {
|
$changed = 1; |
$changed = 1; |
} |
} |
} |
} |
} elsif ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/.+$}) { |
} elsif ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/(.+)$}) { |
next if ($skip); |
next if ($skip); |
my $srcdom = $1; |
my $srcdom = $1; |
my $srcnum = $2; |
my $srcnum = $2; |
|
my $rem = $3; |
|
my ($is_exttool,$exttoolchg); |
|
if ($rem =~ m{\d+/ext\.tool$}) { |
|
$is_exttool = 1; |
|
} |
if (($srcdom ne $cdom) || ($srcnum ne $cnum)) { |
if (($srcdom ne $cdom) || ($srcnum ne $cnum)) { |
$rewrites->{$oldurl}{$id} = $ressrc; |
$rewrites->{$oldurl}{$id} = $ressrc; |
$dbcopies->{$oldurl}{$id}{'src'} = $ressrc; |
$dbcopies->{$oldurl}{$id}{'src'} = $ressrc; |
$dbcopies->{$oldurl}{$id}{'cdom'} = $srcdom; |
$dbcopies->{$oldurl}{$id}{'cdom'} = $srcdom; |
$dbcopies->{$oldurl}{$id}{'cnum'} = $srcnum; |
$dbcopies->{$oldurl}{$id}{'cnum'} = $srcnum; |
$changed = 1; |
$changed = 1; |
|
if ($is_exttool) { |
|
$exttoolchg = 1; |
|
} |
|
} elsif (($is_exttool) && |
|
($env{'form.docs.markedcopy_options'} ne 'move')) { |
|
$dbcopies->{$oldurl}{$id}{'src'} = $ressrc; |
|
$dbcopies->{$oldurl}{$id}{'cdom'} = $srcdom; |
|
$dbcopies->{$oldurl}{$id}{'cnum'} = $srcnum; |
|
$changed = 1; |
|
$exttoolchg = 1; |
|
} |
|
if (($is_exttool) && ($prefixchg)) { |
|
if ($oldurl =~ m{^/uploaded/$match_domain/$match_courseid/default}) { |
|
if ($exttoolchg) { |
|
$dbcopies->{$oldurl}{$id}{'delgradable'} = 1; |
|
} |
|
} |
} |
} |
} elsif ($ressrc =~ m{^/adm/$match_domain/$match_username/\d+/(smppg|bulletinboard)$}) { |
} elsif ($ressrc =~ m{^/adm/$match_domain/$match_username/\d+/(smppg|bulletinboard)$}) { |
if (($fromcdom ne $cdom) || ($fromcnum ne $cnum) || |
if (($fromcdom ne $cdom) || ($fromcnum ne $cnum) || |
Line 2494 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 2610 sub apply_fixups {
|
Line 3123 sub apply_fixups {
|
$storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir{$key}/; |
$storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir{$key}/; |
} |
} |
my $mapcontent = &Apache::lonnet::getfile($key); |
my $mapcontent = &Apache::lonnet::getfile($key); |
|
if (($mapcontent eq '-1') && ($before{'map'} eq 'supplemental') && |
|
($after{'map'} eq 'default') && |
|
($key =~ m{^/uploaded/$match_domain/$match_courseid/supplemental_\d+\.sequence$})) { |
|
$mapcontent = '<map>'."\n". |
|
'<resource id="1" src="" type="start" />'."\n". |
|
'<link from="1" to="2" index="1" />'."\n". |
|
'<resource id="2" src="" type="finish" />'."\n". |
|
'</map>'; |
|
} |
if ($mapcontent eq '-1') { |
if ($mapcontent eq '-1') { |
if (ref($errors) eq 'HASH') { |
if (ref($errors) eq 'HASH') { |
$errors->{$key} = 1; |
$errors->{$key} = 1; |
Line 2636 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 2656 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 2668 sub apply_fixups {
|
Line 3244 sub apply_fixups {
|
} |
} |
} |
} |
if (ref($resdatacopy{$key}) eq 'HASH') { |
if (ref($resdatacopy{$key}) eq 'HASH') { |
if ($newsubdir{$key}) { |
my ($gotnewmapname,$newmapname,$srcfolder,$srccontainer); |
|
|
} |
|
foreach my $idx (keys(%{$resdatacopy{$key}})) { |
foreach my $idx (keys(%{$resdatacopy{$key}})) { |
if (ref($resdatacopy{$key}{$idx}) eq 'HASH') { |
if (ref($resdatacopy{$key}{$idx}) eq 'HASH') { |
my $srcurl = $resdatacopy{$key}{$idx}{'src'}; |
my $srcurl = $resdatacopy{$key}{$idx}{'src'}; |
Line 2680 sub apply_fixups {
|
Line 3254 sub apply_fixups {
|
($resdatacopy{$key}{$idx}{'cnum'} =~ /^$match_courseid$/)) { |
($resdatacopy{$key}{$idx}{'cnum'} =~ /^$match_courseid$/)) { |
my $srcdom = $resdatacopy{$key}{$idx}{'cdom'}; |
my $srcdom = $resdatacopy{$key}{$idx}{'cdom'}; |
my $srcnum = $resdatacopy{$key}{$idx}{'cnum'}; |
my $srcnum = $resdatacopy{$key}{$idx}{'cnum'}; |
my ($newmapname) = ($key =~ m{/([^/]+)$}); |
unless ($gotnewmapname) { |
my ($srcfolder,$srccontainer) = split(/\./,$newmapname); |
($newmapname) = ($key =~ m{/([^/]+)$}); |
|
($srcfolder,$srccontainer) = split(/\./,$newmapname); |
|
if ($newsubdir{$key}) { |
|
$newmapname =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir{$key}/; |
|
} |
|
$gotnewmapname = 1; |
|
} |
my $srcmapinfo = $srcfolder.':'.$idx; |
my $srcmapinfo = $srcfolder.':'.$idx; |
if ($srccontainer eq 'page') { |
if ($srccontainer eq 'page') { |
$srcmapinfo .= ':1'; |
$srcmapinfo .= ':1'; |
} |
} |
if ($newsubdir{$key}) { |
|
$newmapname =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir{$key}/; |
|
} |
|
©_templated_files($srcurl,$srcdom,$srcnum,$srcmapinfo,$cdom, |
©_templated_files($srcurl,$srcdom,$srcnum,$srcmapinfo,$cdom, |
$cnum,$template,$idx,$newmapname); |
$cnum,$template,$idx,$newmapname); |
} |
} |
Line 2711 sub apply_fixups {
|
Line 3288 sub apply_fixups {
|
} |
} |
} |
} |
} |
} |
for (my $i=0; $i<@LONCAPA::map::order; $i++) { |
my $total = scalar(@LONCAPA::map::order) - 1; |
|
for (my $i=$total; $i>=0; $i--) { |
my $idx = $LONCAPA::map::order[$i]; |
my $idx = $LONCAPA::map::order[$i]; |
if (defined($LONCAPA::map::resources[$idx])) { |
if (defined($LONCAPA::map::resources[$idx])) { |
my $changed; |
my $changed; |
Line 2721 sub apply_fixups {
|
Line 3299 sub apply_fixups {
|
splice(@LONCAPA::map::order,$i,1); |
splice(@LONCAPA::map::order,$i,1); |
if (ref($currparam{$idx}) eq 'ARRAY') { |
if (ref($currparam{$idx}) eq 'ARRAY') { |
foreach my $name (@{$currparam{$idx}}) { |
foreach my $name (@{$currparam{$idx}}) { |
&LONCAPA::map::delparameter($idx,'parameter_'.$name); |
&LONCAPA::map::delparameter($idx,$name); |
} |
} |
} |
} |
next; |
next; |
Line 2763 sub apply_fixups {
|
Line 3341 sub apply_fixups {
|
foreach my $idx (keys(%remparam)) { |
foreach my $idx (keys(%remparam)) { |
if (ref($remparam{$idx}) eq 'ARRAY') { |
if (ref($remparam{$idx}) eq 'ARRAY') { |
foreach my $name (@{$remparam{$idx}}) { |
foreach my $name (@{$remparam{$idx}}) { |
&LONCAPA::map::delparameter($idx,'parameter_'.$name); |
&LONCAPA::map::delparameter($idx,$name); |
} |
} |
} |
} |
} |
} |
Line 2796 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 2871 sub update_parameter {
|
Line 3453 sub update_parameter {
|
'randomorder' => {}, |
'randomorder' => {}, |
); |
); |
foreach my $which (keys(%allchecked)) { |
foreach my $which (keys(%allchecked)) { |
$env{'form.all'.$which} =~ s/,$//; |
$env{'form.all'.$which} =~ s/,$//; |
if ($which eq 'randompick') { |
if ($which eq 'randompick') { |
foreach my $item (split(/,/,$env{'form.all'.$which})) { |
foreach my $item (split(/,/,$env{'form.all'.$which})) { |
my ($res,$value) = split(/:/,$item); |
my ($res,$value) = split(/:/,$item); |
Line 2890 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 2974 sub update_parameter {
|
Line 3556 sub update_parameter {
|
|
|
sub handle_edit_cmd { |
sub handle_edit_cmd { |
my ($coursenum,$coursedom) =@_; |
my ($coursenum,$coursedom) =@_; |
|
my $haschanges = 0; |
if ($env{'form.cmd'} eq '') { |
if ($env{'form.cmd'} eq '') { |
return 0; |
return $haschanges; |
} |
} |
my ($cmd,$idx)=split('_',$env{'form.cmd'}); |
my ($cmd,$idx)=split('_',$env{'form.cmd'}); |
|
|
Line 2990 sub handle_edit_cmd {
|
Line 3573 sub handle_edit_cmd {
|
&LONCAPA::map::makezombie($LONCAPA::map::order[$idx]); |
&LONCAPA::map::makezombie($LONCAPA::map::order[$idx]); |
} |
} |
splice(@LONCAPA::map::order, $idx, 1); |
splice(@LONCAPA::map::order, $idx, 1); |
|
$haschanges = 1; |
} elsif ($cmd eq 'cut') { |
} elsif ($cmd eq 'cut') { |
&LONCAPA::map::makezombie($LONCAPA::map::order[$idx]); |
&LONCAPA::map::makezombie($LONCAPA::map::order[$idx]); |
splice(@LONCAPA::map::order, $idx, 1); |
splice(@LONCAPA::map::order, $idx, 1); |
|
$haschanges = 1; |
} elsif ($cmd eq 'up' |
} elsif ($cmd eq 'up' |
&& ($idx) && (defined($LONCAPA::map::order[$idx-1]))) { |
&& ($idx) && (defined($LONCAPA::map::order[$idx-1]))) { |
@LONCAPA::map::order[$idx-1,$idx] = @LONCAPA::map::order[$idx,$idx-1]; |
@LONCAPA::map::order[$idx-1,$idx] = @LONCAPA::map::order[$idx,$idx-1]; |
|
$haschanges = 1; |
} elsif ($cmd eq 'down' |
} elsif ($cmd eq 'down' |
&& defined($LONCAPA::map::order[$idx+1])) { |
&& defined($LONCAPA::map::order[$idx+1])) { |
@LONCAPA::map::order[$idx+1,$idx] = @LONCAPA::map::order[$idx,$idx+1]; |
@LONCAPA::map::order[$idx+1,$idx] = @LONCAPA::map::order[$idx,$idx+1]; |
|
$haschanges = 1; |
} elsif ($cmd eq 'rename') { |
} elsif ($cmd eq 'rename') { |
my $comment = &LONCAPA::map::qtunescape($env{'form.title'}); |
my $comment = &LONCAPA::map::qtunescape($env{'form.title'}); |
if ($comment=~/\S/) { |
if ($comment=~/\S/) { |
Line 3012 sub handle_edit_cmd {
|
Line 3595 sub handle_edit_cmd {
|
# Devalidate title cache |
# Devalidate title cache |
my $renamed_url=&LONCAPA::map::qtescape($url); |
my $renamed_url=&LONCAPA::map::qtescape($url); |
&Apache::lonnet::devalidate_title_cache($renamed_url); |
&Apache::lonnet::devalidate_title_cache($renamed_url); |
|
$haschanges = 1; |
} else { |
} elsif ($cmd eq 'setalias') { |
return 0; |
my $newvalue = $env{'form.alias'}; |
|
if ($newvalue ne '') { |
|
unless (Apache::lonnet::get_symb_from_alias($newvalue)) { |
|
&LONCAPA::map::storeparameter($idx,'parameter_0_mapalias',$newvalue, |
|
'string'); |
|
&remember_parms($idx,'mapalias','set',$newvalue); |
|
$haschanges = 1; |
|
} |
|
} |
|
} elsif ($cmd eq 'delalias') { |
|
my $current = (&LONCAPA::map::getparameter($idx,'parameter_0_mapalias'))[0]; |
|
if ($current ne '') { |
|
&LONCAPA::map::delparameter($idx,'parameter_0_mapalias'); |
|
&remember_parms($idx,'mapalias','del'); |
|
$haschanges = 1; |
|
} |
} |
} |
return 1; |
return $haschanges; |
} |
} |
|
|
sub editor { |
sub editor { |
Line 3140 sub editor {
|
Line 3738 sub editor {
|
# Rename, cut, copy or remove a single resource |
# Rename, cut, copy or remove a single resource |
if (&handle_edit_cmd($coursenum,$coursedom)) { |
if (&handle_edit_cmd($coursenum,$coursedom)) { |
my $contentchg; |
my $contentchg; |
if ($env{'form.cmd'} =~ m{^(remove|cut)_}) { |
if ($env{'form.cmd'} =~ m{^(remove|cut|setalias|delalias)_}) { |
$contentchg = 1; |
$contentchg = 1; |
} |
} |
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,$contentchg); |
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,$contentchg); |
Line 3326 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 3349 sub editor {
|
Line 3962 sub editor {
|
push(@allmapidx,$res); |
push(@allmapidx,$res); |
} |
} |
|
|
|
if (($supplementalflag) && (!$allowed) && (!$env{'request.role.adv'})) { |
|
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); |
$idx++; |
$idx++; |
$shown++; |
$shown++; |
} |
} |
Line 3362 sub editor {
|
Line 3981 sub editor {
|
my $need_save; |
my $need_save; |
if ($allowed || ($supplementalflag && $folder eq 'supplemental')) { |
if ($allowed || ($supplementalflag && $folder eq 'supplemental')) { |
my $toolslink; |
my $toolslink; |
if ($allowed) { |
if ($allowed || $canedit) { |
|
my $helpitem = 'Navigation_Screen'; |
|
if (!$allowed) { |
|
$helpitem = 'Supplemental_Navigation'; |
|
} |
$toolslink = '<table><tr><td>' |
$toolslink = '<table><tr><td>' |
.&Apache::loncommon::help_open_menu('Navigation Screen', |
.&Apache::loncommon::help_open_menu('Navigation Screen', |
'Navigation_Screen',undef,'RAT') |
$helpitem,undef,'RAT') |
.'</td><td class="LC_middle">'.&mt('Tools:').'</td>' |
.'</td><td class="LC_middle">'.&mt('Tools:').'</td>' |
.'<td align="left"><ul id="LC_toolbar">' |
.'<td align="left"><ul id="LC_toolbar">' |
.'<li><a href="/adm/coursedocs?forcesupplement=1&command=editsupp" ' |
.'<li><a href="/adm/coursedocs?forcesupplement=1&command=editsupp" ' |
Line 3380 sub editor {
|
Line 4003 sub editor {
|
.&Apache::loncommon::start_data_table(undef,'contentlist') |
.&Apache::loncommon::start_data_table(undef,'contentlist') |
.&Apache::loncommon::start_data_table_header_row() |
.&Apache::loncommon::start_data_table_header_row() |
.'<th colspan="2">'.&mt('Move').'</th>' |
.'<th colspan="2">'.&mt('Move').'</th>' |
.'<th colspan="2">'.&mt('Actions').'</th>' |
.'<th colspan="3">'.&mt('Actions').'</th>' |
.'<th>'.&mt('Document').'</th>'; |
.'<th>'.&mt('Document').'</th>' |
if ($folder !~ /^supplemental/) { |
.'<th colspan="2">'.&mt('Settings').'</th>' |
$to_show .= '<th colspan="4">'.&mt('Settings').'</th>'; |
.&Apache::loncommon::end_data_table_header_row(); |
} |
|
$to_show .= &Apache::loncommon::end_data_table_header_row(); |
|
if ($folder !~ /^supplemental/) { |
if ($folder !~ /^supplemental/) { |
$lists{'canhide'} = join(',',@allidx); |
$lists{'canhide'} = join(',',@allidx); |
$lists{'canrandomlyorder'} = join(',',@allmapidx); |
$lists{'canrandomlyorder'} = join(',',@allmapidx); |
Line 3401 sub editor {
|
Line 4022 sub editor {
|
if (@allidx > 0) { |
if (@allidx > 0) { |
my $path; |
my $path; |
if ($env{'form.folderpath'}) { |
if ($env{'form.folderpath'}) { |
$path = |
$path = |
&HTML::Entities::encode($env{'form.folderpath'},'<>&"'); |
&HTML::Entities::encode($env{'form.folderpath'},'<>&"'); |
} |
} |
if (@allidx > 1) { |
if (@allidx > 1) { |
$to_show .= |
$to_show .= |
&Apache::loncommon::continue_data_table_row(). |
&Apache::loncommon::continue_data_table_row(). |
'<td colspan="2"> </td>'. |
'<td colspan="2"> </td>'. |
'<td>'. |
'<td>'. |
&multiple_check_form('actions',\%lists,$canedit). |
&multiple_check_form('actions',\%lists,$canedit). |
'</td>'. |
'</td>'. |
'<td> </td>'. |
'<td colspan="3"> </td>'. |
'<td> </td>'. |
'<td colspan="2">'. |
'<td colspan="4">'. |
|
&multiple_check_form('settings',\%lists,$canedit). |
&multiple_check_form('settings',\%lists,$canedit). |
'</td>'. |
'</td>'. |
&Apache::loncommon::end_data_table_row(); |
&Apache::loncommon::end_data_table_row(); |
Line 3482 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 3520 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 3653 sub process_file_upload {
|
Line 4273 sub process_file_upload {
|
my $uploadphase = 'upload_embedded'; |
my $uploadphase = 'upload_embedded'; |
my $primaryurl = &HTML::Entities::encode($url,'<>&"'); |
my $primaryurl = &HTML::Entities::encode($url,'<>&"'); |
my $state = &embedded_form_elems($uploadphase,$primaryurl,$newidx); |
my $state = &embedded_form_elems($uploadphase,$primaryurl,$newidx); |
my ($embedded,$num) = |
my ($embedded,$num) = |
&Apache::loncommon::ask_for_embedded_content( |
&Apache::loncommon::ask_for_embedded_content( |
'/adm/coursedocs',$state,$allfiles,$codebase,{'docs_url' => $url}); |
'/adm/coursedocs',$state,$allfiles,$codebase,{'docs_url' => $url}); |
if ($embedded) { |
if ($embedded) { |
Line 3734 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)=@_; |
my ($foldertitle,$renametitle,$oldtitle); |
my ($foldertitle,$renametitle,$oldtitle,$encodedtitle); |
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 3761 sub entryline {
|
Line 4383 sub entryline {
|
my $line=&Apache::loncommon::start_data_table_row(); |
my $line=&Apache::loncommon::start_data_table_row(); |
my ($form_start,$form_end,$form_common,$form_param); |
my ($form_start,$form_end,$form_common,$form_param); |
# Edit commands |
# Edit commands |
my ($esc_path, $path, $symb); |
my ($esc_path, $path, $symb, $shownsymb, $curralias); |
if ($env{'form.folderpath'}) { |
if ($env{'form.folderpath'}) { |
$esc_path=&escape($env{'form.folderpath'}); |
$esc_path=&escape($env{'form.folderpath'}); |
$path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); |
$path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); |
Line 3830 END
|
Line 4452 END
|
'ct' => 'Cut', |
'ct' => 'Cut', |
'rn' => 'Rename', |
'rn' => 'Rename', |
'cp' => 'Copy', |
'cp' => 'Copy', |
|
'da' => 'Unset alias', |
|
'sa' => 'Set alias', |
'ex' => 'External Resource', |
'ex' => 'External Resource', |
'et' => 'External Tool', |
'et' => 'External Tool', |
'ed' => 'Edit', |
'ed' => 'Edit', |
Line 3860 END
|
Line 4484 END
|
($url!~/$LONCAPA::assess_page_seq_re/)) { |
($url!~/$LONCAPA::assess_page_seq_re/)) { |
$confirm_removal = 1; |
$confirm_removal = 1; |
} |
} |
|
if ($url =~ /$LONCAPA::assess_re/) { |
|
$curralias = (&LONCAPA::map::getparameter($orderidx,'parameter_0_mapalias'))[0]; |
|
} |
|
|
if ($denied{'copy'}) { |
if ($denied{'copy'}) { |
$copylink=(<<ENDCOPY) |
$copylink=(<<ENDCOPY) |
Line 3961 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 3979 END
|
Line 4607 END
|
$url='/adm/supplemental?'; |
$url='/adm/supplemental?'; |
} |
} |
} else { |
} else { |
&Apache::lonnet::allowuploaded('/adm/coursedoc',$url); |
$plainurl = $url; |
} |
} |
} |
} |
|
|
my ($editlink,$extresform,$anchor,$hiddenres,$nomodal); |
my ($editlink,$extresform,$anchor,$hiddenres,$nomodal); |
my $orig_url = $url; |
my $orig_url = $url; |
$orig_url=~s{http(:|:)//https(:|:)//}{https$2//}; |
$orig_url=~s{http(:|:)//https(:|:)//}{https$2//}; |
$url=~s{^http(|s)(:|:)//}{/adm/wrapper/ext/}; |
if ($container eq 'page') { |
|
$url=~s{^http(|s)(:|:)//}{/ext/}; |
|
} else { |
|
$url=~s{^http(|s)(:|:)//}{/adm/wrapper/ext/}; |
|
} |
if (!$supplementalflag && $residx && $symb) { |
if (!$supplementalflag && $residx && $symb) { |
if ((!$isfolder) && (!$ispage)) { |
if ((!$isfolder) && (!$ispage)) { |
(undef,undef,$url)=&Apache::lonnet::decode_symb($symb); |
(undef,undef,$url)=&Apache::lonnet::decode_symb($symb); |
$url=&Apache::lonnet::clutter($url); |
if (($url =~ m{^ext/}) && ($container eq 'page')) { |
|
$url=&Apache::lonnet::clutter_with_no_wrapper($url); |
|
} else { |
|
$url=&Apache::lonnet::clutter($url); |
|
} |
if ($url=~/^\/*uploaded\//) { |
if ($url=~/^\/*uploaded\//) { |
$url=~/\.(\w+)$/; |
$url=~/\.(\w+)$/; |
my $embstyle=&Apache::loncommon::fileembstyle($1); |
my $embstyle=&Apache::loncommon::fileembstyle($1); |
Line 4004 END
|
Line 4640 END
|
} elsif ($url=~m{^(|/adm/wrapper)/ext/([^#]+)}) { |
} elsif ($url=~m{^(|/adm/wrapper)/ext/([^#]+)}) { |
my $wrapped = $1; |
my $wrapped = $1; |
my $exturl = $2; |
my $exturl = $2; |
if ($wrapped eq '') { |
if (($wrapped eq '') && ($container ne 'page')) { |
$url='/adm/wrapper'.$url; |
$url='/adm/wrapper'.$url; |
} |
} |
if (($ENV{'SERVER_PORT'} == 443) && ($exturl !~ /^https:/)) { |
if (($ENV{'SERVER_PORT'} == 443) && ($exturl !~ /^https:/)) { |
Line 4015 END
|
Line 4651 END
|
} elsif ($url eq "/public/$coursedom/$coursenum/syllabus") { |
} elsif ($url eq "/public/$coursedom/$coursenum/syllabus") { |
if (($ENV{'SERVER_PORT'} == 443) && |
if (($ENV{'SERVER_PORT'} == 443) && |
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { |
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { |
$url .= '?usehttp=1'; |
unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) { |
|
$url .= '?usehttp=1'; |
|
} |
$nomodal = 1; |
$nomodal = 1; |
} |
} |
} |
} |
if (&Apache::lonnet::symbverify($symb,$url)) { |
my $checkencrypt; |
my $shownsymb = $symb; |
if (!$env{'request.role.adv'}) { |
if ($isexternal) { |
|
if ($url =~ /^([^#]+)#([^#]+)$/) { |
|
$url = $1; |
|
$anchor = $2; |
|
if ($symb =~ m{^([^#]+)\Q#$anchor\E$}) { |
|
$shownsymb = $1.&escape('#').$anchor; |
|
} |
|
} |
|
} |
|
unless ($env{'request.role.adv'}) { |
|
if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { |
|
$url = ''; |
|
} |
|
if (&Apache::lonnet::EXT('resource.0.hiddenresource',$symb) =~ /^yes$/i) { |
|
$url = ''; |
|
$hiddenres = 1; |
|
} |
|
} |
|
if ($url ne '') { |
|
$url.=(($url=~/\?/)?'&':'?').'symb='.&HTML::Entities::encode($shownsymb,'"<>&'); |
|
} |
|
} elsif (!$env{'request.role.adv'}) { |
|
my $checkencrypt; |
|
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)) { |
$checkencrypt = 1; |
$checkencrypt = 1; |
} elsif (ref($navmapref)) { |
} elsif (ref($navmapref)) { |
unless (ref($$navmapref)) { |
unless (ref($$navmapref)) { |
Line 4053 END
|
Line 4668 END
|
} |
} |
if (ref($$navmapref)) { |
if (ref($$navmapref)) { |
if (lc($$navmapref->get_mapparam($symb,undef,"0.encrypturl")) eq 'yes') { |
if (lc($$navmapref->get_mapparam($symb,undef,"0.encrypturl")) eq 'yes') { |
$checkencrypt = 1; |
$checkencrypt = 1; |
} |
} |
} |
} |
} |
} |
if ($checkencrypt) { |
} |
my $shownsymb = &Apache::lonenc::encrypted($symb); |
if ($checkencrypt) { |
my $shownurl = &Apache::lonenc::encrypted($url); |
my $currenc = $env{'request.enc'}; |
if (&Apache::lonnet::symbverify($shownsymb,$shownurl)) { |
$env{'request.enc'} = 1; |
$url = $shownurl.(($shownurl=~/\?/)?'&':'?').'symb='.&HTML::Entities::encode($shownsymb,'"<>&'); |
$shownsymb = &Apache::lonenc::encrypted($symb); |
if ($env{'request.enc'} ne '') { |
my $shownurl = &Apache::lonenc::encrypted($url); |
delete($env{'request.enc'}); |
if (&Apache::lonnet::symbverify($symb,$url)) { |
} |
$url = $shownurl; |
} else { |
|
$url=''; |
|
} |
|
} else { |
} else { |
$url=''; |
$url = ''; |
|
} |
|
$env{'request.enc'} = $currenc; |
|
} elsif (&Apache::lonnet::symbverify($symb,$url)) { |
|
$shownsymb = $symb; |
|
if ($isexternal) { |
|
$url =~ s/\#[^#]+$//; |
|
if ($container eq 'page') { |
|
$url = &Apache::lonnet::clutter($url); |
|
} |
} |
} |
} else { |
} else { |
$url=''; |
$url = ''; |
|
} |
|
unless ($env{'request.role.adv'}) { |
|
if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { |
|
$url = ''; |
|
} |
|
if (&Apache::lonnet::EXT('resource.0.hiddenresource',$symb) =~ /^yes$/i) { |
|
$url = ''; |
|
$hiddenres = 1; |
|
} |
|
} |
|
if (($url ne '') && ($shownsymb ne '')) { |
|
$url .= (($url=~/\?/)?'&':'?').'symb='.&escape($shownsymb); |
} |
} |
} |
} |
} elsif ($supplementalflag) { |
} elsif ($supplementalflag) { |
Line 4081 END
|
Line 4714 END
|
$url = $1; |
$url = $1; |
$anchor = $2; |
$anchor = $2; |
if (($url =~ m{^(|/adm/wrapper)/ext/(?!https:)}) && ($ENV{'SERVER_PORT'} == 443)) { |
if (($url =~ m{^(|/adm/wrapper)/ext/(?!https:)}) && ($ENV{'SERVER_PORT'} == 443)) { |
if ($hostname ne '') { |
unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) { |
$url = 'http://'.$hostname.$url; |
if ($hostname ne '') { |
|
$url = 'http://'.$hostname.$url; |
|
} |
|
$url .= (($url =~ /\?/) ? '&':'?').'usehttp=1'; |
} |
} |
$nomodal = 1; |
$nomodal = 1; |
} |
} |
Line 4090 END
|
Line 4726 END
|
} elsif ($url =~ m{^\Q/public/$coursedom/$coursenum/syllabus\E}) { |
} elsif ($url =~ m{^\Q/public/$coursedom/$coursenum/syllabus\E}) { |
if (($ENV{'SERVER_PORT'} == 443) && |
if (($ENV{'SERVER_PORT'} == 443) && |
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { |
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { |
if ($hostname ne '') { |
unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) { |
$url = 'http://'.$hostname.$url; |
if ($hostname ne '') { |
|
$url = 'http://'.$hostname.$url; |
|
} |
|
$url .= (($url =~ /\?/) ? '&':'?').'usehttp=1'; |
} |
} |
$url .= (($url =~ /\?/) ? '&':'?').'usehttp=1'; |
|
$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 4107 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 ($ishidden || (&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { |
|
$hiddenfolder = 1; |
|
} |
} else { |
} else { |
my $rpicknum = (&LONCAPA::map::getparameter($orderidx, |
my $rpicknum = (&LONCAPA::map::getparameter($orderidx, |
'parameter_randompick'))[0]; |
'parameter_randompick'))[0]; |
Line 4142 END
|
Line 4799 END
|
} |
} |
} |
} |
} |
} |
|
|
# Append randompick number, hidden, and encrypted with ":" to foldername, |
# Append randompick number, hidden, and encrypted with ":" to foldername, |
# so it gets transferred between levels |
# so it gets transferred between levels |
$folderpath.=$containerarg.'&'.$foldername. |
$folderpath.=$containerarg.'&'.$foldername. |
Line 4183 $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 4192 $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 4203 $form_end;
|
Line 4860 $form_end;
|
} |
} |
my ($tdalign,$tdwidth); |
my ($tdalign,$tdwidth); |
if ($allowed) { |
if ($allowed) { |
my $fileloc = |
my $fileloc = |
&Apache::lonnet::declutter(&Apache::lonnet::filelocation('',$orig_url)); |
&Apache::lonnet::declutter(&Apache::lonnet::filelocation('',$orig_url)); |
if ($isexternal) { |
if ($isexternal) { |
($editlink,$extresform) = |
($editlink,$extresform) = |
&Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem, |
&Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem, |
undef,undef,undef,undef,undef,undef, |
undef,undef,undef,undef,undef,undef, |
undef,$disabled); |
undef,$disabled); |
Line 4223 $form_end;
|
Line 4880 $form_end;
|
if ($supplementalflag) { |
if ($supplementalflag) { |
$suppanchor = $anchor; |
$suppanchor = $anchor; |
} |
} |
my $jscall = |
my $jscall = |
&Apache::lonhtmlcommon::jump_to_editres($cfile,$home, |
&Apache::lonhtmlcommon::jump_to_editres($cfile,$home, |
$switchserver, |
$switchserver, |
$forceedit, |
$forceedit, |
undef,$symb, |
undef,$symb,$shownsymb, |
&escape($env{'form.folderpath'}), |
&escape($env{'form.folderpath'}), |
$renametitle,$hostname, |
$renametitle,$hostname, |
'','',1,$suppanchor); |
'','',1,$suppanchor); |
Line 4246 $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>'; |
my $link; |
if ($orig_url =~ /$LONCAPA::assess_re/) { |
|
$line.= '<br />'; |
|
if ($curralias ne '') { |
|
$line.='<span class="LC_nobreak"><a href="javascript:delalias('."'$esc_path','$orderidx'".');" class="LC_docs_alias">'. |
|
$lt{'da'}.'</a></span>'; |
|
} else { |
|
$line.='<span class="LC_nobreak"><a href="javascript:setalias('."'$esc_path','$orderidx'".');" class="LC_docs_alias">'. |
|
$lt{'sa'}.'</a></span>'; |
|
} |
|
} |
|
$line.='</td><td><span class="LC_nobreak">'; |
|
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 4258 $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'. |
my $inhibitmenu; |
(($anchor ne '')?$anchor:'')); |
if ((($supplementalflag) && ($allowed) && ($url =~ m{^/adm/wrapper/})) || |
if ($nomodal) { |
(($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 4277 $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) { |
|
my $editicon = &Apache::loncommon::lonhttpdurl('/res/adm/pages').'/editmap.png'; |
|
my $editurl = $url; |
|
$editurl =~ s{^\Q/adm/supplemental?\E}{/adm/coursedocs?command=direct&forcesupplement=1&}; |
|
$line .= ' '.'<a href="'.$editurl.'">'. |
|
'<img src="'.$editicon.'" alt="'.&mt('Edit Content').'" title="'.&mt('Edit Content').'" />'. |
|
'</a>'; |
|
} |
|
if ((($hiddenfolder) || ($hiddenres)) && (!$allowed) && ($supplementalflag)) { |
|
$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.=&Apache::loncommon::modal_link($link,$title,600,500); |
$line.=&Apache::loncommon::modal_link($link,$title,600,500); |
} |
} |
} elsif (($hiddenfolder) || ($hiddenres)) { |
} elsif (($hiddenfolder) || ($hiddenres)) { |
$line.=$title.' <span class="LC_warning LC_docs_reinit_warn">'.&mt('(Hidden)').'</span>'; |
$line.=$title.' <span class="LC_warning LC_docs_reinit_warn">('.&mt('Hidden').')</span>'; |
} else { |
} else { |
$line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>'; |
$line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>'; |
} |
} |
$line.="$extresform</td>"; |
if (($allowed) && ($curralias ne '')) { |
|
$line .= '<br /><span class="LC_docs_alias_name">('.$curralias.')</span>'; |
|
} else { |
|
$line .= $extresform; |
|
} |
|
$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 (($allowed) && ($folder!~/^supplemental/)) { |
if ($uploaded && $url && !$isfolder && !$ispage) { |
my %lt=&Apache::lonlocal::texthash( |
if (($plainurl ne '') && ($env{'request.role.adv'} || $allowed || !$hiddenres)) { |
'hd' => 'Hidden', |
&Apache::lonnet::allowuploaded('/adm/coursedoc',$plainurl); |
'ec' => 'URL hidden'); |
|
my ($enctext,$hidtext); |
|
if ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) { |
|
$enctext = ' checked="checked"'; |
|
if (($ishash) && (ref($filtersref->{'encrypturl'}) eq 'ARRAY')) { |
|
push(@{$filtersref->{'encrypturl'}},$orderidx); |
|
} |
|
} |
} |
|
} |
|
if ($allowed) { |
|
my %lt=&Apache::lonlocal::texthash( |
|
'hd' => 'Hidden', |
|
'ec' => 'URL hidden'); |
|
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); |
} |
} |
} |
} |
my $formhidden = 'edit_hiddenresource_'.$orderidx; |
$formhidden = 'edit_hiddenresource_'.$orderidx; |
my $formurlhidden = 'edit_encrypturl_'.$orderidx; |
$line.=(<<ENDPARMS); |
$line.=(<<ENDPARMS); |
|
<td class="LC_docs_entry_parameter"> |
<td class="LC_docs_entry_parameter"> |
<form action="/adm/coursedocs" method="post" name="$formhidden"> |
<form action="/adm/coursedocs" method="post" name="$formhidden"> |
$form_param |
$form_param |
$form_common |
$form_common |
<label><input type="checkbox" name="hiddenresource_$orderidx" id="hiddenresource_$orderidx" onclick="checkForSubmit(this.form,'hiddenresource','settings');" $hidtext $disabled /> $lt{'hd'}</label> |
<label><input type="checkbox" name="hiddenresource_$orderidx" id="hiddenresource_$orderidx" onclick="checkForSubmit(this.form,'hiddenresource','settings');" $hidtext $disabled /> $lt{'hd'}</label> |
$form_end |
$form_end |
|
ENDPARMS |
|
if ($folder =~/^supplemental/) { |
|
$line.= "\n <td>"; |
|
} else { |
|
if ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) { |
|
$enctext = ' checked="checked"'; |
|
if (($ishash) && (ref($filtersref->{'encrypturl'}) eq 'ARRAY')) { |
|
push(@{$filtersref->{'encrypturl'}},$orderidx); |
|
} |
|
} |
|
$formurlhidden = 'edit_encrypturl_'.$orderidx; |
|
$line.=(<<ENDPARMS); |
<br /> |
<br /> |
<form action="/adm/coursedocs" method="post" name="$formurlhidden"> |
<form action="/adm/coursedocs" method="post" name="$formurlhidden"> |
$form_param |
$form_param |
Line 4329 $form_end;
|
Line 5052 $form_end;
|
<td class="LC_docs_entry_parameter">$rand_pick_text<br /> |
<td class="LC_docs_entry_parameter">$rand_pick_text<br /> |
$rand_order_text</td> |
$rand_order_text</td> |
ENDPARMS |
ENDPARMS |
|
} |
} |
} |
$line.=&Apache::loncommon::end_data_table_row(); |
$line.=&Apache::loncommon::end_data_table_row(); |
return $line; |
return $line; |
Line 4435 sub new_timebased_suffix {
|
Line 5159 sub new_timebased_suffix {
|
} |
} |
} |
} |
if ($freedlock ne 'ok') { |
if ($freedlock ne 'ok') { |
$locknotfreed = |
$locknotfreed = |
'<div class="LC_error">'. |
'<div class="LC_error">'. |
&mt('There was a problem removing a lockfile.').' '; |
&mt('There was a problem removing a lockfile.').' '; |
if ($type eq 'paste') { |
if ($type eq 'paste') { |
Line 4508 sub untiehash {
|
Line 5232 sub untiehash {
|
|
|
|
|
sub checkonthis { |
sub checkonthis { |
my ($r,$url,$level,$title)=@_; |
my ($r,$url,$level,$title,$checkstale)=@_; |
$url=&unescape($url); |
$url=&unescape($url); |
$alreadyseen{$url}=1; |
$alreadyseen{$url}=1; |
$r->rflush(); |
$r->rflush(); |
Line 4523 sub checkonthis {
|
Line 5247 sub checkonthis {
|
$r->print('<a href="'.$url.'" target="cat">'. |
$r->print('<a href="'.$url.'" target="cat">'. |
($title?$title:$url).'</a> '); |
($title?$title:$url).'</a> '); |
if ($url=~/^\/res\//) { |
if ($url=~/^\/res\//) { |
|
my $updated; |
|
if (($checkstale) && ($url !~ m{^/res/lib/templates/}) && |
|
($url !~ /\.\d+\.\w+$/)) { |
|
$updated = &Apache::lonnet::remove_stale_resfile($url); |
|
} |
my $result=&Apache::lonnet::repcopy( |
my $result=&Apache::lonnet::repcopy( |
&Apache::lonnet::filelocation('',$url)); |
&Apache::lonnet::filelocation('',$url)); |
if ($result eq 'ok') { |
if ($result eq 'ok') { |
$r->print('<span class="LC_success">'.&mt('ok').'</span>'); |
$r->print('<span class="LC_success">'.&mt('ok').'</span>'); |
|
if ($updated) { |
|
$r->print('<br />'); |
|
for (my $i=0;$i<=$level*5;$i++) { |
|
$r->print(' '); |
|
} |
|
$r->print('- '.&mt('Outdated copy removed')); |
|
} |
$r->rflush(); |
$r->rflush(); |
&Apache::lonnet::countacc($url); |
&Apache::lonnet::countacc($url); |
$url=~/\.(\w+)$/; |
$url=~/\.(\w+)$/; |
Line 4560 sub checkonthis {
|
Line 5296 sub checkonthis {
|
&Apache::lonnet::metadata($url,'dependencies'); |
&Apache::lonnet::metadata($url,'dependencies'); |
foreach my $dep (split(/\,/,$dependencies)) { |
foreach my $dep (split(/\,/,$dependencies)) { |
if (($dep=~/^\/res\//) && (!$alreadyseen{$dep})) { |
if (($dep=~/^\/res\//) && (!$alreadyseen{$dep})) { |
&checkonthis($r,$dep,$level+1); |
&checkonthis($r,$dep,$level+1,'',$checkstale); |
} |
} |
} |
} |
} elsif ($result eq 'unavailable') { |
} elsif ($result eq 'unavailable') { |
Line 4574 sub checkonthis {
|
Line 5310 sub checkonthis {
|
} else { |
} else { |
$r->print('<span class="LC_error">'.&mt('access denied').'</span>'); |
$r->print('<span class="LC_error">'.&mt('access denied').'</span>'); |
} |
} |
|
if (($updated) && ($result ne 'ok')) { |
|
$r->print('<br />'.&mt('Outdated copy removed')); |
|
} |
} |
} |
} |
} |
} |
} |
Line 4626 sub list_symbs {
|
Line 5365 sub list_symbs {
|
$r->print(&endContentScreen()); |
$r->print(&endContentScreen()); |
} |
} |
|
|
|
sub short_urls { |
|
my ($r,$canedit) = @_; |
|
my $crstype = &Apache::loncommon::course_type(); |
|
my $formname = 'shortenurl'; |
|
$r->print(&Apache::loncommon::start_page('Display/Set Shortened URLs')); |
|
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Shortened URLs')); |
|
$r->print(&startContentScreen('tools')); |
|
my ($navmap,$errormsg) = |
|
&Apache::loncourserespicker::get_navmap_object($crstype,'shorturls'); |
|
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
|
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
my (%maps,%resources,%titles); |
|
if (!ref($navmap)) { |
|
$r->print($errormsg. |
|
&endContentScreen()); |
|
return ''; |
|
} else { |
|
$r->print('<h4 class="LC_info">'.&mt('Tiny URLs for deep-linking into course').'</h4>'."\n"); |
|
$r->rflush(); |
|
my $readonly; |
|
if ($canedit) { |
|
my ($numnew,$errors) = &Apache::loncommon::get_requested_shorturls($cdom,$cnum,$navmap); |
|
if ($numnew) { |
|
$r->print('<p class="LC_info">'.&mt('Created [quant,_1,URL]',$numnew).'</p>'); |
|
} |
|
if ((ref($errors) eq 'ARRAY') && (@{$errors} > 0)) { |
|
$r->print(&mt('The following errors occurred when processing your request to create shortened URLs:').'<br /><ul>'); |
|
foreach my $error (@{$errors}) { |
|
$r->print('<li>'.$error.'</li>'); |
|
} |
|
$r->print('</ul><br />'); |
|
} |
|
} else { |
|
$readonly = 1; |
|
} |
|
my %currtiny = &Apache::lonnet::dump('tiny',$cdom,$cnum); |
|
$r->print(&Apache::loncourserespicker::create_picker($navmap,'shorturls',$formname,$crstype,undef, |
|
undef,undef,undef,undef,undef,\%currtiny,$readonly)); |
|
} |
|
$r->print(&endContentScreen()); |
|
} |
|
|
sub verifycontent { |
sub contentverifyform { |
my ($r) = @_; |
my ($r) = @_; |
my $crstype = &Apache::loncommon::course_type(); |
my $crstype = &Apache::loncommon::course_type(); |
$r->print(&Apache::loncommon::start_page('Verify '.$crstype.' Content')); |
$r->print(&Apache::loncommon::start_page('Verify '.$crstype.' Content')); |
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$crstype.' Content')); |
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$crstype.' Content')); |
$r->print(&startContentScreen('tools')); |
$r->print(&startContentScreen('tools')); |
|
$r->print('<h4 class="LC_info">'.&mt($crstype.' content verification').'</h4>'); |
|
$r->print('<form method="post" action="/adm/coursedocs"><p>'. |
|
&mt('Include a check if files copied from elsewhere are up to date (will increase verification time)?'). |
|
' <span class="LC_nobreak">'. |
|
'<label><input type="radio" name="checkstale" value="0" checked="checked" />'. |
|
&mt('No').'</label>'.(' 'x2). |
|
'<label><input type="radio" name="checkstale" value="1" />'. |
|
&mt('Yes').'</label></span></p><p>'. |
|
'<input type="submit" value="'.&mt('Verify Content').' "/>'. |
|
'<input type="hidden" value="1" name="tools" />'. |
|
'<input type="hidden" value="1" name="verify" /></p></form>'); |
|
$r->print(&endContentScreen()); |
|
return; |
|
} |
|
|
|
sub verifycontent { |
|
my ($r,$checkstale) = @_; |
|
my $crstype = &Apache::loncommon::course_type(); |
|
$r->print(&Apache::loncommon::start_page('Verify '.$crstype.' Content')); |
|
$r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$crstype.' Content')); |
|
$r->print(&startContentScreen('tools')); |
$r->print('<h4 class="LC_info">'.&mt($crstype.' content verification').'</h4>'); |
$r->print('<h4 class="LC_info">'.&mt($crstype.' content verification').'</h4>'); |
$hashtied=0; |
$hashtied=0; |
undef %alreadyseen; |
undef %alreadyseen; |
Line 4649 sub verifycontent {
|
Line 5450 sub verifycontent {
|
} |
} |
} |
} |
if (($key=~/^src\_(.+)$/) && (!$alreadyseen{&unescape($hash{$key})})) { |
if (($key=~/^src\_(.+)$/) && (!$alreadyseen{&unescape($hash{$key})})) { |
&checkonthis($r,$hash{$key},0,$hash{'title_'.$1}); |
&checkonthis($r,$hash{$key},0,$hash{'title_'.$1},$checkstale); |
} |
} |
} |
} |
&untiehash(); |
&untiehash(); |
Line 4657 sub verifycontent {
|
Line 5458 sub verifycontent {
|
$r->print(&endContentScreen()); |
$r->print(&endContentScreen()); |
} |
} |
|
|
|
|
sub devalidateversioncache { |
sub devalidateversioncache { |
my $src=shift; |
my $src=shift; |
&Apache::lonnet::devalidate_cache_new('courseresversion',$env{'request.course.id'}.'_'. |
&Apache::lonnet::devalidate_cache_new('courseresversion',$env{'request.course.id'}.'_'. |
Line 4977 sub changewarning {
|
Line 5777 sub changewarning {
|
if (!defined($message)) { |
if (!defined($message)) { |
$message='Changes will become active for your current session after [_1], or the next time you log in.'; |
$message='Changes will become active for your current session after [_1], or the next time you log in.'; |
} |
} |
|
my $windowname = 'loncapaclient'; |
|
if ($env{'request.lti.login'}) { |
|
$windowname .= 'lti'; |
|
} |
$r->print("\n\n". |
$r->print("\n\n". |
'<script type="text/javascript">'."\n". |
'<script type="text/javascript">'."\n". |
'// <![CDATA['."\n". |
'// <![CDATA['."\n". |
'function reinit(tf) { tf.submit();'.$postexec.' }'."\n". |
'function reinit(tf) { tf.submit();'.$postexec.' }'."\n". |
'// ]]>'."\n". |
'// ]]>'."\n". |
'</script>'."\n". |
'</script>'."\n". |
'<form name="reinitform" method="post" action="/adm/roles" target="loncapaclient">'. |
'<form name="reinitform" method="post" action="/adm/roles" target="'.$windowname.'">'. |
'<input type="hidden" name="orgurl" value="'.$url. |
'<input type="hidden" name="orgurl" value="'.$url. |
'" /><input type="hidden" name="selectrole" value="1" /><p class="LC_warning">'. |
'" /><input type="hidden" name="selectrole" value="1" /><p class="LC_warning">'. |
&mt($message,' <input type="hidden" name="'. |
&mt($message,' <input type="hidden" name="'. |
Line 5083 sub handler {
|
Line 5887 sub handler {
|
# |
# |
# --------------------------------------------- Initialize help topics for this |
# --------------------------------------------- Initialize help topics for this |
foreach my $topic ('Adding_Course_Doc','Main_Course_Documents', |
foreach my $topic ('Adding_Course_Doc','Main_Course_Documents', |
'Adding_External_Resource','Navigate_Content', |
'Adding_External_Resource','Adding_External_Tool', |
'Adding_Folders','Docs_Overview', 'Load_Map', |
'Navigate_Content','Adding_Folders','Docs_Overview', |
'Supplemental','Score_Upload_Form','Adding_Pages', |
'Load_Map','Supplemental','Score_Upload_Form', |
'Importing_LON-CAPA_Resource','Importing_IMS_Course', |
'Adding_Pages','Importing_LON-CAPA_Resource', |
'Uploading_From_Harddrive','Course_Roster','Web_Page', |
'Importing_IMS_Course','Uploading_From_Harddrive', |
'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 5104 sub handler {
|
Line 5910 sub handler {
|
$help{'Caching'} = &Apache::loncommon::help_open_topic('Caching'); |
$help{'Caching'} = &Apache::loncommon::help_open_topic('Caching'); |
|
|
my ($allowed,$canedit,$canview,$noendpage,$disabled); |
my ($allowed,$canedit,$canview,$noendpage,$disabled); |
|
# does this user have privileges to modify content. |
|
if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { |
# URI is /adm/supplemental when viewing supplemental docs in non-edit mode. |
# URI is /adm/supplemental when viewing supplemental docs in non-edit mode. |
unless ($r->uri eq '/adm/supplemental') { |
unless ($r->uri eq '/adm/supplemental') { |
# does this user have privileges to modify content. |
|
if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { |
|
$allowed = 1; |
$allowed = 1; |
$canedit = 1; |
} |
$canview = 1; |
$canedit = 1; |
} elsif (&Apache::lonnet::allowed('cev',$env{'request.course.id'})) { |
$canview = 1; |
|
} elsif (&Apache::lonnet::allowed('cev',$env{'request.course.id'})) { |
|
# URI is /adm/supplemental when viewing supplemental docs in non-edit mode. |
|
unless ($r->uri eq '/adm/supplemental') { |
$allowed = 1; |
$allowed = 1; |
$canview = 1; |
|
} |
} |
|
$canview = 1; |
} |
} |
unless ($canedit) { |
unless ($canedit) { |
$disabled = ' disabled="disabled"'; |
$disabled = ' disabled="disabled"'; |
} |
} |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['inhibitmenu']); |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['inhibitmenu']); |
|
if ($env{'form.inhibitmenu'}) { |
|
unless ($env{'form.inhibitmenu'} eq 'yes') { |
|
delete($env{'form.inhibitmenu'}); |
|
} |
|
} |
|
|
if ($allowed && $env{'form.verify'}) { |
if ($allowed && $env{'form.verify'}) { |
&init_breadcrumbs('verify','Verify Content','Docs_Verify_Content'); |
&init_breadcrumbs('verify','Verify Content','Docs_Verify_Content'); |
&verifycontent($r); |
if (!$canedit) { |
|
&verifycontent($r); |
|
} elsif (($env{'form.checkstale'} ne '') && ($env{'form.checkstale'} =~ /^\d$/)) { |
|
&Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs?tools=1&verify=1&checkstale=$env{'form.checkstale'}", |
|
text=>'Results', |
|
faq=>273, |
|
bug=>'Instructor Interface'}); |
|
&verifycontent($r,$env{'form.checkstale'}); |
|
} else { |
|
&contentverifyform($r); |
|
} |
} elsif ($allowed && $env{'form.listsymbs'}) { |
} elsif ($allowed && $env{'form.listsymbs'}) { |
&init_breadcrumbs('listsymbs','List Content IDs'); |
&init_breadcrumbs('listsymbs','List Content IDs'); |
&list_symbs($r); |
&list_symbs($r); |
|
} elsif ($allowed && $env{'form.shorturls'}) { |
|
&init_breadcrumbs('shorturls','Set/Display Shortened URLs','Docs_Short_URLs'); |
|
&short_urls($r,$canedit); |
} elsif ($allowed && $env{'form.docslog'}) { |
} elsif ($allowed && $env{'form.docslog'}) { |
&init_breadcrumbs('docslog','Show Log'); |
&init_breadcrumbs('docslog','Show Log'); |
my $folder = $env{'form.folder'}; |
my $folder = $env{'form.folder'}; |
Line 5189 sub handler {
|
Line 6017 sub handler {
|
$r->internal_redirect($redirect); |
$r->internal_redirect($redirect); |
return OK; |
return OK; |
} |
} |
|
} else { |
|
$r->internal_redirect($redirect); |
} |
} |
} |
} |
} |
} |
Line 5198 sub handler {
|
Line 6028 sub handler {
|
# Get the parameters that may be needed |
# Get the parameters that may be needed |
# |
# |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
['folderpath', |
['folderpath','title', |
'forcesupplement','forcestandard', |
'forcesupplement','forcestandard', |
'tools','symb','command','supppath']); |
'tools','symb','command','supppath']); |
|
|
|
foreach my $item ('forcesupplement','forcestandard','tools') { |
|
next if ($env{'form.'.$item} eq ''); |
|
unless ($env{'form.'.$item} eq '1') { |
|
delete($env{'form.'.$item}); |
|
} |
|
} |
|
|
|
if ($env{'form.command'}) { |
|
unless ($env{'form.command'} =~ /^(direct|directnav|editdocs|editsupp|contents|home)$/) { |
|
delete($env{'form.command'}); |
|
} |
|
} |
|
|
|
if ($env{'form.symb'}) { |
|
my ($mapurl,$id,$resurl) = &Apache::lonnet::decode_symb($env{'form.symb'}); |
|
unless (($id =~ /^\d+$/) && (&Apache::lonnet::is_on_map($resurl))) { |
|
delete($env{'form.symb'}); |
|
} |
|
} |
|
|
# standard=1: this is a "new-style" course with an uploaded map as top level |
# standard=1: this is a "new-style" course with an uploaded map as top level |
# standard=2: this is a "old-style" course, and there is nothing we can do |
# standard=2: this is a "old-style" course, and there is nothing we can do |
|
|
Line 5219 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 '') { |
|
&Apache::loncommon::validate_folderpath($supplementalflag,$allowed,$coursenum,$coursedom); |
|
} |
|
|
|
my $backto_supppath; |
|
if ($env{'form.supppath'} ne '') { |
|
if ($supplementalflag && $allowed) { |
|
$backto_supppath = &validate_supppath($coursenum,$coursedom); |
|
} |
|
} |
|
|
my $script=''; |
my $script=''; |
my $showdoc=0; |
my $showdoc=0; |
my $addentries = {}; |
my $addentries = {}; |
Line 5231 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 5242 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 5280 sub handler {
|
Line 6145 sub handler {
|
} else { |
} else { |
undef($env{'form.folderpath'}); |
undef($env{'form.folderpath'}); |
} |
} |
|
if ($env{'form.folderpath'} ne '') { |
|
&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 5294 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 '') { |
undef($env{'form.folderpath'}); |
undef($env{'form.folderpath'}); |
} else { |
} else { |
$folderurl = "uploaded/$coursedom/$coursenum/$folder"; |
$folderurl = "uploaded/$coursedom/$coursenum/$folder"; |
if ((split(/\:/,$pathitems[-1]))[4]) { |
if ((split(/\:/,$pathitems[-1]))[5]) { |
$folderurl .= '.page'; |
$folderurl .= '.page'; |
} 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 5398 sub handler {
|
Line 6319 sub handler {
|
my $tid = 1; |
my $tid = 1; |
my @tabids; |
my @tabids; |
if ($supplementalflag) { |
if ($supplementalflag) { |
@tabids = ('002','ee2','ff2'); |
@tabids = ('002','dd2','ee2','ff2'); |
$tid = 2; |
$tid = 2; |
} else { |
} else { |
@tabids = ('aa1','bb1','cc1','ff1'); |
@tabids = ('aa1','bb1','cc1','ff1'); |
Line 5408 sub handler {
|
Line 6329 sub handler {
|
} |
} |
} |
} |
my $tabidstr = join("','",@tabids); |
my $tabidstr = join("','",@tabids); |
%ltitools = &Apache::lonnet::get_domain_ltitools($coursedom); |
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 5417 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 5440 sub handler {
|
Line 6378 sub handler {
|
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
|
|
if ($showdoc) { |
if ($showdoc) { |
$r->print(&Apache::loncommon::start_page("$crstype documents",undef, |
my $args; |
{'force_register' => $showdoc,})); |
if ($supplementalflag) { |
|
my $title = &HTML::Entities::encode($env{'form.title'},'\'"<>&'); |
|
my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); |
|
$args = {'bread_crumbs' => $brcrum, |
|
'bread_crumbs_nomenu' => 1}; |
|
} else { |
|
$args = {'force_register' => $showdoc}; |
|
} |
|
$r->print(&Apache::loncommon::start_page("$crstype documents",undef,$args)); |
} elsif ($toolsflag) { |
} elsif ($toolsflag) { |
my ($breadtext,$breadtitle); |
my ($breadtext,$breadtitle); |
$breadtext = "$crstype Editor"; |
$breadtext = "$crstype Editor"; |
Line 5459 sub handler {
|
Line 6405 sub handler {
|
$breadtitle) |
$breadtitle) |
); |
); |
} elsif ($r->uri eq '/adm/supplemental') { |
} elsif ($r->uri eq '/adm/supplemental') { |
|
unless ($env{'request.role.adv'}) { |
|
unless (&Apache::lonnet::has_unhidden_suppfiles($coursenum,$coursedom)) { |
|
$r->internal_redirect('/adm/navmaps'); |
|
return OK; |
|
} |
|
} |
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 5489 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 5496 sub handler {
|
Line 6454 sub handler {
|
undef($hadchanges); |
undef($hadchanges); |
$uploadphase = &process_file_upload(\$upload_output,$coursenum,$coursedom, |
$uploadphase = &process_file_upload(\$upload_output,$coursenum,$coursedom, |
\%allfiles,\%codebase,$context,$crstype); |
\%allfiles,\%codebase,$context,$crstype); |
|
undef($navmap); |
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 5511 sub handler {
|
Line 6474 sub handler {
|
my ($destination,$dir_root) = &embedded_destination(); |
my ($destination,$dir_root) = &embedded_destination(); |
my $url_root = '/uploaded/'.$docudom.'/'.$docuname; |
my $url_root = '/uploaded/'.$docudom.'/'.$docuname; |
my $actionurl = '/adm/coursedocs'; |
my $actionurl = '/adm/coursedocs'; |
my ($result,$flag) = |
my ($result,$flag) = |
&Apache::loncommon::upload_embedded('coursedoc',$destination, |
&Apache::loncommon::upload_embedded('coursedoc',$destination, |
$docuname,$docudom,$dir_root,$url_root,undef,undef,undef,$state, |
$docuname,$docudom,$dir_root,$url_root,undef,undef,undef,$state, |
$actionurl); |
$actionurl); |
Line 5522 sub handler {
|
Line 6485 sub handler {
|
my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'}; |
my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'}; |
my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'}; |
my ($destination,$dir_root) = &embedded_destination(); |
my ($destination,$dir_root) = &embedded_destination(); |
my $result = |
my $result = |
&Apache::loncommon::modify_html_refs('coursedoc',$destination, |
&Apache::loncommon::modify_html_refs('coursedoc',$destination, |
$docuname,$docudom,undef, |
$docuname,$docudom,undef, |
$dir_root); |
$dir_root); |
$r->print($result.&return_to_editor()); |
$r->print($result.&return_to_editor()); |
} elsif ($env{'form.phase'} eq 'decompress_uploaded') { |
} elsif ($env{'form.phase'} eq 'decompress_uploaded') { |
$uploadphase = 'decompress_phase_one'; |
$uploadphase = 'decompress_phase_one'; |
$r->print(&decompression_phase_one(). |
$r->print(&decompression_phase_one(). |
Line 5540 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 5548 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', |
'extr' => 'External Resource', |
'extr' => 'External Resource', |
'extt' => 'External Tool', |
'extt' => 'External Tool', |
'selm' => 'Select Map', |
'selm' => 'Select Map', |
Line 5563 sub handler {
|
Line 6526 sub handler {
|
'navc' => 'Table of Contents', |
'navc' => 'Table of Contents', |
'sipa' => 'Simple Course Page', |
'sipa' => 'Simple Course Page', |
'sipr' => 'Simple Problem', |
'sipr' => 'Simple Problem', |
'webp' => 'Blank Web Page (editable)', |
'webp' => 'Blank Web Page (editable)', |
'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 5587 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 5636 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="flUpload" size="40" $disabled /> |
|
<input type="hidden" id="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 5659 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 5685 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 5723 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 5755 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 5792 CRSFORM
|
Line 6775 CRSFORM
|
<input type="hidden" name="copyfolder" /> |
<input type="hidden" name="copyfolder" /> |
$containertag |
$containertag |
</form> |
</form> |
|
<form name="aliasform" method="post" action="/adm/coursedocs"> |
|
<input type="hidden" name="alias" /> |
|
<input type="hidden" name="cmd" /> |
|
$containertag |
|
</form> |
|
|
HIDDENFORM |
HIDDENFORM |
$r->print(&makesimpleeditform($pathitem)."\n". |
$r->print(&makesimpleeditform($pathitem)."\n". |
Line 5828 HIDDENFORM
|
Line 6816 HIDDENFORM
|
} |
} |
my $postexec=''; |
my $postexec=''; |
if ($folder eq 'default') { |
if ($folder eq 'default') { |
|
my $windowname = 'loncapaclient'; |
|
if ($env{'request.lti.login'}) { |
|
$windowname .= 'lti'; |
|
} |
$r->print('<script type="text/javascript">'."\n" |
$r->print('<script type="text/javascript">'."\n" |
.'// <![CDATA['."\n" |
.'// <![CDATA['."\n" |
.'this.window.name="loncapaclient";'."\n" |
.'this.window.name="'.$windowname.'";'."\n" |
.'// ]]>'."\n" |
.'// ]]>'."\n" |
.'</script>'."\n" |
.'</script>'."\n" |
); |
); |
Line 5843 HIDDENFORM
|
Line 6835 HIDDENFORM
|
|
|
my $newnavform=(<<NNFORM); |
my $newnavform=(<<NNFORM); |
<form action="/adm/coursedocs" method="post" name="newnav"> |
<form action="/adm/coursedocs" method="post" name="newnav"> |
<input type="hidden" name="active" value="ee" /> |
<input type="hidden" name="active" value="ff" /> |
$pathitem |
$pathitem |
<input type="hidden" name="importdetail" |
<input type="hidden" name="importdetail" |
value="$lt{'navc'}=/adm/navmaps" /> |
value="$lt{'navc'}=/adm/navmaps" /> |
Line 5853 HIDDENFORM
|
Line 6845 HIDDENFORM
|
NNFORM |
NNFORM |
my $newsmppageform=(<<NSPFORM); |
my $newsmppageform=(<<NSPFORM); |
<form action="/adm/coursedocs" method="post" name="newsmppg"> |
<form action="/adm/coursedocs" method="post" name="newsmppg"> |
<input type="hidden" name="active" value="ee" /> |
<input type="hidden" name="active" value="ff" /> |
$pathitem |
$pathitem |
<input type="hidden" name="importdetail" value="" /> |
<input type="hidden" name="importdetail" value="" /> |
<a class="LC_menubuttons_link" href="javascript:makesmppage();"> $lt{'sipa'}</a> |
<a class="LC_menubuttons_link" href="javascript:makesmppage();"> $lt{'sipa'}</a> |
Line 5863 NSPFORM
|
Line 6855 NSPFORM
|
|
|
my $newsmpproblemform=(<<NSPROBFORM); |
my $newsmpproblemform=(<<NSPROBFORM); |
<form action="/adm/coursedocs" method="post" name="newsmpproblem"> |
<form action="/adm/coursedocs" method="post" name="newsmpproblem"> |
<input type="hidden" name="active" value="cc" /> |
<input type="hidden" name="active" value="dd" /> |
$pathitem |
$pathitem |
<input type="hidden" name="importdetail" value="" /> |
<input type="hidden" name="importdetail" value="" /> |
<a class="LC_menubuttons_link" href="javascript:makesmpproblem();">$lt{'sipr'}</a> |
<a class="LC_menubuttons_link" href="javascript:makesmpproblem();">$lt{'sipr'}</a> |
Line 5874 NSPROBFORM
|
Line 6866 NSPROBFORM
|
|
|
my $newdropboxform=(<<NDBFORM); |
my $newdropboxform=(<<NDBFORM); |
<form action="/adm/coursedocs" method="post" name="newdropbox"> |
<form action="/adm/coursedocs" method="post" name="newdropbox"> |
<input type="hidden" name="active" value="cc" /> |
<input type="hidden" name="active" value="dd" /> |
$pathitem |
$pathitem |
<input type="hidden" name="importdetail" value="" /> |
<input type="hidden" name="importdetail" value="" /> |
<a class="LC_menubuttons_link" href="javascript:makedropbox();">$lt{'drbx'}</a> |
<a class="LC_menubuttons_link" href="javascript:makedropbox();">$lt{'drbx'}</a> |
Line 5884 NDBFORM
|
Line 6876 NDBFORM
|
|
|
my $newexuploadform=(<<NEXUFORM); |
my $newexuploadform=(<<NEXUFORM); |
<form action="/adm/coursedocs" method="post" name="newexamupload"> |
<form action="/adm/coursedocs" method="post" name="newexamupload"> |
<input type="hidden" name="active" value="cc" /> |
<input type="hidden" name="active" value="dd" /> |
$pathitem |
$pathitem |
<input type="hidden" name="importdetail" value="" /> |
<input type="hidden" name="importdetail" value="" /> |
<a class="LC_menubuttons_link" href="javascript:makeexamupload();">$lt{'scuf'}</a> |
<a class="LC_menubuttons_link" href="javascript:makeexamupload();">$lt{'scuf'}</a> |
Line 5894 NEXUFORM
|
Line 6886 NEXUFORM
|
|
|
my $newbulform=(<<NBFORM); |
my $newbulform=(<<NBFORM); |
<form action="/adm/coursedocs" method="post" name="newbul"> |
<form action="/adm/coursedocs" method="post" name="newbul"> |
<input type="hidden" name="active" value="dd" /> |
<input type="hidden" name="active" value="ee" /> |
$pathitem |
$pathitem |
<input type="hidden" name="importdetail" value="" /> |
<input type="hidden" name="importdetail" value="" /> |
<a class="LC_menubuttons_link" href="javascript:makebulboard();" >$lt{'bull'}</a> |
<a class="LC_menubuttons_link" href="javascript:makebulboard();" >$lt{'bull'}</a> |
Line 5904 NBFORM
|
Line 6896 NBFORM
|
|
|
my $newaboutmeform=(<<NAMFORM); |
my $newaboutmeform=(<<NAMFORM); |
<form action="/adm/coursedocs" method="post" name="newaboutme"> |
<form action="/adm/coursedocs" method="post" name="newaboutme"> |
<input type="hidden" name="active" value="dd" /> |
<input type="hidden" name="active" value="ee" /> |
$pathitem |
$pathitem |
<input type="hidden" name="importdetail" |
<input type="hidden" name="importdetail" |
value="$plainname=/adm/$udom/$uname/aboutme" /> |
value="$plainname=/adm/$udom/$uname/aboutme" /> |
Line 5915 NAMFORM
|
Line 6907 NAMFORM
|
|
|
my $newaboutsomeoneform=(<<NASOFORM); |
my $newaboutsomeoneform=(<<NASOFORM); |
<form action="/adm/coursedocs" method="post" name="newaboutsomeone"> |
<form action="/adm/coursedocs" method="post" name="newaboutsomeone"> |
<input type="hidden" name="active" value="dd" /> |
<input type="hidden" name="active" value="ee" /> |
$pathitem |
$pathitem |
<input type="hidden" name="importdetail" value="" /> |
<input type="hidden" name="importdetail" value="" /> |
<a class="LC_menubuttons_link" href="javascript:makeabout();">$lt{'abou'}</a> |
<a class="LC_menubuttons_link" href="javascript:makeabout();">$lt{'abou'}</a> |
Line 5924 NASOFORM
|
Line 6916 NASOFORM
|
|
|
my $newrosterform=(<<NROSTFORM); |
my $newrosterform=(<<NROSTFORM); |
<form action="/adm/coursedocs" method="post" name="newroster"> |
<form action="/adm/coursedocs" method="post" name="newroster"> |
<input type="hidden" name="active" value="dd" /> |
<input type="hidden" name="active" value="ee" /> |
$pathitem |
$pathitem |
<input type="hidden" name="importdetail" |
<input type="hidden" name="importdetail" |
value="$lt{'rost'}=/adm/viewclasslist" /> |
value="$lt{'rost'}=/adm/viewclasslist" /> |
Line 5945 NROSTFORM
|
Line 6937 NROSTFORM
|
} |
} |
my $newwebpageform =(<<NWEBFORM); |
my $newwebpageform =(<<NWEBFORM); |
<form action="/adm/coursedocs" method="post" name="newwebpage"> |
<form action="/adm/coursedocs" method="post" name="newwebpage"> |
<input type="hidden" name="active" value="ee" /> |
<input type="hidden" name="active" value="ff" /> |
$pathitem |
$pathitem |
<input type="hidden" name="importdetail" value="$newwebpage" /> |
<input type="hidden" name="importdetail" value="$newwebpage" /> |
<a class="LC_menubuttons_link" href="javascript:makewebpage();">$lt{'webp'}</a> |
<a class="LC_menubuttons_link" href="javascript:makewebpage();">$lt{'webp'}</a> |
$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 6121 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="ee" /> |
<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 6138 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 6149 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 6216 NSYLFORM
|
Line 7149 NSYLFORM
|
|
|
my $newgroupfileform=(<<NGFFORM); |
my $newgroupfileform=(<<NGFFORM); |
<form action="/adm/coursedocs" method="post" name="newgroupfiles"> |
<form action="/adm/coursedocs" method="post" name="newgroupfiles"> |
<input type="hidden" name="active" value="dd" /> |
<input type="hidden" name="active" value="ee" /> |
$pathitem |
$pathitem |
<input type="hidden" name="importdetail" |
<input type="hidden" name="importdetail" |
value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" /> |
value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" /> |
Line 6224 NSYLFORM
|
Line 7157 NSYLFORM
|
$help{'Group Portfolio'} |
$help{'Group Portfolio'} |
</form> |
</form> |
NGFFORM |
NGFFORM |
@specialdocumentsforma=( |
if ($container eq 'page') { |
|
@specialdocumentsforma=( |
|
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/webpage.png" alt="'.$lt{webp}.'" onclick="javascript:makewebpage();" />'=>$newwebpageform}, |
|
); |
|
} else { |
|
@specialdocumentsforma=( |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/page.png" alt="'.$lt{newp}.'" onclick="javascript:makenewpage(document.newpage,\''.$pageseq.'\');" />'=>$newpageform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/page.png" alt="'.$lt{newp}.'" onclick="javascript:makenewpage(document.newpage,\''.$pageseq.'\');" />'=>$newpageform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="javascript:makenew(document.newsyl);" />'=>$newsylform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="javascript:makenew(document.newsyl);" />'=>$newsylform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/navigation.png" alt="'.$lt{navc}.'" onclick="javascript:makenew(document.newnav);" />'=>$newnavform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/navigation.png" alt="'.$lt{navc}.'" onclick="javascript:makenew(document.newnav);" />'=>$newnavform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simple.png" alt="'.$lt{sipa}.'" onclick="javascript:makesmppage();" />'=>$newsmppageform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simple.png" alt="'.$lt{sipa}.'" onclick="javascript:makesmppage();" />'=>$newsmppageform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/webpage.png" alt="'.$lt{webp}.'" onclick="javascript:makewebpage();" />'=>$newwebpageform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/webpage.png" alt="'.$lt{webp}.'" onclick="javascript:makewebpage();" />'=>$newwebpageform}, |
); |
); |
|
} |
$specialdocumentsform = &create_form_ul(&create_list_elements(@specialdocumentsforma)); |
$specialdocumentsform = &create_form_ul(&create_list_elements(@specialdocumentsforma)); |
|
|
|
my @external = ( |
my @importdoc = ( |
{'<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="toggleUpload(\'ext\');" />'=>$extresourcesform} |
|
); |
|
if (keys(%ltitools)) { |
|
push(@importdoc, |
|
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extt}.'" onclick="toggleUpload(\'tool\');" />'=>$exttoolform}, |
|
); |
); |
|
if ($posslti) { |
|
push(@external, |
|
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/exttool.png" alt="'.$lt{extt}.'" onclick="toggleExternal(\'tool\');" />'=>$exttoolform}, |
|
); |
} |
} |
|
my $externalform = &create_form_ul(&create_list_elements(@external)); |
|
|
|
my @importdoc = (); |
unless ($container eq 'page') { |
unless ($container eq 'page') { |
push(@importdoc, |
push(@importdoc, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:toggleUpload(\'ims\');" />'=>$imspform} |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:toggleUpload(\'ims\');" />'=>$imspform} |
Line 6255 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 6271 NGFFORM
|
Line 7216 NGFFORM
|
|
|
my %orderhash = ( |
my %orderhash = ( |
'aa' => ['Upload',$fileuploadform], |
'aa' => ['Upload',$fileuploadform], |
'bb' => ['Import',$importpubform], |
'bb' => ['External',$externalform], |
'cc' => ['Grading',$gradingform], |
'cc' => ['Import',$importpubform], |
|
'dd' => ['Assessment',$gradingform], |
|
'ff' => ['Other',$specialdocumentsform], |
); |
); |
unless ($container eq 'page') { |
unless ($container eq 'page') { |
$orderhash{'00'} = ['Newfolder',$newfolderform]; |
$orderhash{'00'} = ['Newfolder',$newfolderform]; |
$orderhash{'dd'} = ['Collaboration',$communityform]; |
$orderhash{'ee'} = ['Collaboration',$communityform]; |
$orderhash{'ee'} = ['Other',$specialdocumentsform]; |
|
} |
} |
|
|
$hadchanges=0; |
$hadchanges=0; |
Line 6290 unless ($container eq 'page') {
|
Line 7236 unless ($container eq 'page') {
|
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
} |
} |
if ($hadchanges) { |
if ($hadchanges) { |
&mark_hash_old(); |
unless (&is_hash_old()) { |
} |
&mark_hash_old(); |
|
} |
|
} |
|
|
&changewarning($r,''); |
&changewarning($r,''); |
} |
} |
Line 6303 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 6321 unless ($container eq 'page') {
|
Line 7269 unless ($container eq 'page') {
|
<form action="/adm/coursedocs" method="post" name="supuploaddocument" enctype="multipart/form-data"> |
<form action="/adm/coursedocs" method="post" name="supuploaddocument" enctype="multipart/form-data"> |
<fieldset id="uploadsuppdocform" style="display: none;"> |
<fieldset id="uploadsuppdocform" style="display: none;"> |
<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 6335 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 6411 my @specialdocs = (
|
Line 7362 my @specialdocs = (
|
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/webpage.png" alt="'.$lt{webp}.'" onclick="javascript:makewebpage('."'supp'".');" />'=>$supwebpageform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/webpage.png" alt="'.$lt{webp}.'" onclick="javascript:makewebpage('."'supp'".');" />'=>$supwebpageform}, |
|
|
); |
); |
my @supimportdoc = ( |
my @supexternal = ( |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:toggleUpload(\'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(@supimportdoc, |
push(@supexternal, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extt}.'" onclick="javascript:toggleUpload(\'supptool\')" />' |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/exttool.png" alt="'.$lt{extt}.'" onclick="javascript:toggleExternal(\'supptool\')" />' |
=>$supexttoolform}); |
=>$supexttoolform}); |
} |
} |
push(@supimportdoc, |
my @supimportdoc = ( |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'suppdoc\');" />' |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'suppdoc\');" />' |
=>$supupdocform}, |
=>$supupdocform}, |
); |
); |
Line 6427 my @supimportdoc = (
|
Line 7378 my @supimportdoc = (
|
$supupdocform = &create_form_ul(&create_list_elements(@supimportdoc)); |
$supupdocform = &create_form_ul(&create_list_elements(@supimportdoc)); |
my %suporderhash = ( |
my %suporderhash = ( |
'00' => ['Supnewfolder', $supnewfolderform], |
'00' => ['Supnewfolder', $supnewfolderform], |
'ee' => ['Upload',$supupdocform], |
'dd' => ['Upload',$supupdocform], |
|
'ee' => ['External',&create_form_ul(&create_list_elements(@supexternal))], |
'ff' => ['Other',&create_form_ul(&create_list_elements(@specialdocs))] |
'ff' => ['Other',&create_form_ul(&create_list_elements(@specialdocs))] |
); |
); |
if ($supplementalflag) { |
if ($supplementalflag) { |
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, |
$suppchanges = 0; |
$supplementalflag,\%suporderhash,$iconpath,$pathitem, |
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, |
\%ltitools,$canedit,$hostname); |
$supplementalflag,\%suporderhash,$iconpath,$pathitem, |
if ($error) { |
\%ltitools,$canedit,$hostname); |
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
if ($error) { |
} else { |
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
if ($suppchanges) { |
} |
my %servers = &Apache::lonnet::internet_dom_servers($coursedom); |
if ($suppchanges) { |
my @ids=&Apache::lonnet::current_machine_ids(); |
&Apache::lonnet::update_supp_caches($coursedom,$coursenum); |
foreach my $server (keys(%servers)) { |
undef($suppchanges); |
next if (grep(/^\Q$server\E$/,@ids)); |
} |
my $hashid=$coursenum.':'.$coursedom; |
|
my $cachekey = &escape('suppcount').':'.&escape($hashid); |
|
&Apache::lonnet::remote_devalidate_cache($server,[$cachekey]); |
|
} |
|
&Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1); |
|
undef($suppchanges); |
|
} |
|
} |
|
} |
} |
} elsif ($supplementalflag) { |
} elsif ($supplementalflag) { |
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, |
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, |
$supplementalflag,'',$iconpath,$pathitem,'','',$hostname); |
$supplementalflag,'',$iconpath,$pathitem,'',$canedit, |
|
$hostname); |
if ($error) { |
if ($error) { |
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
} |
} |
Line 6480 my %suporderhash = (
|
Line 7425 my %suporderhash = (
|
&entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table>'); |
&entryline(0,&mt("Click to download or use your browser's Save Link function"),$showdoc).'</table>'); |
} |
} |
} |
} |
unless ($noendpage) { |
unless ($noendpage) { |
$r->print(&Apache::loncommon::end_page()); |
$r->print(&Apache::loncommon::end_page()); |
} |
} |
return OK; |
return OK; |
Line 6489 my %suporderhash = (
|
Line 7434 my %suporderhash = (
|
sub embedded_form_elems { |
sub embedded_form_elems { |
my ($phase,$primaryurl,$newidx) = @_; |
my ($phase,$primaryurl,$newidx) = @_; |
my $folderpath = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); |
my $folderpath = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); |
|
$newidx =~s /\D+//g; |
return <<STATE; |
return <<STATE; |
<input type="hidden" name="folderpath" value="$folderpath" /> |
<input type="hidden" name="folderpath" value="$folderpath" /> |
<input type="hidden" name="cmd" value="upload_embedded" /> |
<input type="hidden" name="cmd" value="upload_embedded" /> |
Line 6509 sub embedded_destination {
|
Line 7455 sub embedded_destination {
|
} elsif ($folder =~ /^(default|supplemental)_(\d+)$/) { |
} elsif ($folder =~ /^(default|supplemental)_(\d+)$/) { |
$destination .= $2.'/'; |
$destination .= $2.'/'; |
} |
} |
$destination .= $env{'form.newidx'}; |
my $newidx = $env{'form.newidx'}; |
|
$newidx =~s /\D+//g; |
|
if ($newidx) { |
|
$destination .= $newidx; |
|
} |
my $dir_root = '/userfiles'; |
my $dir_root = '/userfiles'; |
return ($destination,$dir_root); |
return ($destination,$dir_root); |
} |
} |
Line 6535 sub decompression_info {
|
Line 7485 sub decompression_info {
|
} |
} |
unshift(@hiddens,$pathitem); |
unshift(@hiddens,$pathitem); |
foreach my $item (@hiddens) { |
foreach my $item (@hiddens) { |
|
if ($item eq 'newidx') { |
|
next if ($env{'form.'.$item} =~ /\D/); |
|
} |
if ($env{'form.'.$item}) { |
if ($env{'form.'.$item}) { |
$hiddenelem .= '<input type="hidden" name="'.$item.'" value="'. |
$hiddenelem .= '<input type="hidden" name="'.$item.'" value="'. |
&HTML::Entities::encode($env{'form.'.$item},'<>&"').'" />'."\n"; |
&HTML::Entities::encode($env{'form.'.$item},'<>&"').'" />'."\n"; |
Line 6552 sub decompression_phase_one {
|
Line 7505 sub decompression_phase_one {
|
$error = &mt('Archive file "[_1]" not in the expected location.',$env{'form.archiveurl'}); |
$error = &mt('Archive file "[_1]" not in the expected location.',$env{'form.archiveurl'}); |
} else { |
} else { |
my $file = $1; |
my $file = $1; |
$output = |
$output = |
&Apache::loncommon::process_decompression($docudom,$docuname,$file, |
&Apache::loncommon::process_decompression($docudom,$docuname,$file, |
$destination,$dir_root, |
$destination,$dir_root, |
$hiddenelem); |
$hiddenelem); |
Line 6609 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 6640 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 |
'vc' => 'Verify Content', |
'vc' => 'Verify Content', |
'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', |
|
'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 6697 sub generate_admin_menu {
|
Line 7656 sub generate_admin_menu {
|
icon => 'symbs.png', |
icon => 'symbs.png', |
linktitle => "List the unique identifier used for each resource instance in your $lc_crstype" |
linktitle => "List the unique identifier used for each resource instance in your $lc_crstype" |
}, |
}, |
|
{ linktext => $lt{'ct'}, |
|
url => "javascript:injectData(document.courseverify,'dummy','shorturls','$lt{'ct'}')", |
|
permission => 'F', |
|
help => 'Docs_Short_URLs', |
|
icon => 'shorturls.png', |
|
linktitle => "Set shortened URLs for a resource or folder in your $lc_crstype for use in deep-linking" |
|
}, |
] |
] |
}); |
}); |
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 6859 sub editing_js {
|
Line 7850 sub editing_js {
|
p_ctr2b => '?', |
p_ctr2b => '?', |
p_ctr3a => 'Cut those', |
p_ctr3a => 'Cut those', |
p_ctr3b => 'items?', |
p_ctr3b => 'items?', |
|
setal => 'Enter a (unique) alias', |
|
delal => 'Are you sure you want to eliminate the alias?', |
rpck => 'Enter number to pick (e.g., 3)', |
rpck => 'Enter number to pick (e.g., 3)', |
imsfile => 'You must choose an IMS package for import', |
imsfile => 'You must choose an IMS package for import', |
imscms => 'You must select which Course Management System was the source of the IMS package', |
imscms => 'You must select which Course Management System was the source of the IMS package', |
Line 6873 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 6884 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 6903 sub editing_js {
|
Line 7900 sub editing_js {
|
} else { |
} else { |
$url = $res; |
$url = $res; |
} |
} |
$backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($url),'<>&"').'?symb='. |
$backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($url),'<>&"'); |
&HTML::Entities::encode($caller,'<>&"'); |
if ($backtourl =~ m{^\Q/uploaded/$coursedom/$coursenum/\Edefault_\d+\.sequence$}) { |
|
$backtourl .= '?navmap=1'; |
|
} else { |
|
$backtourl .= '?symb='. |
|
&HTML::Entities::encode($caller,'<>&"'); |
|
} |
if ($backtourl =~ m{^\Q/public/$coursedom/$coursenum/syllabus\E}) { |
if ($backtourl =~ m{^\Q/public/$coursedom/$coursenum/syllabus\E}) { |
if (($ENV{'SERVER_PORT'} == 443) && |
if (($ENV{'SERVER_PORT'} == 443) && |
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { |
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { |
if ($hostname ne '') { |
unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) { |
$backtourl = 'http://'.$hostname.$backtourl; |
if ($hostname ne '') { |
|
$backtourl = 'http://'.$hostname.$backtourl; |
|
} |
|
$backtourl .= (($backtourl =~ /\?/) ? '&':'?').'usehttp=1'; |
} |
} |
$backtourl .= (($backtourl =~ /\?/) ? '&':'?').'usehttp=1'; |
|
} |
} |
} elsif ($backtourl =~ m{^/adm/wrapper/ext/(?!https:)}) { |
} elsif ($backtourl =~ m{^/adm/wrapper/ext/(?!https:)}) { |
if (($ENV{'SERVER_PORT'} == 443) && ($hostname ne '')) { |
if (($ENV{'SERVER_PORT'} == 443) && ($hostname ne '')) { |
$backtourl = 'http://'.$hostname.$backtourl; |
unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) { |
|
if ($hostname ne '') { |
|
$backtourl = 'http://'.$hostname.$backtourl; |
|
} |
|
$backtourl .= (($backtourl =~ /\?/) ? '&':'?').'usehttp=1'; |
|
} |
} |
} |
} |
} |
if ($anchor ne '') { |
if ($anchor ne '') { |
Line 6929 sub editing_js {
|
Line 7938 sub editing_js {
|
} elsif ($env{'docs.exit.'.$env{'request.course.id'}} eq '/adm/menu') { |
} elsif ($env{'docs.exit.'.$env{'request.course.id'}} eq '/adm/menu') { |
$backtourl = '/adm/menu'; |
$backtourl = '/adm/menu'; |
} elsif ($supplementalflag) { |
} elsif ($supplementalflag) { |
$backtourl = '/adm/supplemental'; |
if (($env{'request.role.adv'}) || |
|
(&Apache::lonnet::has_unhidden_suppfiles($coursenum,$coursedom))) { |
|
$backtourl = '/adm/supplemental'; |
|
} else { |
|
$backtourl = '/adm/navmaps'; |
|
} |
} else { |
} else { |
$backtourl = '/adm/navmaps'; |
$backtourl = '/adm/navmaps'; |
} |
} |
|
|
my $fieldsets = "'ext','doc'"; |
my $fieldsets = "'doc'"; |
if ($posslti) { |
|
$fieldsets .= ",'tool'"; |
|
} |
|
unless ($main_container_page) { |
unless ($main_container_page) { |
$fieldsets .=",'ims'"; |
$fieldsets .=",'ims'"; |
} |
} |
|
my $extfieldsets = "'ext'"; |
|
if ($posslti) { |
|
$extfieldsets .= ",'tool'"; |
|
} |
if ($supplementalflag) { |
if ($supplementalflag) { |
$fieldsets = "'suppext','suppdoc'"; |
$fieldsets = "'suppdoc'"; |
|
$extfieldsets = "'suppext'"; |
if ($posslti) { |
if ($posslti) { |
$fieldsets .= ",'supptool'"; |
$extfieldsets .= ",'supptool'"; |
} |
} |
} |
} |
|
|
my $jsmakefunctions; |
my $jsmakefunctions; |
if ($canedit) { |
if ($canedit) { |
$jsmakefunctions = <<ENDNEWSCRIPT; |
$jsmakefunctions = <<ENDNEWSCRIPT; |
function makenewfolder(targetform,folderseq) { |
function makenewfolder(targetform,folderseq) { |
var foldername=prompt('$js_lt{"p_mnf"}','$js_lt{"t_mnf"}'); |
var foldername=prompt('$js_lt{"p_mnf"}','$js_lt{"t_mnf"}'); |
if (foldername) { |
if (foldername) { |
targetform.importdetail.value=escape(foldername)+"="+folderseq; |
targetform.importdetail.value=encodeURIComponent(foldername)+"="+folderseq; |
targetform.submit(); |
targetform.submit(); |
} |
} |
} |
} |
Line 6962 function makenewfolder(targetform,folder
|
Line 7978 function makenewfolder(targetform,folder
|
function makenewpage(targetform,folderseq) { |
function makenewpage(targetform,folderseq) { |
var pagename=prompt('$js_lt{"p_mnp"}','$js_lt{"t_mnp"}'); |
var pagename=prompt('$js_lt{"p_mnp"}','$js_lt{"t_mnp"}'); |
if (pagename) { |
if (pagename) { |
targetform.importdetail.value=escape(pagename)+"="+folderseq; |
targetform.importdetail.value=encodeURIComponent(pagename)+"="+folderseq; |
targetform.submit(); |
targetform.submit(); |
} |
} |
} |
} |
Line 6971 function makeexamupload() {
|
Line 7987 function makeexamupload() {
|
var title=prompt('$js_lt{"p_mxu"}'); |
var title=prompt('$js_lt{"p_mxu"}'); |
if (title) { |
if (title) { |
this.document.forms.newexamupload.importdetail.value= |
this.document.forms.newexamupload.importdetail.value= |
escape(title)+'=/res/lib/templates/examupload.problem'; |
encodeURIComponent(title)+'=/res/lib/templates/examupload.problem'; |
this.document.forms.newexamupload.submit(); |
this.document.forms.newexamupload.submit(); |
} |
} |
} |
} |
Line 6980 function makesmppage() {
|
Line 7996 function makesmppage() {
|
var title=prompt('$js_lt{"p_msp"}'); |
var title=prompt('$js_lt{"p_msp"}'); |
if (title) { |
if (title) { |
this.document.forms.newsmppg.importdetail.value= |
this.document.forms.newsmppg.importdetail.value= |
escape(title)+'=/adm/$udom/$uname/new/smppg'; |
encodeURIComponent(title)+'=/adm/$udom/$uname/new/smppg'; |
this.document.forms.newsmppg.submit(); |
this.document.forms.newsmppg.submit(); |
} |
} |
} |
} |
Line 6995 function makewebpage(type) {
|
Line 8011 function makewebpage(type) {
|
} |
} |
if (title) { |
if (title) { |
var webpage = formname.importdetail.value; |
var webpage = formname.importdetail.value; |
formname.importdetail.value = escape(title)+'='+webpage; |
formname.importdetail.value = encodeURIComponent(title)+'='+webpage; |
formname.submit(); |
formname.submit(); |
} |
} |
} |
} |
Line 7004 function makesmpproblem() {
|
Line 8020 function makesmpproblem() {
|
var title=prompt('$js_lt{"p_msb"}'); |
var title=prompt('$js_lt{"p_msb"}'); |
if (title) { |
if (title) { |
this.document.forms.newsmpproblem.importdetail.value= |
this.document.forms.newsmpproblem.importdetail.value= |
escape(title)+'=/res/lib/templates/simpleproblem.problem'; |
encodeURIComponent(title)+'=/res/lib/templates/simpleproblem.problem'; |
this.document.forms.newsmpproblem.submit(); |
this.document.forms.newsmpproblem.submit(); |
} |
} |
} |
} |
Line 7013 function makedropbox() {
|
Line 8029 function makedropbox() {
|
var title=prompt('$js_lt{"p_mdb"}'); |
var title=prompt('$js_lt{"p_mdb"}'); |
if (title) { |
if (title) { |
this.document.forms.newdropbox.importdetail.value= |
this.document.forms.newdropbox.importdetail.value= |
escape(title)+'=/res/lib/templates/DropBox.problem'; |
encodeURIComponent(title)+'=/res/lib/templates/DropBox.problem'; |
this.document.forms.newdropbox.submit(); |
this.document.forms.newdropbox.submit(); |
} |
} |
} |
} |
Line 7022 function makebulboard() {
|
Line 8038 function makebulboard() {
|
var title=prompt('$js_lt{"p_mbb"}'); |
var title=prompt('$js_lt{"p_mbb"}'); |
if (title) { |
if (title) { |
this.document.forms.newbul.importdetail.value= |
this.document.forms.newbul.importdetail.value= |
escape(title)+'=/adm/$udom/$uname/new/bulletinboard'; |
encodeURIComponent(title)+'=/adm/$udom/$uname/new/bulletinboard'; |
this.document.forms.newbul.submit(); |
this.document.forms.newbul.submit(); |
} |
} |
} |
} |
Line 7061 function changename(folderpath,index,old
|
Line 8077 function changename(folderpath,index,old
|
} |
} |
} |
} |
|
|
|
function setalias(folderpath,index) { |
|
var alias = prompt('$js_lt{"setal"}'); |
|
if ((alias != null) && (alias != '')) { |
|
this.document.forms.aliasform.alias.value=alias; |
|
this.document.forms.aliasform.cmd.value='setalias_'+index; |
|
this.document.forms.aliasform.folderpath.value=folderpath; |
|
this.document.forms.aliasform.submit(); |
|
} |
|
} |
|
|
|
function delalias(folderpath,index) { |
|
if (confirm('$js_lt{"delal"}')) { |
|
this.document.forms.aliasform.cmd.value='delalias_'+index; |
|
this.document.forms.aliasform.folderpath.value=folderpath; |
|
this.document.forms.aliasform.submit(); |
|
} |
|
} |
|
|
ENDNEWSCRIPT |
ENDNEWSCRIPT |
} else { |
} else { |
$jsmakefunctions = <<ENDNEWSCRIPT; |
$jsmakefunctions = <<ENDNEWSCRIPT; |
Line 7105 function changename() {
|
Line 8139 function changename() {
|
alert("$js_lt{'edri'}"); |
alert("$js_lt{'edri'}"); |
} |
} |
|
|
|
function setalias() { |
|
alert("$js_lt{'edri'}"); |
|
} |
|
|
|
function delalias() { |
|
alert("$js_lt{'edri'}"); |
|
} |
|
|
function makenew() { |
function makenew() { |
alert("$js_lt{'edri'}"); |
alert("$js_lt{'edri'}"); |
} |
} |
Line 7142 function toggleUpload(caller) {
|
Line 8184 function toggleUpload(caller) {
|
} |
} |
} |
} |
document.getElementById('upload'+blocks[i]+'form').style.display=disp; |
document.getElementById('upload'+blocks[i]+'form').style.display=disp; |
|
} |
|
resize_scrollbox('contentscroll','1','1'); |
|
return; |
|
} |
|
|
|
function toggleExternal(caller) { |
|
var blocks = Array($extfieldsets); |
|
for (var i=0; i<blocks.length; i++) { |
|
var disp = 'none'; |
|
if (caller == blocks[i]) { |
|
var curr = document.getElementById('external'+caller+'form').style.display; |
|
if (curr == 'none') { |
|
disp='block'; |
|
} |
|
} |
|
document.getElementById('external'+blocks[i]+'form').style.display=disp; |
if ((caller == 'tool') || (caller == 'supptool')) { |
if ((caller == 'tool') || (caller == 'supptool')) { |
if (disp == 'block') { |
if (disp == 'block') { |
if (document.getElementById('LC_exttoolid')) { |
if (document.getElementById('LC_exttoolid')) { |
var toolselector = document.getElementById('LC_exttoolid'); |
var toolselector = document.getElementById('LC_exttoolid'); |
var suppflag = 0; |
var suppflag = 0; |
if (caller == 'supptool') { |
if (caller == 'supptool') { |
suppflag = 1; |
suppflag = 1; |
} |
} |
currForm = document.getElementById('new'+caller); |
currForm = document.getElementById('new'+caller); |
updateExttool(toolselector,currForm,suppflag); |
updateExttool(toolselector,currForm,suppflag); |
} |
} |
} |
} |
} |
} |
Line 7170 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 7249 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 7336 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 7708 function showPage(current, pageId, nav,
|
Line 8964 function showPage(current, pageId, nav,
|
current.className = 'right'; |
current.className = 'right'; |
} |
} |
activeTab = ''; |
activeTab = ''; |
|
toggleExternal(); |
toggleUpload(); |
toggleUpload(); |
toggleMap(); |
toggleMap(); |
toggleCrsRes(); |
toggleCrsRes(); |
Line 7720 function showPage(current, pageId, nav,
|
Line 8977 function showPage(current, pageId, nav,
|
currentData = document.getElementById(pageId); |
currentData = document.getElementById(pageId); |
currentData.style.display = 'block'; |
currentData.style.display = 'block'; |
activeTab = pageId; |
activeTab = pageId; |
|
toggleExternal(); |
toggleUpload(); |
toggleUpload(); |
toggleMap(); |
toggleMap(); |
toggleCrsRes(); |
toggleCrsRes(); |
Line 8102 function validImportCrsRes() {
|
Line 9360 function validImportCrsRes() {
|
url += fname; |
url += fname; |
} |
} |
var title = document.crsresimportform.crsrestitle.value; |
var title = document.crsresimportform.crsrestitle.value; |
document.crsresimportform.importdetail.value=escape(title)+'='+escape(url); |
document.crsresimportform.importdetail.value=encodeURIComponent(title)+'='+encodeURIComponent(url); |
return true; |
return true; |
} |
} |
|
|
Line 8253 sub makenewproblem {
|
Line 9511 sub makenewproblem {
|
if ($env{'form.newsubdir'}) { |
if ($env{'form.newsubdir'}) { |
if ($env{'form.newsubdirname'} ne '') { |
if ($env{'form.newsubdirname'} ne '') { |
$newsubdir = $env{'form.newsubdirname'}; |
$newsubdir = $env{'form.newsubdirname'}; |
} |
} |
} |
} |
if ($env{'form.newresourcename'}) { |
if ($env{'form.newresourcename'}) { |
$filename = $env{'form.newresourcename'}; |
$filename = $env{'form.newresourcename'}; |
Line 8334 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); |
} |
|
if ((-e $sourcerights) && (-e "$sourcerights.meta")) { |
|
if (!-e "$docroot/res/$coursedom") { |
|
mkdir("$docroot/res/$coursedom",0755); |
|
} |
|
if (!-e "$docroot/res/$coursedom/$coursenum") { |
|
mkdir("$docroot/res/$coursedom/$coursenum",0755); |
|
} |
|
if ((-e "$docroot/res/$coursedom/$coursenum") && (!-e $targetrights)) { |
|
my $nokeyref = &Apache::lonpublisher::getnokey($r->dir_config('lonIncludes')); |
|
my $output = &Apache::lonpublisher::batchpublish($r,$sourcerights,$targetrights,$nokeyref,1); |
|
} |
|
} |
} |
} |
} |
if ($env{'form.newresourceadd'}) { |
if ((-e $sourcerights) && (-e "$sourcerights.meta")) { |
my $template = $env{'form.template'}; |
if (!-e "$docroot/res/$coursedom") { |
my $source = $docroot.$redirect; |
mkdir("$docroot/res/$coursedom",0755); |
my $target = $redirect; |
} |
$target =~ s{^/priv/}{/res/}; |
if (!-e "$docroot/res/$coursedom/$coursenum") { |
$target = $docroot.$target; |
mkdir("$docroot/res/$coursedom/$coursenum",0755); |
if (!-e $source) { |
} |
my $copyfrom; |
if ((-e "$docroot/res/$coursedom/$coursenum") && (!-e $targetrights)) { |
if ($template) { |
my $nokeyref = &Apache::lonpublisher::getnokey($r->dir_config('lonIncludes')); |
my %templates; |
my $output = &Apache::lonpublisher::batchpublish($r,$sourcerights,$targetrights,$nokeyref,1); |
my @files = &Apache::lonhomework::get_template_list('problem'); |
|
foreach my $poss (@files) { |
|
if (ref($poss) eq 'ARRAY') { |
|
if ($template eq $poss->[0]) { |
|
$templates{$template} = 1; |
|
last; |
|
} |
|
} |
|
} |
|
if ($templates{$template}) { |
|
$copyfrom = $template; |
|
} |
|
} |
|
unless ($copyfrom) { |
|
$copyfrom = $r->dir_config('lonIncludes').'/templates/blank.problem'; |
|
} |
|
&File::Copy::copy($copyfrom,$source); |
|
} |
} |
if (!-e "$source.meta") { |
} |
my $cid = $coursedom.'_'.$coursenum; |
my $source = $docroot.$redirect; |
my $now = time; |
if (!-e "$source.meta") { |
if (open(my $fh,">$source.meta")) { |
my $cid = $coursedom.'_'.$coursenum; |
my $author=$env{'environment.firstname'}.' '. |
my $now = time; |
$env{'environment.middlename'}.' '. |
if (open(my $fh,">$source.meta")) { |
$env{'environment.lastname'}.' '. |
my $author=$env{'environment.firstname'}.' '. |
$env{'environment.generation'}; |
$env{'environment.middlename'}.' '. |
$author =~ s/\s+$//; |
$env{'environment.lastname'}.' '. |
my $title = $env{'form.newresourcetitle'}; |
$env{'environment.generation'}; |
$title =~ s/^\s+|\s+$//g; |
$author =~ s/\s+$//; |
print $fh <<END; |
my $title = $env{'form.newresourcetitle'}; |
|
$title =~ s/^\s+|\s+$//g; |
|
print $fh <<END; |
|
|
<abstract></abstract> |
<abstract></abstract> |
<author>$author</author> |
<author>$author</author> |
Line 8416 END
|
Line 9647 END
|
<subject></subject> |
<subject></subject> |
<title>$title</title> |
<title>$title</title> |
END |
END |
close($fh); |
close($fh); |
} |
|
} |
} |
} |
} |
} |
} |
Line 8445 END
|
Line 9675 END
|
} |
} |
|
|
sub finishnewprob { |
sub finishnewprob { |
my ($url,$path,$subdir,$newsubdir,$filename) = @_; |
my ($url,$path,$subdir,$newsubdir,$filename,$context) = @_; |
unless (-d $path) { |
unless (-d $path) { |
unless (mkdir($path,02770)) { |
unless (mkdir($path,02770)) { |
return; |
return; |
Line 8488 sub finishnewprob {
|
Line 9718 sub finishnewprob {
|
$redirect = "$url/$filename"; |
$redirect = "$url/$filename"; |
} |
} |
} |
} |
|
if ((!-e $dest) && ($context ne 'upload')) { |
|
my $template = $env{'form.template'}; |
|
my $copyfrom; |
|
if ($template ne '') { |
|
my %templates; |
|
my @files = &Apache::lonhomework::get_template_list('problem'); |
|
foreach my $poss (@files) { |
|
if (ref($poss) eq 'ARRAY') { |
|
if ($template eq $poss->[0]) { |
|
$templates{$template} = 1; |
|
last; |
|
} |
|
} |
|
} |
|
if ($templates{$template}) { |
|
$copyfrom = $template; |
|
} |
|
} |
|
if ($filename =~ /\.problem$/) { |
|
unless ($copyfrom) { |
|
$copyfrom = $Apache::lonnet::perlvar{'lonIncludes'}.'/templates/blank.problem'; |
|
} |
|
&File::Copy::copy($copyfrom,$dest); |
|
} |
|
} |
return $redirect; |
return $redirect; |
} |
} |
|
|
Line 8599 check on this
|
Line 9854 check on this
|
|
|
Verify Content |
Verify Content |
|
|
=item devalidateversioncache() & checkversions() |
=item devalidateversioncache() |
|
|
|
=item checkversions() |
|
|
Check Versions |
Check Versions |
|
|