version 1.484.2.43, 2013/11/20 04:48:18
|
version 1.652, 2018/04/14 00:10:48
|
Line 43 use Apache::lonnavdisplay();
|
Line 43 use Apache::lonnavdisplay();
|
use Apache::lonextresedit(); |
use Apache::lonextresedit(); |
use Apache::lontemplate(); |
use Apache::lontemplate(); |
use Apache::lonsimplepage(); |
use Apache::lonsimplepage(); |
|
use Apache::lonhomework(); |
|
use Apache::lonpublisher(); |
|
use Apache::lonparmset(); |
|
use Apache::loncourserespicker(); |
use HTML::Entities; |
use HTML::Entities; |
use HTML::TokeParser; |
use HTML::TokeParser; |
use GDBM_File; |
use GDBM_File; |
|
use File::MMagic; |
|
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 138 sub clean {
|
Line 145 sub clean {
|
return $title; |
return $title; |
} |
} |
|
|
|
sub default_folderpath { |
|
my ($coursenum,$coursedom,$navmapref) = @_; |
|
return unless ($coursenum && $coursedom && ref($navmapref)); |
|
# Check if entire course is hidden and/or encrypted |
|
my ($hiddenmap,$encryptmap,$folderpath,$hiddentop); |
|
my $toplevel = "uploaded/$coursedom/$coursenum/default.sequence"; |
|
unless (ref($$navmapref)) { |
|
$$navmapref = Apache::lonnavmaps::navmap->new(); |
|
} |
|
if (ref($$navmapref)) { |
|
if (lc($$navmapref->get_mapparam(undef,$toplevel,"0.hiddenresource")) eq 'yes') { |
|
my $filterFunc = sub { my $res = shift; return (!$res->randomout() && !$res->is_map()) }; |
|
my @resources = $$navmapref->retrieveResources($toplevel,$filterFunc,1,1); |
|
unless (@resources) { |
|
$hiddenmap = 1; |
|
unless ($env{'request.role.adv'}) { |
|
$hiddentop = 1; |
|
if ($env{'form.folder'}) { |
|
undef($env{'form.folder'}); |
|
} |
|
} |
|
} |
|
} |
|
if (lc($$navmapref->get_mapparam(undef,$toplevel,"0.encrypturl")) eq 'yes') { |
|
$encryptmap = 1; |
|
} |
|
} |
|
unless ($hiddentop) { |
|
$folderpath='default&'.&escape(&mt('Main Content')). |
|
'::'.$hiddenmap.':'.$encryptmap.'::'; |
|
} |
|
if (wantarray) { |
|
return ($folderpath,$hiddentop); |
|
} else { |
|
return $folderpath; |
|
} |
|
} |
|
|
sub dumpcourse { |
sub dumpcourse { |
my ($r) = @_; |
my ($r) = @_; |
Line 195 ENDJS
|
Line 238 ENDJS
|
} else { |
} else { |
&Apache::loncourserespicker::enumerate_course_contents($navmap,\%maps,\%resources,\%titles, |
&Apache::loncourserespicker::enumerate_course_contents($navmap,\%maps,\%resources,\%titles, |
'dumpdocs',$cdom,$cnum); |
'dumpdocs',$cdom,$cnum); |
} |
} |
my @todump = &Apache::loncommon::get_env_multiple('form.archive'); |
my @todump = &Apache::loncommon::get_env_multiple('form.archive'); |
my (%tocopy,%replacehash,%lookup,%deps,%display,%result,%depresult,%simpleproblems,%simplepages, |
my (%tocopy,%replacehash,%lookup,%deps,%display,%result,%depresult,%simpleproblems,%simplepages, |
%newcontent,%has_simpleprobs); |
%newcontent,%has_simpleprobs); |
Line 206 ENDJS
|
Line 249 ENDJS
|
if ($res =~ m{^uploaded/$cdom/$cnum/\E((?:docs|supplemental)/.+)$}) { |
if ($res =~ m{^uploaded/$cdom/$cnum/\E((?:docs|supplemental)/.+)$}) { |
$tocopy{$1} = $name; |
$tocopy{$1} = $name; |
$display{$item} = $1; |
$display{$item} = $1; |
$lookup{$1} = $item; |
$lookup{$1} = $item; |
} elsif ($res eq 'lib/templates/simpleproblem.problem') { |
} elsif ($res eq 'lib/templates/simpleproblem.problem') { |
$simpleproblems{$item} = { |
$simpleproblems{$item} = { |
symb => $resources{$item}, |
symb => $resources{$item}, |
Line 301 ENDJS
|
Line 344 ENDJS
|
if ($contents{content}) { |
if ($contents{content}) { |
$content .= ' |
$content .= ' |
<div class="LC_Box"> |
<div class="LC_Box"> |
<h4 class="LC_hcell">Content</h4>'. |
<h4 class="LC_hcell">'.&mt('Content').'</h4>'. |
$contents{content}.' |
$contents{content}.' |
</div>'; |
</div>'; |
} |
} |
if ($contents{webreferences}) { |
if ($contents{webreferences}) { |
$content .= ' |
$content .= ' |
<div class="LC_Box"> |
<div class="LC_Box"> |
<h4 class="LC_hcell">Web References</h4>'. |
<h4 class="LC_hcell">'.&mt('Web References').'</h4>'. |
$contents{webreferences}.' |
$contents{webreferences}.' |
</div>'; |
</div>'; |
} |
} |
Line 316 $contents{webreferences}.'
|
Line 359 $contents{webreferences}.'
|
</body> |
</body> |
</html> |
</html> |
'; |
'; |
$newcontent{'/'.$simplepages{$item}{res}} = $content; |
$newcontent{'/'.$simplepages{$item}{res}} = $content; |
} |
} |
} |
} |
foreach my $item (keys(%tocopy)) { |
foreach my $item (keys(%tocopy)) { |
unless ($item=~/\.(sequence|page)$/) { |
unless ($item=~/\.(sequence|page)$/) { |
my $currurlpath = $prefix.$item; |
my $currurlpath = $prefix.$item; |
my $currdirpath = &Apache::lonnet::filelocation('',$currurlpath); |
my $currdirpath = &Apache::lonnet::filelocation('',$currurlpath); |
Line 350 $contents{webreferences}.'
|
Line 393 $contents{webreferences}.'
|
if ($simpleproblems{$num}) { |
if ($simpleproblems{$num}) { |
$newfilename=$title.'/'.$simpleproblems{$num}{'name'}; |
$newfilename=$title.'/'.$simpleproblems{$num}{'name'}; |
} else { |
} else { |
$newfilename=$title.'/'.$replacehash{$item}; |
$newfilename=$title.'/'.$replacehash{$item}; |
} |
} |
$newfilename=~s/\.(\w+)$//; |
$newfilename=~s/\.(\w+)$//; |
my $ext=$1; |
my $ext=$1; |
$newfilename=&clean($newfilename); |
$newfilename=&clean($newfilename); |
$newfilename.='.'.$ext; |
$newfilename.='.'.$ext; |
my ($newrelpath) = ($newfilename =~ m{^\Q$title/\E(.+)$}); |
my ($newrelpath) = ($newfilename =~ m{^\Q$title/\E(.+)$}); |
if ($newrelpath ne $replacehash{$item}) { |
if ($newrelpath ne $replacehash{$item}) { |
$replacehash{$item} = $newrelpath; |
$replacehash{$item} = $newrelpath; |
} |
} |
my @dirs=split(/\//,$newfilename); |
my @dirs=split(/\//,$newfilename); |
my $path=$r->dir_config('lonDocRoot')."/priv/$cd/$ca"; |
my $path=$r->dir_config('lonDocRoot')."/priv/$cd/$ca"; |
my $makepath=$path; |
my $makepath=$path; |
my $fail; |
my $fail; |
my $origin; |
my $origin; |
for (my $i=0;$i<$#dirs;$i++) { |
for (my $i=0;$i<$#dirs;$i++) { |
$makepath.='/'.$dirs[$i]; |
$makepath.='/'.$dirs[$i]; |
unless (-e $makepath) { |
unless (-e $makepath) { |
unless(mkdir($makepath,0755)) { |
unless(mkdir($makepath,0755)) { |
$fail = &mt('Directory creation failed.'); |
$fail = &mt('Directory creation failed.'); |
} |
} |
} |
} |
} |
} |
if ($i == 0) { |
if ($i == 0) { |
$result = '<br /><tt>'.$item.'</tt> => <tt>'.$newfilename.'</tt>: '; |
$result = '<br /><tt>'.$item.'</tt> => <tt>'.$newfilename.'</tt>: '; |
} else { |
} else { |
$depresult .= '<li><tt>'.$item.'</tt> => <tt>'.$newfilename.'</tt> '. |
$depresult .= '<li><tt>'.$item.'</tt> => <tt>'.$newfilename.'</tt> '. |
'<span class="LC_fontsize_small" style="font-weight: bold;">'. |
'<span class="LC_fontsize_small" style="font-weight: bold;">'. |
&mt('(dependency)').'</span>: '; |
&mt('(dependency)').'</span>: '; |
} |
} |
if (-e $path.'/'.$newfilename) { |
if (-e $path.'/'.$newfilename) { |
$fail = &mt('Destination already exists -- not overwriting.'); |
$fail = &mt('Destination already exists -- not overwriting.'); |
} else { |
} else { |
if (my $fh=Apache::File->new('>'.$path.'/'.$newfilename)) { |
if (my $fh=Apache::File->new('>'.$path.'/'.$newfilename)) { |
if (($item =~ m{^/adm/$match_domain/$match_username/\d+/smppg}) || |
if (($item =~ m{^/adm/$match_domain/$match_username/\d+/smppg}) || |
($item =~ /^simpleproblem_/)) { |
($item =~ /^simpleproblem_/)) { |
Line 404 $contents{webreferences}.'
|
Line 447 $contents{webreferences}.'
|
while (my $token = $parser->get_token) { |
while (my $token = $parser->get_token) { |
if ($token->[0] eq 'S') { |
if ($token->[0] eq 'S') { |
if (($token->[1] eq 'resource') && |
if (($token->[1] eq 'resource') && |
($token->[2]->{'src'} eq '/res/lib/templates/simpleproblem.problem') && |
($token->[2]->{'src'} eq '/res/lib/templates/simpleproblem.problem') && |
($changes{$token->[2]->{'id'}})) { |
($changes{$token->[2]->{'id'}})) { |
my $id = $token->[2]->{'id'}; |
my $id = $token->[2]->{'id'}; |
$updatedcontent .= '<'.$token->[1]; |
$updatedcontent .= '<'.$token->[1]; |
foreach my $attrib (@{$token->[3]}) { |
foreach my $attrib (@{$token->[3]}) { |
next unless ($attrib =~ /^(src|type|title|id)$/); |
next unless ($attrib =~ /^(src|type|title|id)$/); |
if ($attrib eq 'src') { |
if ($attrib eq 'src') { |
my ($file) = ($display{$changes{$id}} =~ /^\Qsimpleproblem_\E(.+)$/); |
my ($file) = ($display{$changes{$id}} =~ /^\Qsimpleproblem_\E(.+)$/); |
if ($file) { |
if ($file) { |
$updatedcontent .= ' '.$attrib.'="'.$file.'"'; |
$updatedcontent .= ' '.$attrib.'="'.$file.'"'; |
} else { |
} else { |
$updatedcontent .= ' '.$attrib.'="'.$token->[2]->{$attrib}.'"'; |
$updatedcontent .= ' '.$attrib.'="'.$token->[2]->{$attrib}.'"'; |
} |
} |
} else { |
} else { |
$updatedcontent .= ' '.$attrib.'="'.$token->[2]->{$attrib}.'"'; |
$updatedcontent .= ' '.$attrib.'="'.$token->[2]->{$attrib}.'"'; |
Line 430 $contents{webreferences}.'
|
Line 473 $contents{webreferences}.'
|
} |
} |
} |
} |
print $fh $updatedcontent; |
print $fh $updatedcontent; |
} else { |
} else { |
print $fh &Apache::lonclonecourse::rewritefile( |
print $fh &Apache::lonclonecourse::rewritefile( |
&Apache::lonclonecourse::readfile($env{'request.course.id'},$item), |
&Apache::lonclonecourse::readfile($env{'request.course.id'},$item), |
(%replacehash,$crs => '') |
(%replacehash,$crs => '') |
); |
); |
} |
} |
} else { |
} else { |
print $fh |
print $fh |
&Apache::lonclonecourse::readfile($env{'request.course.id'},$item); |
&Apache::lonclonecourse::readfile($env{'request.course.id'},$item); |
} |
} |
} else { |
} else { |
$fail = &mt('Source does not exist.'); |
$fail = &mt('Source does not exist.'); |
} |
} |
} |
} |
$fh->close(); |
$fh->close(); |
} else { |
} else { |
$fail = &mt('Could not write to destination.'); |
$fail = &mt('Could not write to destination.'); |
} |
} |
} |
} |
my $text; |
my $text; |
if ($fail) { |
if ($fail) { |
$text = '<span class="LC_error">'.&mt('fail').(' 'x3).$fail.'</span>'; |
$text = '<span class="LC_error">'.&mt('fail').(' 'x3).$fail.'</span>'; |
} else { |
} else { |
$text = '<span class="LC_success">'.&mt('ok').'</span>'; |
$text = '<span class="LC_success">'.&mt('ok').'</span>'; |
} |
} |
if ($i == 0) { |
if ($i == 0) { |
$result .= $text; |
$result .= $text; |
} else { |
} else { |
$depresult .= $text.'</li>'; |
$depresult .= $text.'</li>'; |
} |
} |
} |
} |
$r->print($result); |
$r->print($result); |
if ($depresult) { |
if ($depresult) { |
Line 476 $contents{webreferences}.'
|
Line 519 $contents{webreferences}.'
|
$r->rflush(); |
$r->rflush(); |
my ($preamble,$formname); |
my ($preamble,$formname); |
$formname = 'dumpdoc'; |
$formname = 'dumpdoc'; |
unless ($home==1) { |
unless ($home==1) { |
$preamble = '<div class="LC_left_float">'. |
$preamble = '<div class="LC_left_float">'. |
'<fieldset><legend>'. |
'<fieldset><legend>'. |
&mt('Select the Authoring Space'). |
&mt('Select the Authoring Space'). |
'</legend><select name="authorspace">'; |
'</legend><select name="authorspace">'; |
} |
} |
my @orderspaces = (); |
my @orderspaces = (); |
foreach my $key (sort(keys(%outhash))) { |
foreach my $key (sort(keys(%outhash))) { |
if ($key=~/^home_(.+)$/) { |
if ($key=~/^home_(.+)$/) { |
if ($1 eq $env{'user.name'}.':'.$env{'user.domain'}) { |
if ($1 eq $env{'user.name'}.':'.$env{'user.domain'}) { |
unshift(@orderspaces,$1); |
unshift(@orderspaces,$1); |
} else { |
} else { |
push(@orderspaces,$1); |
push(@orderspaces,$1); |
} |
} |
} |
} |
} |
} |
if ($home>1) { |
if ($home>1) { |
$preamble .= '<option value="" selected="selected">'.&mt('Select').'</option>'; |
$preamble .= '<option value="" selected="selected">'.&mt('Select').'</option>'; |
} |
} |
foreach my $user (@orderspaces) { |
foreach my $user (@orderspaces) { |
if ($home==1) { |
if ($home==1) { |
$preamble .= '<input type="hidden" name="authorspace" value="'.$user.'" />'; |
$preamble .= '<input type="hidden" name="authorspace" value="'.$user.'" />'; |
} else { |
} else { |
$preamble .= '<option value="'.$user.'">'.$user.' - '. |
$preamble .= '<option value="'.$user.'">'.$user.' - '. |
&Apache::loncommon::plainname(split(/\:/,$user)).'</option>'; |
&Apache::loncommon::plainname(split(/\:/,$user)).'</option>'; |
} |
} |
} |
} |
unless ($home==1) { |
unless ($home==1) { |
$preamble .= '</select></fieldset></div>'."\n"; |
$preamble .= '</select></fieldset></div>'."\n"; |
} |
} |
my $title=$origcrsdata{'description'}; |
my $title=$origcrsdata{'description'}; |
$title=~s/[\/\s]+/\_/gs; |
$title=~s/[\/\s]+/\_/gs; |
$title=&clean($title); |
$title=&clean($title); |
$preamble .= '<div class="LC_left_float">'. |
$preamble .= '<div class="LC_left_float">'. |
'<fieldset><legend>'.&mt('Folder in Authoring Space').'</legend>'. |
'<fieldset><legend>'.&mt('Folder in Authoring Space').'</legend>'. |
'<input type="text" size="50" name="authorfolder" value="'. |
'<input type="text" size="50" name="authorfolder" value="'. |
$title.'" />'. |
$title.'" />'. |
'</fieldset></div><div style="padding:0;clear:both;margin:0;border:0"></div>'."\n"; |
'</fieldset></div><div style="padding:0;clear:both;margin:0;border:0"></div>'."\n"; |
my %uploadedfiles; |
my %uploadedfiles; |
&tiehash(); |
&tiehash(); |
foreach my $file (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) { |
foreach my $file (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) { |
my ($ext)=($file=~/\.(\w+)$/); |
my ($ext)=($file=~/\.(\w+)$/); |
# FIXME Check supplemental here |
# FIXME Check supplemental here |
my $title=$hash{'title_'.$hash{ |
my $title=$hash{'title_'.$hash{ |
'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$file}}; |
'ids_/uploaded/'.$origcrsdata{'domain'}.'/'.$origcrsdata{'num'}.'/'.$file}}; |
if (!$title) { |
if (!$title) { |
$title=$file; |
$title=$file; |
} else { |
} else { |
$title=~s|/|_|g; |
$title=~s|/|_|g; |
} |
} |
$title=~s/\.(\w+)$//; |
$title=~s/\.(\w+)$//; |
$title=&clean($title); |
$title=&clean($title); |
$title.='.'.$ext; |
$title.='.'.$ext; |
# $r->print("\n<td><input type='text' size='60' name='namefor_".$file."' value='".$title."' /></td>" |
# $r->print("\n<td><input type='text' size='60' name='namefor_".$file."' value='".$title."' /></td>" |
$uploadedfiles{$file} = $title; |
$uploadedfiles{$file} = $title; |
} |
} |
&untiehash(); |
&untiehash(); |
$r->print(&Apache::loncourserespicker::create_picker($navmap,'dumpdocs',$formname,$crstype,undef, |
$r->print(&Apache::loncourserespicker::create_picker($navmap,'dumpdocs',$formname,$crstype,undef, |
undef,undef,$preamble,$home,\%uploadedfiles)); |
undef,undef,$preamble,$home,\%uploadedfiles)); |
} |
} |
Line 563 sub recurse_html {
|
Line 606 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(.+)$}); |
} |
} |
Line 572 sub recurse_html {
|
Line 615 sub recurse_html {
|
$newname =~ s{[^/]+$}{}; |
$newname =~ s{[^/]+$}{}; |
$replacehash->{$newcontainer} = $newname.$relfile; |
$replacehash->{$newcontainer} = $newname.$relfile; |
$deps->{$item}{$newcontainer} = 1; |
$deps->{$item}{$newcontainer} = 1; |
my ($newurlpath) = ($depurl =~ m{^(.*)/[^/]+$}); |
my ($newurlpath) = ($depurl =~ m{^(.*)/[^/]+$}); |
my $depfile = &Apache::lonnet::filelocation('',$depurl); |
my $depfile = &Apache::lonnet::filelocation('',$depurl); |
my $type = $mm->checktype_filename($depfile); |
my $type = $mm->checktype_filename($depfile); |
if ($type eq 'text/html') { |
if ($type eq 'text/html') { |
Line 585 sub recurse_html {
|
Line 628 sub recurse_html {
|
} |
} |
|
|
sub group_import { |
sub group_import { |
my ($coursenum, $coursedom, $folder, $container, $caller, @files) = @_; |
my ($coursenum, $coursedom, $folder, $container, $caller, $ltitoolsref, @files) = @_; |
my ($donechk,$allmaps,%hierarchy,%titles,%addedmaps,%removefrommap, |
my ($donechk,$allmaps,%hierarchy,%titles,%addedmaps,%removefrommap, |
%removeparam,$importuploaded,$fixuperrors); |
%removeparam,$importuploaded,$fixuperrors); |
$allmaps = {}; |
$allmaps = {}; |
Line 614 sub group_import {
|
Line 657 sub group_import {
|
} |
} |
} |
} |
if ($url) { |
if ($url) { |
|
if ($url =~ m{^(/adm/$coursedom/$coursenum/(\d+)/ext\.tool)\:?(.*)$}) { |
|
$url = $1; |
|
my $marker = $2; |
|
my $info = $3; |
|
my ($toolid,%toolhash,%toolsettings); |
|
my @extras = ('linktext','explanation','crslabel','crstitle','crsappend'); |
|
my @toolinfo = split(/:/,$info); |
|
if ($residx) { |
|
%toolsettings=&Apache::lonnet::dump('exttool_'.$marker,$coursedom,$coursenum); |
|
$toolid = $toolsettings{'id'}; |
|
} else { |
|
$toolid = shift(@toolinfo); |
|
} |
|
$toolid =~ s/\D//g; |
|
($toolhash{'target'},$toolhash{'width'},$toolhash{'height'}, |
|
$toolhash{'linktext'},$toolhash{'explanation'},$toolhash{'crslabel'}, |
|
$toolhash{'crstitle'},$toolhash{'crsappend'},$toolhash{'gradable'}) = @toolinfo; |
|
foreach my $item (@extras) { |
|
$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->{$toolid}) eq 'HASH') { |
|
my @deleted; |
|
$toolhash{'id'} = $toolid; |
|
if (($toolhash{'target'} eq 'iframe') || ($toolhash{'target'} eq 'tab') || |
|
($toolhash{'target'} eq 'window')) { |
|
if ($toolhash{'target'} eq 'window') { |
|
foreach my $item ('width','height') { |
|
$toolhash{$item} =~ s/^\s+//; |
|
$toolhash{$item} =~ s/\s+$//; |
|
if ($toolhash{$item} =~ /\D/) { |
|
delete($toolhash{$item}); |
|
if ($residx) { |
|
if ($toolsettings{$item}) { |
|
push(@deleted,$item); |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} elsif ($residx) { |
|
$toolhash{'target'} = $toolsettings{'target'}; |
|
if ($toolhash{'target'} eq 'window') { |
|
foreach my $item ('width','height') { |
|
$toolhash{$item} = $toolsettings{$item}; |
|
} |
|
} |
|
} elsif (ref($ltitoolsref->{$toolid}->{'display'}) eq 'HASH') { |
|
$toolhash{'target'} = $ltitoolsref->{$toolid}->{'display'}->{'target'}; |
|
if ($toolhash{'target'} eq 'window') { |
|
$toolhash{'width'} = $ltitoolsref->{$toolid}->{'display'}->{'width'}; |
|
$toolhash{'height'} = $ltitoolsref->{$toolid}->{'display'}->{'height'}; |
|
} |
|
} |
|
if ($toolhash{'target'} eq 'iframe') { |
|
foreach my $item ('width','height','linktext','explanation') { |
|
delete($toolhash{$item}); |
|
if ($residx) { |
|
if ($toolsettings{$item}) { |
|
push(@deleted,$item); |
|
} |
|
} |
|
} |
|
} elsif ($toolhash{'target'} eq 'tab') { |
|
foreach my $item ('width','height') { |
|
delete($toolhash{$item}); |
|
if ($residx) { |
|
if ($toolsettings{$item}) { |
|
push(@deleted,$item); |
|
} |
|
} |
|
} |
|
} |
|
if (ref($ltitoolsref->{$toolid}->{'crsconf'}) eq 'HASH') { |
|
foreach my $item ('label','title','linktext','explanation') { |
|
my $crsitem; |
|
if (($item eq 'label') || ($item eq 'title')) { |
|
$crsitem = 'crs'.$item; |
|
} else { |
|
$crsitem = $item; |
|
} |
|
if ($ltitoolsref->{$toolid}->{'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'}) { |
|
my $gradesecret = UUID::Tiny::create_uuid_as_string(UUID_V4); |
|
$toolhash{'gradesecret'} = $gradesecret; |
|
$toolhash{'gradesecretdate'} = time; |
|
} |
|
if ($toolhash{'roster'}) { |
|
my $rostersecret = UUID::Tiny::create_uuid_as_string(UUID_V4); |
|
$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 (($caller eq 'londocs') && (defined($LONCAPA::map::zombies[$residx]))) { |
|
$changegradable = 1; |
|
if ($toolsettings{'gradable'}) { |
|
$toolhash{'gradable'} = 1; |
|
} |
|
} |
|
} |
|
my $putres = &Apache::lonnet::put('exttool_'.$marker,\%toolhash,$coursedom,$coursenum); |
|
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); |
|
} |
|
} |
|
} |
|
} |
if (($caller eq 'londocs') && |
if (($caller eq 'londocs') && |
($folder =~ /^default/)) { |
($folder =~ /^default/)) { |
if (($url =~ /\.(page|sequence)$/) && (!$donechk)) { |
if (($url =~ /\.(page|sequence)$/) && (!$donechk)) { |
Line 625 sub group_import {
|
Line 819 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 651 sub group_import {
|
Line 845 sub group_import {
|
} else { |
} else { |
$fname =~ s/\W/_/g; |
$fname =~ s/\W/_/g; |
} |
} |
if (length($fname > 15)) { |
if (length($fname) > 15) { |
$fname = substr($fname,0,14); |
$fname = substr($fname,0,14); |
} |
} |
my $initialtext = &mt('Replace with your own content.'); |
my $initialtext = &mt('Replace with your own content.'); |
Line 691 END
|
Line 885 END
|
removefrommap => \%removefrommap, |
removefrommap => \%removefrommap, |
removeparam => \%removeparam, |
removeparam => \%removeparam, |
); |
); |
my ($result,$msgsarray,$lockerror) = |
my ($result,$msgsarray,$lockerror) = |
&apply_fixups($folder,1,$coursedom,$coursenum,\%import_errors,\%updated); |
&apply_fixups($folder,1,$coursedom,$coursenum,\%import_errors,\%updated); |
if (keys(%import_errors) > 0) { |
if (keys(%import_errors) > 0) { |
$fixuperrors = |
$fixuperrors = |
Line 790 sub log_docs {
|
Line 984 sub log_docs {
|
} |
} |
|
|
sub docs_change_log { |
sub docs_change_log { |
my ($r,$coursenum,$coursedom,$folder,$allowed,$crstype,$iconpath)=@_; |
my ($r,$coursenum,$coursedom,$folder,$allowed,$crstype,$iconpath,$canedit)=@_; |
my $supplementalflag=($env{'form.folderpath'}=~/^supplemental/); |
my $supplementalflag=($env{'form.folderpath'}=~/^supplemental/); |
|
my $navmap; |
my $js = '<script type="text/javascript">'."\n". |
my $js = '<script type="text/javascript">'."\n". |
'// <![CDATA['."\n". |
'// <![CDATA['."\n". |
&Apache::loncommon::display_filter_js('docslog')."\n". |
&Apache::loncommon::display_filter_js('docslog')."\n". |
&editing_js($env{'user.domain'},$env{'user.name'},$supplementalflag)."\n". |
&editing_js($env{'user.domain'},$env{'user.name'},$supplementalflag, |
|
$coursedom,$coursenum,'','',$canedit,'',\$navmap)."\n". |
&history_tab_js()."\n". |
&history_tab_js()."\n". |
&Apache::lonratedt::editscript('simple')."\n". |
&Apache::lonratedt::editscript('simple')."\n". |
'// ]]>'."\n". |
'// ]]>'."\n". |
Line 811 sub docs_change_log {
|
Line 1007 sub docs_change_log {
|
} |
} |
my $folderpath=$env{'form.folderpath'}; |
my $folderpath=$env{'form.folderpath'}; |
if ($folderpath eq '') { |
if ($folderpath eq '') { |
$folderpath = 'default&'.&escape(&mt('Main Content').':::::'); |
$folderpath = &default_folderpath($coursenum,$coursedom,\$navmap); |
} |
} |
|
undef($navmap); |
$pathitem = '<input type="hidden" name="folderpath" value="'. |
$pathitem = '<input type="hidden" name="folderpath" value="'. |
&HTML::Entities::encode($folderpath,'<>&"').'" />'; |
&HTML::Entities::encode($folderpath,'<>&"').'" />'; |
my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container"; |
my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container"; |
Line 822 sub docs_change_log {
|
Line 1019 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 844 sub docs_change_log {
|
Line 1041 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 951 sub docs_change_log {
|
Line 1149 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>'); |
$r->print(&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'parameter_res'}))[0]).':<ul>'); |
foreach my $parameter ('randompick','hiddenresource','encrypturl','randomorder') { |
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 976 sub docs_change_log {
|
Line 1174 sub docs_change_log {
|
|
|
sub update_paste_buffer { |
sub update_paste_buffer { |
my ($coursenum,$coursedom,$folder) = @_; |
my ($coursenum,$coursedom,$folder) = @_; |
my (@possibles,%removals,%cuts); |
my (@possibles,%removals,%cuts,$output); |
if ($env{'form.multiremove'}) { |
if ($env{'form.multiremove'}) { |
$env{'form.multiremove'} =~ s/,$//; |
$env{'form.multiremove'} =~ s/,$//; |
map { $removals{$_} = 1; } split(/,/,$env{'form.multiremove'}); |
map { $removals{$_} = 1; } split(/,/,$env{'form.multiremove'}); |
Line 1021 sub update_paste_buffer {
|
Line 1219 sub update_paste_buffer {
|
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}; |
if (($cid =~ /^$match_domain(?:_)$match_courseid$/) && |
if (($cid =~ /^$match_domain(?:_)$match_courseid$/) && |
($url ne '')) { |
($url ne '')) { |
$pasteurls{$cid.'_'.$url} = 1; |
$pasteurls{$cid.'_'.$url.'_'.$mapidx} = 1; |
} |
} |
} |
} |
} |
} |
|
|
# Mark items for copying (skip any items already in user's paste buffer) |
# Mark items for copying (skip any items already in user's paste buffer) |
my %addtoenv; |
my %addtoenv; |
|
|
|
my @pathitems = split(/\&/,$env{'form.folderpath'}); |
|
my @folderconf = split(/\:/,$pathitems[-1]); |
|
my $ispage = $folderconf[4]; |
|
|
foreach my $item (@possibles) { |
foreach my $item (@possibles) { |
my ($orderidx,$cmd) = split(/:/,$item); |
my ($orderidx,$cmd) = split(/:/,$item); |
next if ($orderidx =~ /\D/); |
next if ($orderidx =~ /\D/); |
next unless (($cmd eq 'cut') || ($cmd eq 'copy') || ($cmd eq 'remove')); |
next unless (($cmd eq 'cut') || ($cmd eq 'copy') || ($cmd eq 'remove')); |
|
my $mapidx = $folder.':'.$orderidx.':'.$ispage; |
my ($title,$url)=split(':',$LONCAPA::map::resources[$orderidx]); |
my ($title,$url)=split(':',$LONCAPA::map::resources[$orderidx]); |
my %denied = &action_restrictions($coursenum,$coursedom, |
my %denied = &action_restrictions($coursenum,$coursedom, |
&LONCAPA::map::qtescape($url), |
&LONCAPA::map::qtescape($url), |
$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.'_'.$url})); |
next if (exists($pasteurls{$coursedom.'_'.$coursenum.'_'.$mapidx})); |
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'); |
push(@newpaste,$suffix); |
if ($suffix ne '') { |
if ($locknotfreed) { |
push(@newpaste,$suffix); |
return $locknotfreed; |
} else { |
last; |
if ($locknotfreed) { |
|
return $locknotfreed; |
|
} |
} |
} |
if (&is_supplemental_title($title)) { |
if (&is_supplemental_title($title)) { |
&Apache::lonnet::appenv({'docs.markedcopy_supplemental_'.$suffix => $title}); |
&Apache::lonnet::appenv({'docs.markedcopy_supplemental_'.$suffix => $title}); |
Line 1058 sub update_paste_buffer {
|
Line 1264 sub update_paste_buffer {
|
$addtoenv{'docs.markedcopy_url_'.$suffix} = $url, |
$addtoenv{'docs.markedcopy_url_'.$suffix} = $url, |
$addtoenv{'docs.markedcopy_cmd_'.$suffix} = $cmd, |
$addtoenv{'docs.markedcopy_cmd_'.$suffix} = $cmd, |
$addtoenv{'docs.markedcopy_crs_'.$suffix} = $env{'request.course.id'}; |
$addtoenv{'docs.markedcopy_crs_'.$suffix} = $env{'request.course.id'}; |
|
$addtoenv{'docs.markedcopy_map_'.$suffix} = $mapidx; |
if ($url =~ m{^/uploaded/$match_domain/$match_courseid/(default|supplemental)_?(\d*)\.(page|sequence)$}) { |
if ($url =~ m{^/uploaded/$match_domain/$match_courseid/(default|supplemental)_?(\d*)\.(page|sequence)$}) { |
my $prefix = $1; |
my $prefix = $1; |
my $subdir =$2; |
my $subdir =$2; |
Line 1066 sub update_paste_buffer {
|
Line 1272 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 1081 sub update_paste_buffer {
|
Line 1287 sub update_paste_buffer {
|
} |
} |
} |
} |
} |
} |
|
if ($locknotfreed) { |
|
$output = $locknotfreed; |
|
last; |
|
} |
} |
} |
if (@newpaste) { |
if (@newpaste) { |
$addtoenv{'docs.markedcopies'} = join(',',(@currpaste,@newpaste)); |
$addtoenv{'docs.markedcopies'} = join(',',(@currpaste,@newpaste)); |
} |
} |
&Apache::lonnet::appenv(\%addtoenv); |
&Apache::lonnet::appenv(\%addtoenv); |
delete($env{'form.markcopy'}); |
delete($env{'form.markcopy'}); |
|
return $output; |
} |
} |
|
|
sub recurse_uploaded_maps { |
sub recurse_uploaded_maps { |
Line 1124 sub print_paste_buffer {
|
Line 1335 sub print_paste_buffer {
|
|
|
my @currpaste = split(/,/,$env{'docs.markedcopies'}); |
my @currpaste = split(/,/,$env{'docs.markedcopies'}); |
my ($pasteitems,@pasteable); |
my ($pasteitems,@pasteable); |
|
my $clipboardcount = 0; |
|
|
# Construct identifiers for current contents of user's paste buffer |
# Construct identifiers for current contents of user's paste buffer |
foreach my $suffix (@currpaste) { |
foreach my $suffix (@currpaste) { |
next if ($suffix =~ /\D/); |
next if ($suffix =~ /\D/); |
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}; |
if (($cid =~ /^$match_domain\_$match_courseid$/) && |
if (($cid =~ /^$match_domain\_$match_courseid$/) && |
($url ne '')) { |
($url ne '')) { |
|
$clipboardcount ++; |
my ($is_external,$othercourse,$fromsupp,$is_uploaded_map,$parent, |
my ($is_external,$othercourse,$fromsupp,$is_uploaded_map,$parent, |
$canpaste,$nopaste,$othercrs,$areachange); |
$canpaste,$nopaste,$othercrs,$areachange,$is_exttool); |
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$}) { |
|
$is_exttool = 1; |
} |
} |
if ($folder =~ /^supplemental/) { |
if ($folder =~ /^supplemental/) { |
$canpaste = &supp_pasteable($env{'docs.markedcopy_url_'.$suffix}); |
$canpaste = &supp_pasteable($env{'docs.markedcopy_url_'.$suffix}); |
Line 1154 sub print_paste_buffer {
|
Line 1370 sub print_paste_buffer {
|
if (($srcdom ne $coursedom) || ($srcnum ne $coursenum)) { |
if (($srcdom ne $coursedom) || ($srcnum ne $coursenum)) { |
$othercourse = 1; |
$othercourse = 1; |
if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) { |
if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) { |
if ($canpaste) { |
$othercrs = '<br />'.&mt('(from another course)'); |
$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.'); |
Line 1170 sub print_paste_buffer {
|
Line 1384 sub print_paste_buffer {
|
} |
} |
$is_uploaded_map = 1; |
$is_uploaded_map = 1; |
} |
} |
|
} elsif (($url =~ m{^/res/lib/templates/\w+\.problem$}) || |
|
($url =~ m{^/adm/($match_domain)/($match_username)/\d+/(bulletinboard|smppg|ext\.tool)$})) { |
|
if ($cid ne $env{'request.course.id'}) { |
|
my ($srcdom,$srcnum) = split(/_/,$cid); |
|
if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) { |
|
if (($is_exttool) && ($srcdom ne $coursedom)) { |
|
$canpaste = 0; |
|
$nopaste = &mt('Paste from another domain unavailable.'); |
|
} else { |
|
$othercrs = '<br />'.&mt('(from another course)'); |
|
} |
|
} else { |
|
$canpaste = 0; |
|
$nopaste = &mt('Paste from another course unavailable.'); |
|
} |
|
} |
|
} |
|
if ($canpaste) { |
|
push(@pasteable,$suffix); |
} |
} |
} |
|
if ($canpaste) { |
|
push(@pasteable,$suffix); |
|
} |
} |
my $buffer; |
my $buffer; |
if ($is_external) { |
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 1187 sub print_paste_buffer {
|
Line 1420 sub print_paste_buffer {
|
$icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); |
$icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); |
$icon .= '/navmap.folder.closed.gif'; |
$icon .= '/navmap.folder.closed.gif'; |
} |
} |
|
my $title = $env{'docs.markedcopy_title_'.$suffix}; |
|
if ($title eq '') { |
|
($title) = ($url =~ m{/([^/]+)$}); |
|
} |
$buffer = '<img src="'.$icon.'" alt="" class="LC_icon" />'. |
$buffer = '<img src="'.$icon.'" alt="" class="LC_icon" />'. |
': '. |
': '. |
&Apache::loncommon::parse_supplemental_title( |
&Apache::loncommon::parse_supplemental_title( |
&LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix})); |
&LONCAPA::map::qtescape($title)); |
} |
} |
$pasteitems .= '<div class="LC_left_float">'; |
$pasteitems .= '<div class="LC_left_float">'; |
my ($options,$onclick); |
my ($options,$onclick); |
Line 1225 sub print_paste_buffer {
|
Line 1462 sub print_paste_buffer {
|
$pasteitems .= '<div style="padding:0;clear:both;margin:0;border:0"></div>'; |
$pasteitems .= '<div style="padding:0;clear:both;margin:0;border:0"></div>'; |
$form_start = '<form name="pasteform" action="/adm/coursedocs" method="post" onsubmit="return validateClipboard();">'; |
$form_start = '<form name="pasteform" action="/adm/coursedocs" method="post" onsubmit="return validateClipboard();">'; |
if (@pasteable) { |
if (@pasteable) { |
$buttons = '<input type="submit" name="pastemarked" value="'.&mt('Paste selected').'" />'.(' 'x2); |
my $value = &mt('Paste to current folder'); |
|
if ($container eq 'page') { |
|
$value = &mt('Paste to current page'); |
|
} |
|
$buttons = '<input type="submit" name="pastemarked" value="'.$value.'" />'.(' 'x2); |
} |
} |
$buttons .= '<input type="submit" name="clearmarked" value="'.&mt('Clear selected').'" />'. |
$buttons .= '<input type="submit" name="clearmarked" value="'.&mt('Remove from clipboard').'" />'.(' 'x2); |
'<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />'; |
if ($clipboardcount > 1) { |
$form_end = '</form>'; |
$buttons .= |
|
'<span style="text-decoration:line-through">'.(' 'x20).'</span>'.(' 'x2). |
|
'<input type="button" name="checkallclip" value="'.&mt('Check all').'" style="height:20px;" onclick="checkClipboard();" />'. |
|
(' 'x2). |
|
'<input type="button" name="uncheckallclip" value="'.&mt('Uncheck all').'" style="height:20px;" onclick="uncheckClipboard();" />'. |
|
(' 'x2); |
|
} |
|
$form_end = '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />'. |
|
'</form>'; |
} else { |
} else { |
$pasteitems = &mt('Clipboard is empty'); |
$pasteitems = &mt('Clipboard is empty'); |
} |
} |
Line 1320 sub supp_pasteable {
|
Line 1569 sub supp_pasteable {
|
(($url =~ /\.sequence$/) && ($url =~ m{^/uploaded/})) || |
(($url =~ /\.sequence$/) && ($url =~ m{^/uploaded/})) || |
($url =~ m{^/uploaded/$match_domain/$match_courseid/(docs|supplemental)/(default|\d+)/\d+/}) || |
($url =~ m{^/uploaded/$match_domain/$match_courseid/(docs|supplemental)/(default|\d+)/\d+/}) || |
($url =~ m{^/adm/$match_domain/$match_username/aboutme}) || |
($url =~ m{^/adm/$match_domain/$match_username/aboutme}) || |
($url =~ m{^/public/$match_domain/$match_courseid/syllabus})) { |
($url =~ m{^/public/$match_domain/$match_courseid/syllabus}) || |
|
($url =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$})) { |
return 1; |
return 1; |
} |
} |
return; |
return; |
} |
} |
|
|
sub paste_popup_js { |
sub paste_popup_js { |
my %lt = &Apache::lonlocal::texthash( |
my %html_js_lt = &Apache::lonlocal::texthash( |
show => 'Show Options', |
show => 'Show Options', |
hide => 'Hide Options', |
hide => 'Hide Options', |
|
); |
|
my %js_lt = &Apache::lonlocal::texthash( |
none => 'No items selected from clipboard.', |
none => 'No items selected from clipboard.', |
); |
); |
|
&html_escape(\%html_js_lt); |
|
&js_escape(\%html_js_lt); |
|
&js_escape(\%js_lt); |
return <<"END"; |
return <<"END"; |
|
|
function showPasteOptions(suffix) { |
function showPasteOptions(suffix) { |
document.getElementById('pasteoptions_'+suffix).style.display='block'; |
document.getElementById('pasteoptions_'+suffix).style.display='block'; |
document.getElementById('pasteoptionstext_'+suffix).innerHTML = ' <a href="javascript:hidePasteOptions(\\''+suffix+'\\');" class="LC_menubuttons_link">$lt{'hide'}</a>'; |
document.getElementById('pasteoptionstext_'+suffix).innerHTML = ' <a href="javascript:hidePasteOptions(\\''+suffix+'\\');" class="LC_menubuttons_link">$html_js_lt{'hide'}</a>'; |
return; |
return; |
} |
} |
|
|
function hidePasteOptions(suffix) { |
function hidePasteOptions(suffix) { |
document.getElementById('pasteoptions_'+suffix).style.display='none'; |
document.getElementById('pasteoptions_'+suffix).style.display='none'; |
document.getElementById('pasteoptionstext_'+suffix).innerHTML =' <a href="javascript:showPasteOptions(\\''+suffix+'\\')" class="LC_menubuttons_link">$lt{'show'}</a>'; |
document.getElementById('pasteoptionstext_'+suffix).innerHTML =' <a href="javascript:showPasteOptions(\\''+suffix+'\\')" class="LC_menubuttons_link">$html_js_lt{'show'}</a>'; |
return; |
return; |
} |
} |
|
|
function showOptions(caller,suffix) { |
function showOptions(caller,suffix) { |
if (document.getElementById('pasteoptionstext_'+suffix)) { |
if (document.getElementById('pasteoptionstext_'+suffix)) { |
if (caller.checked) { |
if (caller.checked) { |
document.getElementById('pasteoptionstext_'+suffix).innerHTML =' <a href="javascript:showPasteOptions(\\''+suffix+'\\')" class="LC_menubuttons_link">$lt{'show'}</a>'; |
document.getElementById('pasteoptionstext_'+suffix).innerHTML =' <a href="javascript:showPasteOptions(\\''+suffix+'\\')" class="LC_menubuttons_link">$html_js_lt{'show'}</a>'; |
} else { |
} else { |
document.getElementById('pasteoptionstext_'+suffix).innerHTML =''; |
document.getElementById('pasteoptionstext_'+suffix).innerHTML =''; |
} |
} |
Line 1378 function validateClipboard() {
|
Line 1633 function validateClipboard() {
|
if (numchk > 0) { |
if (numchk > 0) { |
return true; |
return true; |
} else { |
} else { |
alert("$lt{'none'}"); |
alert("$js_lt{'none'}"); |
return false; |
return false; |
} |
} |
} |
} |
|
|
|
function checkClipboard() { |
|
if (document.pasteform.pasting.length > 1) { |
|
for (var i=0; i<document.pasteform.pasting.length; i++) { |
|
document.pasteform.pasting[i].checked = true; |
|
} |
|
} |
|
return; |
|
} |
|
|
|
function uncheckClipboard() { |
|
if (document.pasteform.pasting.length >1) { |
|
for (var i=0; i<document.pasteform.pasting.length; i++) { |
|
document.pasteform.pasting[i].checked = false; |
|
} |
|
} |
|
return; |
|
} |
|
|
END |
END |
|
|
} |
} |
Line 1419 sub do_paste_from_buffer {
|
Line 1692 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,%duplicate, |
%prefixchg,%srcdom,%srcnum,%marktomove,$save_err,$lockerrors,$allresult); |
%prefixchg,%srcdom,%srcnum,%srcmapidx,%marktomove,$save_err,$lockerrors,$allresult); |
|
|
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 $mapidx=&LONCAPA::map::qtescape($env{'docs.markedcopy_map_'.$suffix}); |
# Supplemental content may only include certain types of content |
# Supplemental content may only include certain types of content |
# Early out if pasted content is not supported in Supplemental area |
# Early out if pasted content is not supported in Supplemental area |
if ($folder =~ /^supplemental/) { |
if ($folder =~ /^supplemental/) { |
Line 1445 sub do_paste_from_buffer {
|
Line 1720 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$}) || |
|
($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); |
|
# 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 |
|
if (($srcd ne $coursedom) || ($srcn ne $coursenum)) { |
|
unless ($env{"user.priv.cm./$srcd/$srcn"} =~ /\Q:mdc&F\E/) { |
|
$notincrs{$suffix} = 1; |
|
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. |
|
if (($url =~ m{/ext\.tool$}) && ($srcd ne $coursedom)) { |
|
$notindom{$suffix} = 1; |
|
next; |
|
} |
|
$srcdom{$suffix} = $srcd; |
|
$srcnum{$suffix} = $srcn; |
} |
} |
|
$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 |
# URLs will contain different paths (which depend on whether pasted item is |
# URLs will contain different paths (which depend on whether pasted item is |
# a folder/page or a document. |
# a folder/page or a document). |
if (($folder =~ /^supplemental/) && (($oldprefix =~ /^default/) || ($oldprefix eq 'docs'))) { |
if (($folder =~ /^supplemental/) && (($oldprefix =~ /^default/) || ($oldprefix eq 'docs'))) { |
$prefixchg{$suffix} = 'docstosupp'; |
$prefixchg{$suffix} = 'docstosupp'; |
} elsif (($folder =~ /^default/) && ($oldprefix =~ /^supplemental/)) { |
} elsif (($folder =~ /^default/) && ($oldprefix =~ /^supplemental/)) { |
Line 1496 sub do_paste_from_buffer {
|
Line 1790 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 donain.', |
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 1538 sub do_paste_from_buffer {
|
Line 1833 sub do_paste_from_buffer {
|
# Maps need to be copied first |
# Maps need to be copied first |
my (%removefrommap,%removeparam,%addedmaps,%rewrites,%retitles,%copies, |
my (%removefrommap,%removeparam,%addedmaps,%rewrites,%retitles,%copies, |
%dbcopies,%zombies,%params,%docmoves,%mapmoves,%mapchanges,%newsubdir, |
%dbcopies,%zombies,%params,%docmoves,%mapmoves,%mapchanges,%newsubdir, |
%newurls,%tomove); |
%newurls,%tomove,%resdatacopy); |
if (ref($marktomove{$suffix}) eq 'ARRAY') { |
if (ref($marktomove{$suffix}) eq 'ARRAY') { |
map { $tomove{$_} = 1; } @{$marktomove{$suffix}}; |
map { $tomove{$_} = 1; } @{$marktomove{$suffix}}; |
} |
} |
my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix}); |
my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix}); |
my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix}); |
my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix}); |
|
my $cid=&LONCAPA::map::qtescape($env{'docs.markedcopy_crs_'.$suffix}); |
my $oldurl = $url; |
my $oldurl = $url; |
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, |
&contained_map_check($url,$folder,$coursenum,$coursedom, |
\%addedmaps,\%hierarchy,\%titles,$allmaps); |
\%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 1579 sub do_paste_from_buffer {
|
Line 1876 sub do_paste_from_buffer {
|
\%retitles,\%copies,\%dbcopies, |
\%retitles,\%copies,\%dbcopies, |
\%zombies,\%params,\%mapmoves, |
\%zombies,\%params,\%mapmoves, |
\%mapchanges,\%tomove,\%newsubdir, |
\%mapchanges,\%tomove,\%newsubdir, |
\%newurls)) { |
\%newurls,\%resdatacopy)) { |
$mapmoves{$url} = 1; |
$mapmoves{$url} = 1; |
} |
} |
$url = $newurl; |
$url = $newurl; |
Line 1588 sub do_paste_from_buffer {
|
Line 1885 sub do_paste_from_buffer {
|
$coursenum,$srcdom{$suffix},$srcnum{$suffix}, |
$coursenum,$srcdom{$suffix},$srcnum{$suffix}, |
$allmaps,\%rewrites,\%retitles,\%copies,\%dbcopies, |
$allmaps,\%rewrites,\%retitles,\%copies,\%dbcopies, |
\%zombies,\%params,\%mapmoves,\%mapchanges, |
\%zombies,\%params,\%mapmoves,\%mapchanges, |
\%tomove,\%newsubdir,\%newurls); |
\%tomove,\%newsubdir,\%newurls,\%resdatacopy); |
} |
} |
} elsif ($url=~m {^/res/}) { |
} elsif ($url=~m {^/res/}) { |
# published map can only exists once, so remove from paste buffer when done |
# published map can only exist once, so remove from paste buffer when done |
push(@toclear,$suffix); |
push(@toclear,$suffix); |
# if pasting published map (main content area only) check map not already in course |
# if pasting published map (main content area only) check map not already in course |
if ($folder =~ /^default/) { |
if ($folder =~ /^default/) { |
Line 1602 sub do_paste_from_buffer {
|
Line 1899 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; |
#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, |
); |
); |
unless ($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') { |
if ($prefix eq 'ext.tool') { |
my (%lockerr,$msg); |
if ($prefixchg{$suffix} eq 'docstosupp') { |
|
$info{'delgradable'} = 1; |
|
} |
|
} |
|
if (($srcdom{$suffix} =~ /^$match_domain$/) && ($srcnum{$suffix} =~ /^$match_courseid$/)) { |
|
unless (($srcdom{$suffix} eq $coursedom) && ($srcnum{$suffix} eq $coursenum)) { |
|
$fromothercrs = 1; |
|
$info{'cdom'} = $srcdom{$suffix}; |
|
$info{'cnum'} = $srcnum{$suffix}; |
|
} |
|
} |
|
unless (($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') && (!$fromothercrs)) { |
|
my (%lockerr,$msg); |
my ($newurl,$result,$errtext) = |
my ($newurl,$result,$errtext) = |
&dbcopy(\%info,$coursedom,$coursenum,\%lockerr); |
&dbcopy(\%info,$coursedom,$coursenum,\%lockerr); |
if ($result eq 'ok') { |
if ($result eq 'ok') { |
Line 1622 sub do_paste_from_buffer {
|
Line 1932 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 1629 sub do_paste_from_buffer {
|
Line 1941 sub do_paste_from_buffer {
|
next; |
next; |
} |
} |
if ($lockerr{$prefix}) { |
if ($lockerr{$prefix}) { |
$lockerrs{$suffix} = $lockerr{$prefix}; |
$lockerrs{$suffix} = $lockerr{$prefix}; |
} |
} |
} |
} |
} |
} |
Line 1669 sub do_paste_from_buffer {
|
Line 1981 sub do_paste_from_buffer {
|
$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 1686 sub do_paste_from_buffer {
|
Line 1998 sub do_paste_from_buffer {
|
} |
} |
} |
} |
} |
} |
|
} elsif ($url =~ m{^/res/lib/templates/(\w+)\.problem$}) { |
|
my $template = $1; |
|
if ($newidx) { |
|
©_templated_files($url,$srcdom{$suffix},$srcnum{$suffix},$srcmapidx{$suffix}, |
|
$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 1699 sub do_paste_from_buffer {
|
Line 2029 sub do_paste_from_buffer {
|
} |
} |
} |
} |
|
|
# Apply any changes to maps, or copy dependencies for uploaded HTML pages |
# Apply any changes to maps, or copy dependencies for uploaded HTML pages, or update |
|
# resourcedata for simpleproblems copied from another course |
unless ($allresult eq 'fail') { |
unless ($allresult eq 'fail') { |
my %updated = ( |
my %updated = ( |
rewrites => \%rewrites, |
rewrites => \%rewrites, |
Line 1707 sub do_paste_from_buffer {
|
Line 2038 sub do_paste_from_buffer {
|
removefrommap => \%removefrommap, |
removefrommap => \%removefrommap, |
removeparam => \%removeparam, |
removeparam => \%removeparam, |
dbcopies => \%dbcopies, |
dbcopies => \%dbcopies, |
|
resdatacopy => \%resdatacopy, |
retitles => \%retitles, |
retitles => \%retitles, |
); |
); |
my %info = ( |
my %info = ( |
Line 1871 sub get_newmap_url {
|
Line 2203 sub get_newmap_url {
|
sub dbcopy { |
sub dbcopy { |
my ($dbref,$coursedom,$coursenum,$lockerrorsref) = @_; |
my ($dbref,$coursedom,$coursenum,$lockerrorsref) = @_; |
my ($url,$result,$errtext); |
my ($url,$result,$errtext); |
$url = $dbref->{'src'}; |
|
if (ref($dbref) eq 'HASH') { |
if (ref($dbref) eq 'HASH') { |
if ($url =~ m{/(smppg|bulletinboard)$}) { |
$url = $dbref->{'src'}; |
|
if ($url =~ m{/(smppg|bulletinboard|ext\.tool)$}) { |
my $prefix = $1; |
my $prefix = $1; |
if (($dbref->{'cdom'} =~ /^$match_domain$/) && |
if ($prefix eq 'ext.tool') { |
|
$prefix = 'exttool'; |
|
} |
|
if (($dbref->{'cdom'} =~ /^$match_domain$/) && |
($dbref->{'cnum'} =~ /^$match_courseid$/)) { |
($dbref->{'cnum'} =~ /^$match_courseid$/)) { |
my $db_name; |
my $db_name; |
my $marker = (split(m{/},$url))[4]; |
my $marker = (split(m{/},$url))[4]; |
Line 1885 sub dbcopy {
|
Line 2220 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 1895 sub dbcopy {
|
Line 2232 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 1915 sub dbcopy {
|
Line 2254 sub dbcopy {
|
my $content = &Apache::lonnet::getfile($photo); |
my $content = &Apache::lonnet::getfile($photo); |
unless ($content eq '-1') { |
unless ($content eq '-1') { |
$env{'form.'.$suffix.'.photourl'} = $content; |
$env{'form.'.$suffix.'.photourl'} = $content; |
$newphoto = |
$newphoto = |
&Apache::lonnet::finishuserfileupload($coursenum,$coursedom,$suffix.'.photourl',"$subdir/$suffix/$fname"); |
&Apache::lonnet::finishuserfileupload($coursenum,$coursedom,$suffix.'.photourl',"$subdir/$suffix/$fname"); |
delete($env{'form.'.$suffix.'.photourl'}); |
delete($env{'form.'.$suffix.'.photourl'}); |
} |
} |
Line 1925 sub dbcopy {
|
Line 2264 sub dbcopy {
|
} |
} |
} |
} |
$db_name =~ s{_\d*$ }{_$suffix}x; |
$db_name =~ s{_\d*$ }{_$suffix}x; |
|
if (($prefix eq 'exttool') && ($dbref->{'delgradable'}) && ($contents{'gradable'})) { |
|
delete($contents{'gradable'}); |
|
} |
$result=&Apache::lonnet::put($db_name,\%contents, |
$result=&Apache::lonnet::put($db_name,\%contents, |
$coursedom,$coursenum); |
$coursedom,$coursenum); |
if ($result eq 'ok') { |
if ($result eq 'ok') { |
$url =~ s{/(\d*)/(smppg|bulletinboard)$}{/$suffix/$2}x; |
$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 1938 sub dbcopy {
|
Line 2280 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 1963 sub dbcopy {
|
Line 2308 sub dbcopy {
|
return ($url,$result,$errtext); |
return ($url,$result,$errtext); |
} |
} |
|
|
|
sub copy_templated_files { |
|
my ($srcurl,$srcdom,$srcnum,$srcmapinfo,$coursedom,$coursenum,$template,$newidx,$newmapname) = @_; |
|
my ($srcfolder,$srcid,$srcwaspage) = split(/:/,$srcmapinfo); |
|
my $srccontainer = 'sequence'; |
|
if ($srcwaspage) { |
|
$srccontainer = 'page'; |
|
} |
|
my $srcsymb = "uploaded/$srcdom/$srcnum/$srcfolder.$srccontainer". |
|
'___'.$srcid.'___'.&Apache::lonnet::declutter($srcurl); |
|
my $srcprefix = $srcdom.'_'.$srcnum.'.'.$srcsymb; |
|
my %srcparms=&Apache::lonnet::dump('resourcedata',$srcdom,$srcnum,$srcprefix); |
|
my $newsymb = "uploaded/$coursedom/$coursenum/$newmapname".'___'.$newidx.'___lib/templates/'. |
|
$template.'.problem'; |
|
my $newprefix = $coursedom.'_'.$coursenum.'.'.$newsymb; |
|
if ($template eq 'simpleproblem') { |
|
$srcprefix .= '.0.'; |
|
my $weightprefix = $newprefix; |
|
$newprefix .= '.0.'; |
|
my @simpleprobqtypes = qw(radio option string essay numerical); |
|
my $qtype=$srcparms{$srcprefix.'questiontype'}; |
|
if (grep(/^\Q$qtype\E$/,@simpleprobqtypes)) { |
|
my %newdata; |
|
foreach my $type (@simpleprobqtypes) { |
|
if ($type eq $qtype) { |
|
$newdata{"$weightprefix.$type.weight"}=1; |
|
} else { |
|
$newdata{"$weightprefix.$type.weight"}=0; |
|
} |
|
} |
|
$newdata{$newprefix.'hiddenparts'} = '!'.$qtype; |
|
$newdata{$newprefix.'questiontext'} = $srcparms{$srcprefix.'questiontext'}; |
|
$newdata{$newprefix.'hinttext'} = $srcparms{$srcprefix.'hinttext'}; |
|
if ($qtype eq 'numerical') { |
|
$newdata{$newprefix.'numericalscript'} = $srcparms{$srcprefix.'numericalscript'}; |
|
$newdata{$newprefix.'numericalanswer'} = $srcparms{$srcprefix.'numericalanswer'}; |
|
$newdata{$newprefix.'numericaltolerance'} = $srcparms{$srcprefix.'numericaltolerance'}; |
|
$newdata{$newprefix.'numericalsigfigs'} = $srcparms{$srcprefix.'numericalsigfigs'}; |
|
} elsif (($qtype eq 'option') || ($qtype eq 'radio')) { |
|
my $maxfoils=$srcparms{$srcprefix.'maxfoils'}; |
|
unless (defined($maxfoils)) { $maxfoils=10; } |
|
unless ($maxfoils=~/^\d+$/) { $maxfoils=10; } |
|
if ($maxfoils<=0) { $maxfoils=10; } |
|
my $randomize=$srcparms{$srcprefix.'randomize'}; |
|
unless (defined($randomize)) { $randomize='yes'; } |
|
unless ($randomize eq 'no') { $randomize='yes'; } |
|
$newdata{$newprefix.'maxfoils'} = $maxfoils; |
|
$newdata{$newprefix.'randomize'} = $randomize; |
|
if ($qtype eq 'option') { |
|
$newdata{$newprefix.'options'} = $srcparms{$srcprefix.'options'}; |
|
} |
|
for (my $i=1; $i<=10; $i++) { |
|
$newdata{$newprefix.'value'.$i} = $srcparms{$srcprefix.'value'.$i}; |
|
$newdata{$newprefix.'position'.$i} = $srcparms{$srcprefix.'position'.$i}; |
|
$newdata{$newprefix.'text'.$i} = $srcparms{$srcprefix.'text'.$i}; |
|
} |
|
|
|
} elsif (($qtype eq 'option') || ($qtype eq 'radio')) { |
|
my $maxfoils=$srcparms{$srcprefix.'maxfoils'}; |
|
unless (defined($maxfoils)) { $maxfoils=10; } |
|
unless ($maxfoils=~/^\d+$/) { $maxfoils=10; } |
|
if ($maxfoils<=0) { $maxfoils=10; } |
|
my $randomize=$srcparms{$srcprefix.'randomize'}; |
|
unless (defined($randomize)) { $randomize='yes'; } |
|
unless ($randomize eq 'no') { $randomize='yes'; } |
|
$newdata{$newprefix.'maxfoils'} = $maxfoils; |
|
$newdata{$newprefix.'randomize'} = $randomize; |
|
if ($qtype eq 'option') { |
|
$newdata{$newprefix.'options'} = $srcparms{$srcprefix.'options'}; |
|
} |
|
for (my $i=1; $i<=10; $i++) { |
|
$newdata{$newprefix.'value'.$i} = $srcparms{$srcprefix.'value'.$i}; |
|
$newdata{$newprefix.'position'.$i} = $srcparms{$srcprefix.'position'.$i}; |
|
$newdata{$newprefix.'text'.$i} = $srcparms{$srcprefix.'text'.$i}; |
|
} |
|
} elsif ($qtype eq 'string') { |
|
$newdata{$newprefix.'stringanswer'} = $srcparms{$srcprefix.'stringanswer'}; |
|
$newdata{$newprefix.'stringtype'} = $srcparms{$srcprefix.'stringtype'}; |
|
} |
|
if (keys(%newdata)) { |
|
my $putres = &Apache::lonnet::cput('resourcedata',\%newdata,$coursedom, |
|
$coursenum); |
|
if ($putres eq 'ok') { |
|
&Apache::lonnet::devalidatecourseresdata($coursenum,$coursedom); |
|
} |
|
} |
|
} |
|
} |
|
} |
|
|
sub uniqueness_check { |
sub uniqueness_check { |
my ($newurl) = @_; |
my ($newurl) = @_; |
my $unique = 1; |
my $unique = 1; |
Line 1978 sub uniqueness_check {
|
Line 2412 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 1989 sub contained_map_check {
|
Line 2423 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 = $1; |
|
unless ($srcdom eq $coursedom) { |
|
$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; |
Line 2008 sub contained_map_check {
|
Line 2448 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 2028 sub contained_map_check {
|
Line 2468 sub contained_map_check {
|
sub url_paste_fixups { |
sub url_paste_fixups { |
my ($oldurl,$folder,$prefixchg,$cdom,$cnum,$fromcdom,$fromcnum,$allmaps, |
my ($oldurl,$folder,$prefixchg,$cdom,$cnum,$fromcdom,$fromcnum,$allmaps, |
$rewrites,$retitles,$copies,$dbcopies,$zombies,$params,$mapmoves, |
$rewrites,$retitles,$copies,$dbcopies,$zombies,$params,$mapmoves, |
$mapchanges,$tomove,$newsubdir,$newurls) = @_; |
$mapchanges,$tomove,$newsubdir,$newurls,$resdatacopy) = @_; |
my $checktitle; |
my $checktitle; |
if (($prefixchg) && |
if (($prefixchg) && |
($oldurl =~ m{^/uploaded/$match_domain/$match_courseid/supplemental})) { |
($oldurl =~ m{^/uploaded/$match_domain/$match_courseid/supplemental})) { |
Line 2060 sub url_paste_fixups {
|
Line 2500 sub url_paste_fixups {
|
} |
} |
next if ($token->[2]->{'type'} eq 'external'); |
next if ($token->[2]->{'type'} eq 'external'); |
if ($token->[2]->{'type'} eq 'zombie') { |
if ($token->[2]->{'type'} eq 'zombie') { |
next if ($skip); |
next if ($skip); |
$zombies->{$oldurl}{$id} = $ressrc; |
$zombies->{$oldurl}{$id} = $ressrc; |
$changed = 1; |
$changed = 1; |
} elsif ($ressrc =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)$}) { |
} elsif ($ressrc =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)$}) { |
Line 2077 sub url_paste_fixups {
|
Line 2517 sub url_paste_fixups {
|
$srcdom,$srcnum,$allmaps,$rewrites, |
$srcdom,$srcnum,$allmaps,$rewrites, |
$retitles,$copies,$dbcopies,$zombies, |
$retitles,$copies,$dbcopies,$zombies, |
$params,$mapmoves,$mapchanges,$tomove, |
$params,$mapmoves,$mapchanges,$tomove, |
$newsubdir,$newurls); |
$newsubdir,$newurls,$resdatacopy); |
next; |
next; |
} else { |
} else { |
($newurl,my $error) = |
($newurl,my $error) = |
Line 2101 sub url_paste_fixups {
|
Line 2541 sub url_paste_fixups {
|
$cnum,$srcdom,$srcnum,$allmaps, |
$cnum,$srcdom,$srcnum,$allmaps, |
$rewrites,$retitles,$copies,$dbcopies, |
$rewrites,$retitles,$copies,$dbcopies, |
$zombies,$params,$mapmoves,$mapchanges, |
$zombies,$params,$mapmoves,$mapchanges, |
$tomove,$newsubdir,$newurls)) { |
$tomove,$newsubdir,$newurls,$resdatacopy)) { |
$mapmoves->{$ressrc} = 1; |
$mapmoves->{$ressrc} = 1; |
} |
} |
$changed = 1; |
$changed = 1; |
Line 2111 sub url_paste_fixups {
|
Line 2551 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 (($rem =~ m{\d+/ext\.tool$}) && |
|
($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 2130 sub url_paste_fixups {
|
Line 2592 sub url_paste_fixups {
|
$dbcopies->{$oldurl}{$id}{'cnum'} = $fromcnum; |
$dbcopies->{$oldurl}{$id}{'cnum'} = $fromcnum; |
$changed = 1; |
$changed = 1; |
} |
} |
|
} elsif ($ressrc eq '/res/lib/templates/simpleproblem.problem') { |
|
if (($fromcdom ne $cdom) || ($fromcnum ne $cnum)) { |
|
$resdatacopy->{$oldurl}{$id}{'src'} = $ressrc; |
|
$resdatacopy->{$oldurl}{$id}{'cdom'} = $fromcdom; |
|
$resdatacopy->{$oldurl}{$id}{'cnum'} = $fromcnum; |
|
} |
} elsif ($ressrc =~ m{^/public/($match_domain)/($match_courseid)/(.+)$}) { |
} elsif ($ressrc =~ m{^/public/($match_domain)/($match_courseid)/(.+)$}) { |
next if ($skip); |
next if ($skip); |
my $srcdom = $1; |
my $srcdom = $1; |
Line 2161 sub apply_fixups {
|
Line 2629 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, |
%lockerrors,$lockmsg); |
%resdatacopy,%lockerrors,$lockmsg); |
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 2181 sub apply_fixups {
|
Line 2649 sub apply_fixups {
|
if (ref($updated->{'retitles'}) eq 'HASH') { |
if (ref($updated->{'retitles'}) eq 'HASH') { |
%retitles = %{$updated->{'retitles'}}; |
%retitles = %{$updated->{'retitles'}}; |
} |
} |
|
if (ref($updated->{'resdatacopy'}) eq 'HASH') { |
|
%resdatacopy = %{$updated->{'resdatacopy'}}; |
|
} |
} |
} |
if (ref($info) eq 'HASH') { |
if (ref($info) eq 'HASH') { |
if (ref($info->{'newsubdir'}) eq 'HASH') { |
if (ref($info->{'newsubdir'}) eq 'HASH') { |
Line 2331 sub apply_fixups {
|
Line 2802 sub apply_fixups {
|
} |
} |
} |
} |
} |
} |
|
if (ref($resdatacopy{$key}) eq 'HASH') { |
|
if ($newsubdir{$key}) { |
|
|
|
} |
|
foreach my $idx (keys(%{$resdatacopy{$key}})) { |
|
if (ref($resdatacopy{$key}{$idx}) eq 'HASH') { |
|
my $srcurl = $resdatacopy{$key}{$idx}{'src'}; |
|
if ($srcurl =~ m{^/res/lib/templates/(\w+)\.problem$}) { |
|
my $template = $1; |
|
if (($resdatacopy{$key}{$idx}{'cdom'} =~ /^$match_domain$/) && |
|
($resdatacopy{$key}{$idx}{'cnum'} =~ /^$match_courseid$/)) { |
|
my $srcdom = $resdatacopy{$key}{$idx}{'cdom'}; |
|
my $srcnum = $resdatacopy{$key}{$idx}{'cnum'}; |
|
my ($newmapname) = ($key =~ m{/([^/]+)$}); |
|
my ($srcfolder,$srccontainer) = split(/\./,$newmapname); |
|
my $srcmapinfo = $srcfolder.':'.$idx; |
|
if ($srccontainer eq 'page') { |
|
$srcmapinfo .= ':1'; |
|
} |
|
if ($newsubdir{$key}) { |
|
$newmapname =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir{$key}/; |
|
} |
|
©_templated_files($srcurl,$srcdom,$srcnum,$srcmapinfo,$cdom, |
|
$cnum,$template,$idx,$newmapname); |
|
} |
|
} |
|
} |
|
} |
|
} |
if (ref($params{$key}) eq 'HASH') { |
if (ref($params{$key}) eq 'HASH') { |
%currparam = %{$params{$key}}; |
%currparam = %{$params{$key}}; |
} |
} |
Line 2346 sub apply_fixups {
|
Line 2846 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 2356 sub apply_fixups {
|
Line 2857 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 2398 sub apply_fixups {
|
Line 2899 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 2533 sub update_parameter {
|
Line 3034 sub update_parameter {
|
foreach my $which (keys(%allchecked)) { |
foreach my $which (keys(%allchecked)) { |
if (($which eq 'randompick' || $which eq 'randomorder')) { |
if (($which eq 'randompick' || $which eq 'randomorder')) { |
next if (!$is_map); |
next if (!$is_map); |
} |
} |
my $oldvalue = 0; |
my $oldvalue = 0; |
my $newvalue = 0; |
my $newvalue = 0; |
if ($allchecked{$which}{$res}) { |
if ($allchecked{$which}{$res}) { |
Line 2569 sub update_parameter {
|
Line 3070 sub update_parameter {
|
} |
} |
return $haschanges; |
return $haschanges; |
} else { |
} else { |
return 0 if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/); |
my $haschanges = 0; |
|
return $haschanges if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/); |
|
|
my $which = $env{'form.changeparms'}; |
my $which = $env{'form.changeparms'}; |
my $idx = $env{'form.setparms'}; |
my $idx = $env{'form.setparms'}; |
|
my $oldvalue = 0; |
|
my $newvalue = 0; |
|
my $current = (&LONCAPA::map::getparameter($idx,'parameter_'.$which))[0]; |
|
if ($which eq 'randompick') { |
|
if ($current =~ /^(\d+)$/) { |
|
$oldvalue = $1; |
|
} |
|
} elsif ($current =~ /^yes$/i) { |
|
$oldvalue = 1; |
|
} |
if ($env{'form.'.$which.'_'.$idx}) { |
if ($env{'form.'.$which.'_'.$idx}) { |
my $value = ($which eq 'randompick') ? $env{'form.rpicknum_'.$idx} |
$newvalue = ($which eq 'randompick') ? $env{'form.rpicknum_'.$idx} |
: 'yes'; |
: 1; |
&LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $value, |
|
$parameter_type{$which}); |
|
&remember_parms($idx,$which,'set',$value); |
|
} else { |
|
&LONCAPA::map::delparameter($idx,'parameter_'.$which); |
|
|
|
&remember_parms($idx,$which,'del'); |
|
} |
} |
return 1; |
if ($oldvalue ne $newvalue) { |
|
$haschanges = 1; |
|
if ($newvalue) { |
|
my $storeval = 'yes'; |
|
if ($which eq 'randompick') { |
|
$storeval = $newvalue; |
|
} |
|
&LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $storeval, |
|
$parameter_type{$which}); |
|
&remember_parms($idx,$which,'set',$storeval); |
|
} else { |
|
&LONCAPA::map::delparameter($idx,'parameter_'.$which); |
|
&remember_parms($idx,$which,'del'); |
|
} |
|
} |
|
return $haschanges; |
} |
} |
} |
} |
|
|
|
|
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 2607 sub handle_edit_cmd {
|
Line 3127 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 2629 sub handle_edit_cmd {
|
Line 3149 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 { |
my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype, |
my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype, |
$supplementalflag,$orderhash,$iconpath,$pathitem)=@_; |
$supplementalflag,$orderhash,$iconpath,$pathitem,$ltitoolsref, |
|
$canedit,$hostname,$navmapref,$hiddentop)=@_; |
my ($randompick,$ishidden,$isencrypted,$plain,$is_random_order,$container); |
my ($randompick,$ishidden,$isencrypted,$plain,$is_random_order,$container); |
if ($allowed) { |
if ($allowed) { |
(my $breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain, |
(my $breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain, |
Line 2661 sub editor {
|
Line 3197 sub editor {
|
$randompick = -1; |
$randompick = -1; |
} |
} |
|
|
my ($errtext,$fatal) = &mapread($coursenum,$coursedom, |
my ($errtext,$fatal); |
$folder.'.'.$container); |
if (($folder eq '') && (!$supplementalflag)) { |
return $errtext if ($fatal); |
if (@LONCAPA::map::order) { |
|
undef(@LONCAPA::map::order); |
|
undef(@LONCAPA::map::resources); |
|
undef(@LONCAPA::map::resparms); |
|
undef(@LONCAPA::map::zombies); |
|
} |
|
$folder = 'default'; |
|
$container = 'sequence'; |
|
} else { |
|
($errtext,$fatal) = &mapread($coursenum,$coursedom, |
|
$folder.'.'.$container); |
|
return $errtext if ($fatal); |
|
} |
|
|
if ($#LONCAPA::map::order<1) { |
if ($#LONCAPA::map::order<1) { |
my $idx=&LONCAPA::map::getresidx(); |
my $idx=&LONCAPA::map::getresidx(); |
Line 2675 sub editor {
|
Line 3223 sub editor {
|
# ------------------------------------------------------------ Process commands |
# ------------------------------------------------------------ Process commands |
|
|
# ---------------- if they are for this folder and user allowed to make changes |
# ---------------- if they are for this folder and user allowed to make changes |
if (($allowed) && ($env{'form.folder'} eq $folder)) { |
if (($allowed && $canedit) && ($env{'form.folder'} eq $folder)) { |
# set parameters and change order |
# set parameters and change order |
&snapshotbefore(); |
&snapshotbefore(); |
|
|
if (&update_parameter()) { |
if (&update_parameter()) { |
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container); |
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,1); |
return $errtext if ($fatal); |
return $errtext if ($fatal); |
} |
} |
|
|
Line 2742 sub editor {
|
Line 3290 sub editor {
|
$r->print($upload_output); |
$r->print($upload_output); |
|
|
# Rename, cut, copy or remove a single resource |
# Rename, cut, copy or remove a single resource |
if (&handle_edit_cmd()) { |
if (&handle_edit_cmd($coursenum,$coursedom)) { |
my $contentchg; |
my $contentchg; |
if ($env{'form.cmd'} =~ m{^(del|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 2776 sub editor {
|
Line 3324 sub editor {
|
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 %denied = |
my %denied = |
&action_restrictions($coursenum,$coursedom,$url, |
&action_restrictions($coursenum,$coursedom,$url, |
$env{'form.folderpath'},\%curr_groups); |
$env{'form.folderpath'},\%curr_groups); |
Line 2837 sub editor {
|
Line 3385 sub editor {
|
} else { |
} else { |
return $errortxt; |
return $errortxt; |
} |
} |
|
} elsif ($url =~ m{^/adm/$coursedom/$coursenum/new/ext\.tool}) { |
|
my ($suffix,$errortxt,$locknotfreed) = |
|
&new_timebased_suffix($coursedom,$coursenum,'exttool'); |
|
if ($locknotfreed) { |
|
$r->print($locknotfreed); |
|
} |
|
if ($suffix) { |
|
$url =~ s{^(/adm/$coursedom/$coursenum)/new}{$1/$suffix}; |
|
} else { |
|
return $errortxt; |
|
} |
} elsif ($url =~ m{^/uploaded/$coursedom/$coursenum/(docs|supplemental)/(default|\d+)/new.html$}) { |
} elsif ($url =~ m{^/uploaded/$coursedom/$coursenum/(docs|supplemental)/(default|\d+)/new.html$}) { |
if ($supplementalflag) { |
if ($supplementalflag) { |
next unless ($1 eq 'supplemental'); |
next unless ($1 eq 'supplemental'); |
Line 2859 sub editor {
|
Line 3418 sub editor {
|
} |
} |
($errtext,$fatal,my $fixuperrors) = |
($errtext,$fatal,my $fixuperrors) = |
&group_import($coursenum, $coursedom, $folder,$container, |
&group_import($coursenum, $coursedom, $folder,$container, |
'londocs',@imports); |
'londocs',$ltitoolsref,@imports); |
return $errtext if ($fatal); |
return $errtext if ($fatal); |
if ($fixuperrors) { |
if ($fixuperrors) { |
$r->print($fixuperrors); |
$r->print($fixuperrors); |
Line 2941 sub editor {
|
Line 3500 sub editor {
|
if ($url =~ m{/uploaded/.+\.(page|sequence)$}) { |
if ($url =~ m{/uploaded/.+\.(page|sequence)$}) { |
push(@allmapidx,$res); |
push(@allmapidx,$res); |
} |
} |
|
|
$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); |
\%filters,\%curr_groups,$ltitoolsref,$canedit, |
|
$isencrypted,$navmapref,$hostname); |
$idx++; |
$idx++; |
$shown++; |
$shown++; |
} |
} |
&Apache::loncommon::end_data_table_count(); |
&Apache::loncommon::end_data_table_count(); |
|
|
my $need_save; |
my $need_save; |
if (($allowed) || ($supplementalflag && $folder eq 'supplemental')) { |
if ($allowed || ($supplementalflag && $folder eq 'supplemental')) { |
my $toolslink; |
my $toolslink; |
if ($allowed || &Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { |
if ($allowed) { |
$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') |
'Navigation_Screen',undef,'RAT') |
Line 2971 sub editor {
|
Line 3532 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/) { |
if ($folder !~ /^supplemental/) { |
$to_show .= '<th colspan="4">'.&mt('Settings').'</th>'; |
$to_show .= '<th colspan="2">'.&mt('Settings').'</th>'; |
} |
} |
$to_show .= &Apache::loncommon::end_data_table_header_row(); |
$to_show .= &Apache::loncommon::end_data_table_header_row(); |
if ($folder !~ /^supplemental/) { |
if ($folder !~ /^supplemental/) { |
Line 3000 sub editor {
|
Line 3561 sub editor {
|
&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). |
&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). |
|
'</td>'. |
'</td>'. |
&Apache::loncommon::end_data_table_row(); |
&Apache::loncommon::end_data_table_row(); |
$need_save = 1; |
$need_save = 1; |
Line 3026 sub editor {
|
Line 3586 sub editor {
|
if (!$allowed) { |
if (!$allowed) { |
$to_show .= $toolslink; |
$to_show .= $toolslink; |
} |
} |
|
my $noresmsg; |
|
if ($allowed && $hiddentop && !$supplementalflag) { |
|
$noresmsg = &mt('Main Content Hidden'); |
|
} else { |
|
$noresmsg = &mt('Currently empty'); |
|
} |
$to_show .= &Apache::loncommon::start_scrollbox('400px','380px','200px','contentscroll') |
$to_show .= &Apache::loncommon::start_scrollbox('400px','380px','200px','contentscroll') |
.'<div class="LC_info" id="contentlist">' |
.'<div class="LC_info" id="contentlist">' |
.&mt('Currently empty') |
.$noresmsg |
.'</div>' |
.'</div>' |
.&Apache::loncommon::end_scrollbox(); |
.&Apache::loncommon::end_scrollbox(); |
} |
} |
Line 3052 sub editor {
|
Line 3618 sub editor {
|
if ($allowed) { |
if ($allowed) { |
my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container"; |
my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container"; |
$r->print(&generate_edit_table($tid,$orderhash,$to_show,$iconpath, |
$r->print(&generate_edit_table($tid,$orderhash,$to_show,$iconpath, |
$jumpto,$readfile,$need_save,"$folder.$container")); |
$jumpto,$readfile,$need_save,"$folder.$container",$canedit)); |
&print_paste_buffer($r,$container,$folder,$coursedom,$coursenum); |
if ($canedit) { |
|
&print_paste_buffer($r,$container,$folder,$coursedom,$coursenum); |
|
} |
} else { |
} else { |
$r->print($to_show); |
$r->print($to_show); |
} |
} |
Line 3061 sub editor {
|
Line 3629 sub editor {
|
} |
} |
|
|
sub multiple_check_form { |
sub multiple_check_form { |
my ($caller,$listsref) = @_; |
my ($caller,$listsref,$canedit) = @_; |
return unless (ref($listsref) eq 'HASH'); |
return unless (ref($listsref) eq 'HASH'); |
|
my $disabled; |
|
unless ($canedit) { |
|
$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.'">'. |
'<span class="LC_nobreak" style="font-size:x-small;font-weight:bold;">'. |
'<span class="LC_nobreak" style="font-size:x-small;font-weight:bold;">'. |
Line 3075 sub multiple_check_form {
|
Line 3647 sub multiple_check_form {
|
'<table><tr>'. |
'<table><tr>'. |
'<td class="LC_docs_entry_parameter">'. |
'<td class="LC_docs_entry_parameter">'. |
'<span class="LC_nobreak"><label>'. |
'<span class="LC_nobreak"><label>'. |
'<input type="checkbox" name="hiddenresourceall" id="hiddenresourceall" onclick="propagateState(this.form,'."'hiddenresource'".')" />'.&mt('Hidden'). |
'<input type="checkbox" name="hiddenresourceall" id="hiddenresourceall" onclick="propagateState(this.form,'."'hiddenresource'".')"'.$disabled.' />'.&mt('Hidden'). |
'</label></span></td>'. |
'</label></span></td>'. |
'<td class="LC_docs_entry_parameter">'. |
'<td class="LC_docs_entry_parameter">'. |
'<span class="LC_nobreak"><label><input type="checkbox" name="randompickall" id="randompickall" onclick="updatePick(this.form,'."'all','check'".');propagateState(this.form,'."'randompick'".');propagateState(this.form,'."'rpicknum'".');" />'.&mt('Randomly Pick').'</label><span id="rpicktextall"></span><input type="hidden" name="rpicknumall" id="rpicknumall" value="" />'. |
'<span class="LC_nobreak"><label><input type="checkbox" name="randompickall" id="randompickall" onclick="updatePick(this.form,'."'all','check'".');propagateState(this.form,'."'randompick'".');propagateState(this.form,'."'rpicknum'".');"'.$disabled.' />'.&mt('Randomly Pick').'</label><span id="rpicktextall"></span><input type="hidden" name="rpicknumall" id="rpicknumall" value="" />'. |
'</span></td>'. |
'</span></td>'. |
'</tr>'."\n". |
'</tr>'."\n". |
'<tr>'. |
'<tr>'. |
'<td class="LC_docs_entry_parameter">'. |
'<td class="LC_docs_entry_parameter">'. |
'<span class="LC_nobreak"><label><input type="checkbox" name="encrypturlall" id="encrypturlall" onclick="propagateState(this.form,'."'encrypturl'".')" />'.&mt('URL hidden').'</label></span></td><td class="LC_docs_entry_parameter"><span class="LC_nobreak"><label><input type="checkbox" name="randomorderall" id="randomorderall" onclick="propagateState(this.form,'."'randomorder'".')" />'.&mt('Random Order'). |
'<span class="LC_nobreak"><label><input type="checkbox" name="encrypturlall" id="encrypturlall" onclick="propagateState(this.form,'."'encrypturl'".')"'.$disabled.' />'.&mt('URL hidden').'</label></span></td><td class="LC_docs_entry_parameter"><span class="LC_nobreak"><label><input type="checkbox" name="randomorderall" id="randomorderall" onclick="propagateState(this.form,'."'randomorder'".')"'.$disabled.' />'.&mt('Random Order'). |
'</label></span>'. |
'</label></span>'. |
'</td></tr></table>'."\n"; |
'</td></tr></table>'."\n"; |
} else { |
} else { |
Line 3091 sub multiple_check_form {
|
Line 3663 sub multiple_check_form {
|
'<table><tr>'. |
'<table><tr>'. |
'<td class="LC_docs_entry_parameter">'. |
'<td class="LC_docs_entry_parameter">'. |
'<span class="LC_nobreak LC_docs_remove">'. |
'<span class="LC_nobreak LC_docs_remove">'. |
'<label><input type="checkbox" name="removeall" id="removeall" onclick="propagateState(this.form,'."'remove'".')" />'.&mt('Remove'). |
'<label><input type="checkbox" name="removeall" id="removeall" onclick="propagateState(this.form,'."'remove'".')"'.$disabled.' />'.&mt('Remove'). |
'</label></span></td>'. |
'</label></span></td>'. |
'<td class="LC_docs_entry_parameter">'. |
'<td class="LC_docs_entry_parameter">'. |
'<span class="LC_nobreak LC_docs_cut">'. |
'<span class="LC_nobreak LC_docs_cut">'. |
'<label><input type="checkbox" name="cut" id="cutall" onclick="propagateState(this.form,'."'cut'".');" />'.&mt('Cut'). |
'<label><input type="checkbox" name="cut" id="cutall" onclick="propagateState(this.form,'."'cut'".');"'.$disabled.' />'.&mt('Cut'). |
'</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'".')" />'.&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 3141 sub process_file_upload {
|
Line 3713 sub process_file_upload {
|
my $quotatype = 'unofficial'; |
my $quotatype = 'unofficial'; |
if ($crstype eq 'Community') { |
if ($crstype eq 'Community') { |
$quotatype = 'community'; |
$quotatype = 'community'; |
} elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.instcode'}) { |
} elsif ($crstype eq 'Placement') { |
|
$quotatype = 'placement'; |
|
} elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.coursecode'}) { |
$quotatype = 'official'; |
$quotatype = 'official'; |
|
} elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.textbook'}) { |
|
$quotatype = 'textbook'; |
} |
} |
if (&Apache::loncommon::get_user_quota($coursenum,$coursedom,'course',$quotatype)) { |
if (&Apache::loncommon::get_user_quota($coursenum,$coursedom,'course',$quotatype)) { |
$filesize = int($filesize/1000); #expressed in kb |
$filesize = int($filesize/1000); #expressed in kb |
$$upload_output = &Apache::loncommon::excess_filesize_warning($coursenum,$coursedom,'course', |
$$upload_output = &Apache::loncommon::excess_filesize_warning($coursenum,$coursedom,'course', |
$env{'form.uploaddoc.filename'},$filesize,'upload'); |
$env{'form.uploaddoc.filename'},$filesize, |
|
'upload',$quotatype); |
return if ($$upload_output); |
return if ($$upload_output); |
} |
} |
my ($parseaction,$showupload,$nextphase,$mimetype); |
my ($parseaction,$showupload,$nextphase,$mimetype); |
Line 3227 sub process_file_upload {
|
Line 3804 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 3245 sub process_file_upload {
|
Line 3822 sub process_file_upload {
|
$$upload_output .= &mt('No embedded items identified').'<br />'; |
$$upload_output .= &mt('No embedded items identified').'<br />'; |
} |
} |
$$upload_output = '<div id="uploadfileresult">'.$$upload_output.'</div>'; |
$$upload_output = '<div id="uploadfileresult">'.$$upload_output.'</div>'; |
} elsif (&Apache::loncommon::is_archive_file($mimetype)) { |
} elsif ((&Apache::loncommon::is_archive_file($mimetype)) && |
|
($env{'form.uploaddoc.filename'} =~ /\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/i)) { |
$nextphase = 'decompress_uploaded'; |
$nextphase = 'decompress_uploaded'; |
my $position = scalar(@LONCAPA::map::order)-1; |
my $position = scalar(@LONCAPA::map::order)-1; |
my $noextract = &return_to_editor(); |
my $noextract = &return_to_editor(); |
Line 3306 sub is_supplemental_title {
|
Line 3884 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, |
my ($foldertitle,$renametitle); |
$ltitoolsref,$canedit,$isencrypted,$navmapref,$hostname)=@_; |
|
my ($foldertitle,$renametitle,$oldtitle); |
if (&is_supplemental_title($title)) { |
if (&is_supplemental_title($title)) { |
($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title); |
($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title); |
} else { |
} else { |
Line 3316 sub entryline {
|
Line 3895 sub entryline {
|
$foldertitle=$title; |
$foldertitle=$title; |
} |
} |
|
|
|
my ($disabled,$readonly,$js_lt); |
|
unless ($canedit) { |
|
$disabled = 'disabled="disabled"'; |
|
$readonly = 1; |
|
} |
|
|
my $orderidx=$LONCAPA::map::order[$index]; |
my $orderidx=$LONCAPA::map::order[$index]; |
|
|
$renametitle=~s/\\/\\\\/g; |
$renametitle=~s/\\/\\\\/g; |
$renametitle=~s/\"\;/\\\"/g; |
$renametitle=~s/\"\;/\\\"/g; |
|
$renametitle=~s/"/%22/g; |
$renametitle=~s/ /%20/g; |
$renametitle=~s/ /%20/g; |
|
$oldtitle = $renametitle; |
|
$renametitle=~s/\'/\\\'/g; |
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, $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 3376 END
|
Line 3964 END
|
ne '')) { |
ne '')) { |
$selectbox= |
$selectbox= |
'<input type="hidden" name="currentpos" value="'.$incindex.'" />'. |
'<input type="hidden" name="currentpos" value="'.$incindex.'" />'. |
'<select name="newpos" onchange="this.form.submit()">'; |
'<select name="newpos" onchange="this.form.submit()"'.$disabled.'>'; |
for (my $i=1;$i<=$#LONCAPA::map::order+1;$i++) { |
for (my $i=1;$i<=$#LONCAPA::map::order+1;$i++) { |
if ($i==$incindex) { |
if ($i==$incindex) { |
$selectbox.='<option value="" selected="selected">('.$i.')</option>'; |
$selectbox.='<option value="" selected="selected">('.$i.')</option>'; |
Line 3393 END
|
Line 3981 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', |
'ed' => 'Edit', |
'ed' => 'Edit', |
'pr' => 'Preview', |
'pr' => 'Preview', |
'sv' => 'Save', |
'sv' => 'Save', |
'ul' => 'URL', |
'ul' => 'URL', |
'ti' => 'Title', |
'ti' => 'Title', |
|
'er' => 'Editing rights unavailable for your current role.', |
); |
); |
my %denied = &action_restrictions($coursenum,$coursedom,$url, |
my %denied = &action_restrictions($coursenum,$coursedom,$url, |
$env{'form.folderpath'}, |
$env{'form.folderpath'}, |
$currgroups); |
$currgroups); |
my ($copylink,$cutlink,$removelink); |
my ($copylink,$cutlink,$removelink); |
my $skip_confirm = 0; |
my $skip_confirm = 0; |
|
my $confirm_removal = 0; |
if ( $folder =~ /^supplemental/ |
if ( $folder =~ /^supplemental/ |
|| ($url =~ m{( /smppg$ |
|| ($url =~ m{( /smppg$ |
|/syllabus$ |
|/syllabus$ |
|/aboutme$ |
|/aboutme$ |
|/navmaps$ |
|/navmaps$ |
|/bulletinboard$ |
|/bulletinboard$ |
|
|/ext\.tool$ |
|\.html$)}x) |
|\.html$)}x) |
|| $isexternal) { |
|| $isexternal) { |
$skip_confirm = 1; |
$skip_confirm = 1; |
} |
} |
|
if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) && |
|
($url!~/$LONCAPA::assess_page_seq_re/)) { |
|
$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 3426 ENDCOPY
|
Line 4027 ENDCOPY
|
$copylink=(<<ENDCOPY); |
$copylink=(<<ENDCOPY); |
<form name="$formname" method="post" action="/adm/coursedocs"> |
<form name="$formname" method="post" action="/adm/coursedocs"> |
$form_common |
$form_common |
<input type="checkbox" name="copy" id="copy_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','copy');" class="LC_hidden" /><a href="$js" class="LC_docs_copy">$lt{'cp'}</a> |
<input type="checkbox" name="copy" id="copy_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','copy');" class="LC_hidden" $disabled /><a href="$js" class="LC_docs_copy">$lt{'cp'}</a> |
$form_end |
$form_end |
ENDCOPY |
ENDCOPY |
if (($ishash) && (ref($filtersref->{'cancopy'}) eq 'ARRAY')) { |
if (($ishash) && (ref($filtersref->{'cancopy'}) eq 'ARRAY')) { |
Line 3444 ENDCUT
|
Line 4045 ENDCUT
|
<form name="$formname" method="post" action="/adm/coursedocs"> |
<form name="$formname" method="post" action="/adm/coursedocs"> |
$form_common |
$form_common |
<input type="hidden" name="skip_$orderidx" id="skip_cut_$orderidx" value="$skip_confirm" /> |
<input type="hidden" name="skip_$orderidx" id="skip_cut_$orderidx" value="$skip_confirm" /> |
<input type="checkbox" name="cut" id="cut_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','cut');" class="LC_hidden" /><a href="$js" class="LC_docs_cut">$lt{'ct'}</a> |
<input type="checkbox" name="cut" id="cut_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','cut');" class="LC_hidden" $disabled /><a href="$js" class="LC_docs_cut">$lt{'ct'}</a> |
$form_end |
$form_end |
ENDCUT |
ENDCUT |
if (($ishash) && (ref($filtersref->{'cancut'}) eq 'ARRAY')) { |
if (($ishash) && (ref($filtersref->{'cancut'}) eq 'ARRAY')) { |
Line 3457 ENDCUT
|
Line 4058 ENDCUT
|
ENDREM |
ENDREM |
} else { |
} else { |
my $formname = 'edit_remove_'.$orderidx; |
my $formname = 'edit_remove_'.$orderidx; |
my $js = "javascript:checkForSubmit(document.forms.renameform,'remove','actions','$orderidx','$esc_path','$index','$renametitle',$skip_confirm);"; |
my $js = "javascript:checkForSubmit(document.forms.renameform,'remove','actions','$orderidx','$esc_path','$index','$renametitle',$skip_confirm,'$container','$folder',$confirm_removal);"; |
$removelink=(<<ENDREM); |
$removelink=(<<ENDREM); |
<form name="$formname" method="post" action="/adm/coursedocs"> |
<form name="$formname" method="post" action="/adm/coursedocs"> |
$form_common |
$form_common |
<input type="hidden" name="skip_$orderidx" id="skip_remove_$orderidx" value="$skip_confirm" /> |
<input type="hidden" name="skip_$orderidx" id="skip_remove_$orderidx" value="$skip_confirm" /> |
<input type="checkbox" name="remove" id="remove_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','remove');" class="LC_hidden" /><a href="$js" class="LC_docs_remove">$lt{'rm'}</a> |
<input type="hidden" name="confirm_rem_$orderidx" id="confirm_removal_$orderidx" value="$confirm_removal" /> |
|
<input type="checkbox" name="remove" id="remove_$orderidx" value="$orderidx" onclick="javascript:singleCheck(this,'$orderidx','remove');" class="LC_hidden" $disabled /><a href="$js" class="LC_docs_remove">$lt{'rm'}</a> |
$form_end |
$form_end |
ENDREM |
ENDREM |
if (($ishash) && (ref($filtersref->{'canremove'}) eq 'ARRAY')) { |
if (($ishash) && (ref($filtersref->{'canremove'}) eq 'ARRAY')) { |
Line 3470 ENDREM
|
Line 4072 ENDREM
|
} |
} |
} |
} |
$renamelink=(<<ENDREN); |
$renamelink=(<<ENDREN); |
<a href='javascript:changename("$esc_path","$index","$renametitle");' class="LC_docs_rename">$lt{'rn'}</a> |
<a href='javascript:changename("$esc_path","$index","$oldtitle");' class="LC_docs_rename">$lt{'rn'}</a> |
ENDREN |
ENDREN |
|
my ($uplink,$downlink); |
|
if ($canedit) { |
|
$uplink = "/adm/coursedocs?cmd=up_$index&folderpath=$esc_path&symb=$symb"; |
|
$downlink = "/adm/coursedocs?cmd=down_$index&folderpath=$esc_path&symb=$symb"; |
|
} else { |
|
$uplink = "javascript:alert('".&js_escape($lt{'er'})."');"; |
|
$downlink = $uplink; |
|
} |
$line.=(<<END); |
$line.=(<<END); |
<td> |
<td> |
<div class="LC_docs_entry_move"> |
<div class="LC_docs_entry_move"> |
<a href='/adm/coursedocs?cmd=up_$index&folderpath=$esc_path&symb=$symb'> |
<a href="$uplink"> |
<img src="${iconpath}move_up.gif" alt="$lt{'up'}" class="LC_icon" /> |
<img src="${iconpath}move_up.gif" alt="$lt{'up'}" class="LC_icon" /> |
</a> |
</a> |
</div> |
</div> |
<div class="LC_docs_entry_move"> |
<div class="LC_docs_entry_move"> |
<a href='/adm/coursedocs?cmd=down_$index&folderpath=$esc_path&symb=$symb'> |
<a href="$downlink"> |
<img src="${iconpath}move_down.gif" alt="$lt{'dw'}" class="LC_icon" /> |
<img src="${iconpath}move_down.gif" alt="$lt{'dw'}" class="LC_icon" /> |
</a> |
</a> |
</div> |
</div> |
Line 3506 END
|
Line 4116 END
|
my $isfolder; |
my $isfolder; |
my $ispage; |
my $ispage; |
my $containerarg; |
my $containerarg; |
|
my $folderurl; |
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 3517 END
|
Line 4128 END
|
$icon=$iconpath.'page.gif'; |
$icon=$iconpath.'page.gif'; |
$ispage=1; |
$ispage=1; |
} |
} |
|
$folderurl = &Apache::lonnet::declutter($url); |
if ($allowed) { |
if ($allowed) { |
$url='/adm/coursedocs?'; |
$url='/adm/coursedocs?'; |
} else { |
} else { |
Line 3527 END
|
Line 4139 END
|
} |
} |
} |
} |
|
|
my ($editlink,$extresform); |
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/}; |
$url=~s{^http(|s)(:|:)//}{/adm/wrapper/ext/}; |
Line 3545 END
|
Line 4157 END
|
} elsif ($url!~/\.(sequence|page)$/) { |
} elsif ($url!~/\.(sequence|page)$/) { |
$url='/adm/coursedocs/showdoc'.$url; |
$url='/adm/coursedocs/showdoc'.$url; |
} |
} |
} elsif ($url=~m|^/ext/|) { |
} elsif ($url=~m{^(|/adm/wrapper)/ext/([^#]+)}) { |
$url='/adm/wrapper'.$url; |
my $wrapped = $1; |
} |
my $exturl = $2; |
|
if ($wrapped eq '') { |
|
$url='/adm/wrapper'.$url; |
|
} |
|
if (($ENV{'SERVER_PORT'} == 443) && ($exturl !~ /^https:/)) { |
|
$nomodal = 1; |
|
} |
|
} elsif ($url=~m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) { |
|
$url='/adm/wrapper'.$url; |
|
} elsif ($url eq "/public/$coursedom/$coursenum/syllabus") { |
|
if (($ENV{'SERVER_PORT'} == 443) && |
|
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { |
|
$url .= '?usehttp=1'; |
|
$nomodal = 1; |
|
} |
|
} |
if (&Apache::lonnet::symbverify($symb,$url)) { |
if (&Apache::lonnet::symbverify($symb,$url)) { |
$url.=(($url=~/\?/)?'&':'?').'symb='.&escape($symb); |
my $shownsymb = $symb; |
|
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='.&escape($shownsymb); |
|
} |
|
} elsif (!$env{'request.role.adv'}) { |
|
my $checkencrypt; |
|
if (((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) || |
|
$isencrypted || (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i)) { |
|
$checkencrypt = 1; |
|
} elsif (ref($navmapref)) { |
|
unless (ref($$navmapref)) { |
|
$$navmapref = Apache::lonnavmaps::navmap->new(); |
|
} |
|
if (ref($$navmapref)) { |
|
if (lc($$navmapref->get_mapparam($symb,undef,"0.encrypturl")) eq 'yes') { |
|
$checkencrypt = 1; |
|
} |
|
} |
|
} |
|
if ($checkencrypt) { |
|
my $shownsymb = &Apache::lonenc::encrypted($symb); |
|
my $shownurl = &Apache::lonenc::encrypted($url); |
|
if (&Apache::lonnet::symbverify($shownsymb,$shownurl)) { |
|
$url = $shownurl.(($shownurl=~/\?/)?'&':'?').'symb='.&escape($shownsymb); |
|
if ($env{'request.enc'} ne '') { |
|
delete($env{'request.enc'}); |
|
} |
|
} else { |
|
$url=''; |
|
} |
|
} else { |
|
$url=''; |
|
} |
} else { |
} else { |
$url=''; |
$url=''; |
} |
} |
} |
} |
|
} elsif ($supplementalflag) { |
|
if ($isexternal) { |
|
if ($url =~ /^([^#]+)#([^#]+)$/) { |
|
$url = $1; |
|
$anchor = $2; |
|
if (($url =~ m{^(|/adm/wrapper)/ext/(?!https:)}) && ($ENV{'SERVER_PORT'} == 443)) { |
|
if ($hostname ne '') { |
|
$url = 'http://'.$hostname.$url; |
|
} |
|
$nomodal = 1; |
|
} |
|
} |
|
} elsif ($url =~ m{^\Q/public/$coursedom/$coursenum/syllabus\E}) { |
|
if (($ENV{'SERVER_PORT'} == 443) && |
|
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { |
|
if ($hostname ne '') { |
|
$url = 'http://'.$hostname.$url; |
|
} |
|
$url .= (($url =~ /\?/) ? '&':'?').'usehttp=1'; |
|
$nomodal = 1; |
|
} |
|
} |
} |
} |
my ($rand_pick_text,$rand_order_text); |
my ($rand_pick_text,$rand_order_text,$hiddenfolder); |
|
my $filterFunc = sub { my $res = shift; return (!$res->randomout() && !$res->is_map()) }; |
if ($isfolder || $ispage || $extension eq 'sequence' || $extension eq 'page') { |
if ($isfolder || $ispage || $extension eq 'sequence' || $extension eq 'page') { |
my $foldername=&escape($foldertitle); |
my $foldername=&escape($foldertitle); |
my $folderpath=$env{'form.folderpath'}; |
my $folderpath=$env{'form.folderpath'}; |
Line 3564 END
|
Line 4264 END
|
$folderpath.=$containerarg.'&'.$foldername; |
$folderpath.=$containerarg.'&'.$foldername; |
$url.='folderpath='.&escape($folderpath); |
$url.='folderpath='.&escape($folderpath); |
} else { |
} else { |
|
my $rpicknum = (&LONCAPA::map::getparameter($orderidx, |
|
'parameter_randompick'))[0]; |
|
my $randorder = ((&LONCAPA::map::getparameter($orderidx, |
|
'parameter_randomorder'))[0]=~/^yes$/i); |
|
my $hiddenmap = ((&LONCAPA::map::getparameter($orderidx, |
|
'parameter_hiddenresource'))[0]=~/^yes$/i); |
|
my $encryptmap = ((&LONCAPA::map::getparameter($orderidx, |
|
'parameter_encrypturl'))[0]=~/^yes$/i); |
|
unless ($hiddenmap) { |
|
if (ref($navmapref)) { |
|
unless (ref($$navmapref)) { |
|
$$navmapref = Apache::lonnavmaps::navmap->new(); |
|
} |
|
if (ref($$navmapref)) { |
|
if (lc($$navmapref->get_mapparam(undef,$folderurl,"0.hiddenresource")) eq 'yes') { |
|
my @resources = $$navmapref->retrieveResources($folderurl,$filterFunc,1,1); |
|
unless (@resources) { |
|
$hiddenmap = 1; |
|
unless ($env{'request.role.adv'}) { |
|
$url = ''; |
|
$hiddenfolder = 1; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
unless ($encryptmap) { |
|
if ((ref($navmapref)) && (ref($$navmapref))) { |
|
if (lc($$navmapref->get_mapparam(undef,$folderurl,"0.encrypturl")) eq 'yes') { |
|
$encryptmap = 1; |
|
} |
|
} |
|
} |
|
|
# 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. |
':'.(&LONCAPA::map::getparameter($orderidx, |
':'.$rpicknum.':'.$hiddenmap.':'.$encryptmap.':'.$randorder.':'.$ispage; |
'parameter_randompick'))[0] |
unless ($url eq '') { |
.':'.((&LONCAPA::map::getparameter($orderidx, |
$url.='folderpath='.&escape($folderpath); |
'parameter_hiddenresource'))[0]=~/^yes$/i) |
} |
.':'.((&LONCAPA::map::getparameter($orderidx, |
|
'parameter_encrypturl'))[0]=~/^yes$/i) |
|
.':'.((&LONCAPA::map::getparameter($orderidx, |
|
'parameter_randomorder'))[0]=~/^yes$/i) |
|
.':'.$ispage; |
|
$url.='folderpath='.&escape($folderpath); |
|
my $rpicknum = (&LONCAPA::map::getparameter($orderidx, |
|
'parameter_randompick'))[0]; |
|
my $rpckchk; |
my $rpckchk; |
if ($rpicknum) { |
if ($rpicknum) { |
$rpckchk = ' checked="checked"'; |
$rpckchk = ' checked="checked"'; |
Line 3591 END
|
Line 4318 END
|
'<form action="/adm/coursedocs" method="post" name="'.$formname.'">'."\n". |
'<form action="/adm/coursedocs" method="post" name="'.$formname.'">'."\n". |
$form_param."\n". |
$form_param."\n". |
$form_common."\n". |
$form_common."\n". |
'<span class="LC_nobreak"><label><input type="checkbox" name="randompick_'.$orderidx.'" id="randompick_'.$orderidx.'" onclick="'."updatePick(this.form,'$orderidx','check');".'"'.$rpckchk.' /> '.&mt('Randomly Pick').'</label><input type="hidden" name="rpicknum_'.$orderidx.'" id="rpicknum_'.$orderidx.'" value="'.$rpicknum.'" /><span id="randompicknum_'.$orderidx.'">'; |
'<span class="LC_nobreak"><label><input type="checkbox" name="randompick_'.$orderidx.'" id="randompick_'.$orderidx.'" onclick="'."updatePick(this.form,'$orderidx','check');".'"'.$rpckchk.$disabled.' /> '.&mt('Randomly Pick').'</label><input type="hidden" name="rpicknum_'.$orderidx.'" id="rpicknum_'.$orderidx.'" value="'.$rpicknum.'" /><span id="randompicknum_'.$orderidx.'">'; |
if ($rpicknum ne '') { |
if ($rpicknum ne '') { |
$rand_pick_text .= ': <a href="javascript:updatePick('."document.$formname,'$orderidx','link'".')">'.$rpicknum.'</a>'; |
$rand_pick_text .= ': <a href="javascript:updatePick('."document.$formname,'$orderidx','link'".')">'.$rpicknum.'</a>'; |
} |
} |
$rand_pick_text .= '</span></span>'. |
$rand_pick_text .= '</span></span>'. |
$form_end; |
$form_end; |
my $ro_set; |
my $ro_set; |
if ((&LONCAPA::map::getparameter($orderidx,'parameter_randomorder'))[0]=~/^yes$/i) { |
if ($randorder) { |
$ro_set = 'checked="checked"'; |
$ro_set = 'checked="checked"'; |
if (($ishash) && (ref($filtersref->{'randomorder'}) eq 'ARRAY')) { |
if (($ishash) && (ref($filtersref->{'randomorder'}) eq 'ARRAY')) { |
push(@{$filtersref->{'randomorder'}},$orderidx); |
push(@{$filtersref->{'randomorder'}},$orderidx); |
Line 3609 $form_common."\n".
|
Line 4336 $form_common."\n".
|
'<form action="/adm/coursedocs" method="post" name="'.$formname.'">'."\n". |
'<form action="/adm/coursedocs" method="post" name="'.$formname.'">'."\n". |
$form_param."\n". |
$form_param."\n". |
$form_common."\n". |
$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.' /> '.&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 && !$allowed) { |
|
my $isexttool; |
|
if ($url=~m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) { |
|
$url='/adm/wrapper'.$url; |
|
$isexttool = 1; |
|
} |
$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='.&HTML::Entities::encode($renametitle,'<>&"'); |
} |
} |
if ($isexternal && $orderidx) { |
if ((($isexternal) || ($isexttool)) && $orderidx) { |
$url .= '&idx='.$orderidx; |
$url .= '&idx='.$orderidx; |
} |
} |
|
if ($anchor ne '') { |
|
$url .= '&anchor='.&HTML::Entities::encode($anchor,'"<>&'); |
|
} |
} |
} |
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,$disabled); |
|
} elsif ($orig_url =~ m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) { |
|
($editlink,$extresform) = |
|
&Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem, |
|
undef,undef,undef,'tool',$coursedom, |
|
$coursenum,$ltitoolsref,$disabled); |
} elsif (!$isfolder && !$ispage) { |
} elsif (!$isfolder && !$ispage) { |
my ($cfile,$home,$switchserver,$forceedit,$forceview) = |
my ($cfile,$home,$switchserver,$forceedit,$forceview) = |
&Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom,$orig_url); |
&Apache::lonnet::can_edit_resource($fileloc,$coursenum,$coursedom,$orig_url); |
if (($cfile ne '') && ($symb ne '' || $supplementalflag)) { |
if (($cfile ne '') && ($symb ne '' || $supplementalflag)) { |
my $jscall = |
my $suppanchor; |
|
if ($supplementalflag) { |
|
$suppanchor = $anchor; |
|
} |
|
my $jscall = |
&Apache::lonhtmlcommon::jump_to_editres($cfile,$home, |
&Apache::lonhtmlcommon::jump_to_editres($cfile,$home, |
$switchserver, |
$switchserver, |
$forceedit, |
$forceedit, |
undef,$symb, |
undef,$symb, |
&escape($env{'form.folderpath'}), |
&escape($env{'form.folderpath'}), |
$renametitle,'','',1); |
$renametitle,$hostname, |
|
'','',1,$suppanchor); |
if ($jscall) { |
if ($jscall) { |
$editlink = '<a class="LC_docs_ext_edit" href="javascript:'. |
$editlink = '<a class="LC_docs_ext_edit" href="javascript:'. |
$jscall.'" >'.&mt('Edit').'</a> '."\n"; |
$jscall.'" >'.&mt('Edit').'</a> '."\n"; |
Line 3656 $form_end;
|
Line 4403 $form_end;
|
$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; |
|
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>'; |
|
my $link; |
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>'; |
$line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>'; |
} elsif ($url) { |
} elsif ($url) { |
$line.=&Apache::loncommon::modal_link($url.(($url=~/\?/)?'&':'?').'inhibitmenu=yes', |
if ($anchor ne '') { |
'<img src="'.$icon.'" alt="" class="LC_icon" />',600,500); |
if ($supplementalflag) { |
|
$anchor = '&anchor='.&HTML::Entities::encode($anchor,'"<>&'); |
|
} else { |
|
$anchor = '#'.&HTML::Entities::encode($anchor,'"<>&'); |
|
} |
|
} |
|
if ((!$supplementalflag) && ($nomodal) && ($hostname ne '')) { |
|
$link = 'http://'.$hostname.$url; |
|
} else { |
|
$link = $url; |
|
} |
|
$link = &js_escape($link.(($url=~/\?/)?'&':'?').'inhibitmenu=yes'. |
|
(($anchor ne '')?$anchor:'')); |
|
if ($nomodal) { |
|
$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>'; |
|
} else { |
|
$line.=&Apache::loncommon::modal_link($link, |
|
'<img src="'.$icon.'" alt="" class="LC_icon" />',600,500); |
|
} |
} else { |
} else { |
$line.='<img src="'.$icon.'" alt="" class="LC_icon" />'; |
$line.='<img src="'.$icon.'" alt="" class="LC_icon" />'; |
} |
} |
Line 3668 $form_end;
|
Line 4446 $form_end;
|
if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) { |
if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) { |
$line.='<a href="'.$url.'">'.$title.'</a>'; |
$line.='<a href="'.$url.'">'.$title.'</a>'; |
} elsif ($url) { |
} elsif ($url) { |
$line.=&Apache::loncommon::modal_link($url.(($url=~/\?/)?'&':'?').'inhibitmenu=yes', |
if ($nomodal) { |
$title,600,500); |
$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>'; |
|
} else { |
|
$line.=&Apache::loncommon::modal_link($link,$title,600,500); |
|
} |
|
} elsif (($hiddenfolder) || ($hiddenres)) { |
|
$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 (($allowed) && ($folder!~/^supplemental/)) { |
Line 3700 $form_end;
|
Line 4489 $form_end;
|
<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 /> $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 |
<br /> |
<br /> |
<form action="/adm/coursedocs" method="post" name="$formurlhidden"> |
<form action="/adm/coursedocs" method="post" name="$formurlhidden"> |
$form_param |
$form_param |
$form_common |
$form_common |
<label><input type="checkbox" name="encrypturl_$orderidx" id="encrypturl_$orderidx" onclick="checkForSubmit(this.form,'encrypturl','settings');" $enctext /> $lt{'ec'}</label> |
<label><input type="checkbox" name="encrypturl_$orderidx" id="encrypturl_$orderidx" onclick="checkForSubmit(this.form,'encrypturl','settings');" $enctext $disabled /> $lt{'ec'}</label> |
$form_end |
$form_end |
</td> |
</td> |
<td class="LC_docs_entry_parameter">$rand_pick_text<br /> |
<td class="LC_docs_entry_parameter">$rand_pick_text<br /> |
Line 3727 sub action_restrictions {
|
Line 4516 sub action_restrictions {
|
if ($url=~ m{^/res/.+\.(page|sequence)$}) { |
if ($url=~ m{^/res/.+\.(page|sequence)$}) { |
# no copy for published maps |
# no copy for published maps |
$denied{'copy'} = 1; |
$denied{'copy'} = 1; |
} elsif ($url=~m{^/res/lib/templates/}) { |
} elsif ($url=~m{^/res/lib/templates/([^/]+)\.problem$}) { |
$denied{'copy'} = 1; |
unless ($1 eq 'simpleproblem') { |
$denied{'cut'} = 1; |
$denied{'copy'} = 1; |
|
} |
|
$denied{'cut'} = 1; |
} elsif ($url eq "/uploaded/$cdom/$cnum/group_allfolders.sequence") { |
} elsif ($url eq "/uploaded/$cdom/$cnum/group_allfolders.sequence") { |
if ($folderpath =~ /^default&[^\&]+$/) { |
if ($folderpath =~ /^default&[^\&]+$/) { |
if ((ref($currgroups) eq 'HASH') && (keys(%{$currgroups}) > 0)) { |
if ((ref($currgroups) eq 'HASH') && (keys(%{$currgroups}) > 0)) { |
Line 3785 sub new_timebased_suffix {
|
Line 4576 sub new_timebased_suffix {
|
if ($type eq 'paste') { |
if ($type eq 'paste') { |
$prefix = $type; |
$prefix = $type; |
$namespace = 'courseeditor'; |
$namespace = 'courseeditor'; |
|
$idtype = 'addcode'; |
} elsif ($type eq 'map') { |
} elsif ($type eq 'map') { |
$prefix = 'docs'; |
$prefix = 'docs'; |
if ($area eq 'supplemental') { |
if ($area eq 'supplemental') { |
Line 3796 sub new_timebased_suffix {
|
Line 4588 sub new_timebased_suffix {
|
$prefix = $type; |
$prefix = $type; |
$namespace = 'templated'; |
$namespace = 'templated'; |
} |
} |
$idtype = 'concat'; |
|
my ($suffix,$freedlock,$error) = |
my ($suffix,$freedlock,$error) = |
&Apache::lonnet::get_timebased_id($prefix,'num',$namespace,$dom,$num); |
&Apache::lonnet::get_timebased_id($prefix,'num',$namespace,$dom,$num,$idtype); |
if (!$suffix) { |
if (!$suffix) { |
if ($type eq 'paste') { |
if ($type eq 'paste') { |
$errtext = &mt('Failed to acquire a unique timestamp-based suffix when adding to the paste buffer.'); |
$errtext = &mt('Failed to acquire a unique timestamp-based suffix when adding to the paste buffer.'); |
Line 3806 sub new_timebased_suffix {
|
Line 4597 sub new_timebased_suffix {
|
$errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new folder/page.'); |
$errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new folder/page.'); |
} elsif ($type eq 'smppg') { |
} elsif ($type eq 'smppg') { |
$errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new simple page.'); |
$errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new simple page.'); |
|
} elsif ($type eq 'exttool') { |
|
$errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new external tool.'); |
} else { |
} else { |
$errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new discussion board.'); |
$errtext = &mt('Failed to acquire a unique timestamp-based suffix for the new discussion board.'); |
} |
} |
Line 3818 sub new_timebased_suffix {
|
Line 4611 sub new_timebased_suffix {
|
'<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') { |
&mt('This will prevent use of the paste buffer until th next log-in.'); |
if ($freedlock eq 'nolock') { |
|
$locknotfreed = |
|
'<div class="LC_error">'. |
|
&mt('A lockfile was not released when you added content to the clipboard earlier in this session.').' '. |
|
|
|
&mt('As a result addition of items to the clipboard will be unavailable until your next log-in.'); |
|
} else { |
|
$locknotfreed .= |
|
&mt('This will prevent addition of items to the clipboard until your next log-in.'); |
|
} |
} elsif ($type eq 'map') { |
} elsif ($type eq 'map') { |
&mt('This will prevent creation of additional folders or composite pages in this course.'); |
$locknotfreed .= |
|
&mt('This will prevent creation of additional folders or composite pages in this course.'); |
} elsif ($type eq 'smppg') { |
} elsif ($type eq 'smppg') { |
$locknotfreed .= |
$locknotfreed .= |
&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 ($type eq 'exttool') { |
|
$locknotfreed .= |
|
&mt('This will prevent creation of additional external tools in this course.'); |
} else { |
} else { |
$locknotfreed .= |
$locknotfreed .= |
&mt('This will prevent creation of additional discussion boards in this course.'); |
&mt('This will prevent creation of additional discussion boards in this course.'); |
Line 3874 sub untiehash {
|
Line 4680 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 3889 sub checkonthis {
|
Line 4695 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 3926 sub checkonthis {
|
Line 4744 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 3940 sub checkonthis {
|
Line 4758 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 3992 sub list_symbs {
|
Line 4813 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::make_short_symbs($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 contentverifyform { |
|
my ($r) = @_; |
|
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('<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 { |
sub verifycontent { |
my ($r) = @_; |
my ($r,$checkstale) = @_; |
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')); |
Line 4015 sub verifycontent {
|
Line 4898 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 4023 sub verifycontent {
|
Line 4906 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 4031 sub devalidateversioncache {
|
Line 4913 sub devalidateversioncache {
|
} |
} |
|
|
sub checkversions { |
sub checkversions { |
my ($r) = @_; |
my ($r,$canedit) = @_; |
my $crstype = &Apache::loncommon::course_type(); |
my $crstype = &Apache::loncommon::course_type(); |
$r->print(&Apache::loncommon::start_page("Check $crstype Document Versions")); |
$r->print(&Apache::loncommon::start_page("Check $crstype Resource Versions")); |
$r->print(&Apache::lonhtmlcommon::breadcrumbs("Check $crstype Document Versions")); |
$r->print(&Apache::lonhtmlcommon::breadcrumbs("Check $crstype Resource Versions")); |
$r->print(&startContentScreen('tools')); |
$r->print(&startContentScreen('tools')); |
|
|
my $header=''; |
my $header=''; |
Line 4052 sub checkversions {
|
Line 4934 sub checkversions {
|
|
|
$hashtied=0; |
$hashtied=0; |
&tiehash(); |
&tiehash(); |
my %newsetversions=(); |
if ($canedit) { |
if ($env{'form.setmostrecent'}) { |
my %newsetversions=(); |
$haschanged=1; |
if ($env{'form.setmostrecent'}) { |
foreach my $key (keys(%hash)) { |
$haschanged=1; |
if ($key=~/^ids\_(\/res\/.+)$/) { |
foreach my $key (keys(%hash)) { |
$newsetversions{$1}='mostrecent'; |
if ($key=~/^ids\_(\/res\/.+)$/) { |
&devalidateversioncache($1); |
$newsetversions{$1}='mostrecent'; |
|
&devalidateversioncache($1); |
|
} |
} |
} |
} |
} elsif ($env{'form.setcurrent'}) { |
} elsif ($env{'form.setcurrent'}) { |
$haschanged=1; |
$haschanged=1; |
foreach my $key (keys(%hash)) { |
foreach my $key (keys(%hash)) { |
if ($key=~/^ids\_(\/res\/.+)$/) { |
if ($key=~/^ids\_(\/res\/.+)$/) { |
my $getvers=&Apache::lonnet::getversion($1); |
my $getvers=&Apache::lonnet::getversion($1); |
if ($getvers>0) { |
if ($getvers>0) { |
$newsetversions{$1}=$getvers; |
$newsetversions{$1}=$getvers; |
&devalidateversioncache($1); |
&devalidateversioncache($1); |
} |
} |
} |
} |
} |
} |
} elsif ($env{'form.setversions'}) { |
} elsif ($env{'form.setversions'}) { |
$haschanged=1; |
$haschanged=1; |
foreach my $key (keys(%env)) { |
foreach my $key (keys(%env)) { |
if ($key=~/^form\.set_version_(.+)$/) { |
if ($key=~/^form\.set_version_(.+)$/) { |
my $src=$1; |
my $src=$1; |
if (($env{$key}) && ($env{$key} ne $setversions{$src})) { |
if (($env{$key}) && ($env{$key} ne $setversions{$src})) { |
$newsetversions{$src}=$env{$key}; |
$newsetversions{$src}=$env{$key}; |
&devalidateversioncache($src); |
&devalidateversioncache($src); |
} |
} |
} |
} |
} |
} |
} |
} |
if ($haschanged) { |
if ($haschanged) { |
if (&Apache::lonnet::put('resourceversions',\%newsetversions, |
if (&Apache::lonnet::put('resourceversions',\%newsetversions, |
$env{'course.'.$env{'request.course.id'}.'.domain'}, |
$env{'course.'.$env{'request.course.id'}.'.domain'}, |
$env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') { |
$env{'course.'.$env{'request.course.id'}.'.num'}) eq 'ok') { |
$r->print(&Apache::loncommon::confirmwrapper( |
$r->print(&Apache::loncommon::confirmwrapper( |
&Apache::lonhtmlcommon::confirm_success(&mt('Your Version Settings have been Saved')))); |
&Apache::lonhtmlcommon::confirm_success(&mt('Your Version Settings have been Saved')))); |
} else { |
} else { |
$r->print(&Apache::loncommon::confirmwrapper( |
$r->print(&Apache::loncommon::confirmwrapper( |
&Apache::lonhtmlcommon::confirm_success(&mt('An Error Occured while Attempting to Save your Version Settings'),1))); |
&Apache::lonhtmlcommon::confirm_success(&mt('An Error Occured while Attempting to Save your Version Settings'),1))); |
} |
} |
&mark_hash_old(); |
&mark_hash_old(); |
} |
|
&changewarning($r,''); |
} |
} |
&changewarning($r,''); |
|
if ($env{'form.timerange'} eq 'all') { |
if ($env{'form.timerange'} eq 'all') { |
# show all documents |
# show all documents |
$header=&mt('All content in '.$crstype); |
$header=&mt('All content in '.$crstype); |
Line 4163 sub checkversions {
|
Line 5047 sub checkversions {
|
'save' => 'Save changes', |
'save' => 'Save changes', |
'vers' => 'Version choice(s) for specific resources', |
'vers' => 'Version choice(s) for specific resources', |
'act' => 'Actions'); |
'act' => 'Actions'); |
|
my ($disabled,$readonly); |
|
unless ($canedit) { |
|
$disabled = 'disabled="disabled"'; |
|
$readonly = 1; |
|
} |
$r->print(<<ENDHEADERS); |
$r->print(<<ENDHEADERS); |
<h4 class="LC_info">$header</h4> |
<h4 class="LC_info">$header</h4> |
<form action="/adm/coursedocs" method="post"> |
<form action="/adm/coursedocs" method="post"> |
Line 4183 sub checkversions {
|
Line 5072 sub checkversions {
|
<div class="LC_left_float"> |
<div class="LC_left_float"> |
<fieldset> |
<fieldset> |
<legend>$lt{'act'}</legend> |
<legend>$lt{'act'}</legend> |
$lt{'sm'}: <input type="submit" name="setmostrecent" value="Go" /><br /> |
$lt{'sm'}: <input type="submit" name="setmostrecent" value="Go" $disabled /><br /> |
$lt{'sc'}: <input type="submit" name="setcurrent" value="Go" /> |
$lt{'sc'}: <input type="submit" name="setcurrent" value="Go" $disabled /> |
</fieldset> |
</fieldset> |
</div> |
</div> |
<br clear="all" /> |
<br clear="all" /> |
<hr /> |
<hr /> |
<h4>$lt{'vers'}</h4> |
<h4>$lt{'vers'}</h4> |
<input type="submit" name="setversions" value="$lt{'save'}" /> |
|
ENDHEADERS |
ENDHEADERS |
#number of columns for version history |
#number of columns for version history |
|
my %changedbytime; |
|
foreach my $key (keys(%changes)) { |
|
#excludes not versionable problems from resource version history: |
|
next if ($key =~ /^\/res\/lib\/templates/); |
|
my $chg; |
|
if ($env{'form.timerange'} eq 'all') { |
|
my ($root,$extension)=($key=~/^(.*)\.(\w+)$/); |
|
$chg = &Apache::lonnet::metadata($root.'.'.$extension,'lastrevisiondate'); |
|
} else { |
|
$chg = $changes{$key}; |
|
next if ($chg < $starttime); |
|
} |
|
push(@{$changedbytime{$chg}},$key); |
|
} |
|
if (keys(%changedbytime) == 0) { |
|
&untiehash(); |
|
$r->print(&mt('No content changes in imported content in specified time frame'). |
|
&endContentScreen()); |
|
return; |
|
} |
$r->print( |
$r->print( |
|
'<input type="submit" name="setversions" value="'.$lt{'save'}.'"'.$disabled.' />'. |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table_header_row(). |
&Apache::loncommon::start_data_table_header_row(). |
'<th>'.&mt('Resources').'</th>'. |
'<th>'.&mt('Resources').'</th>'. |
Line 4203 ENDHEADERS
|
Line 5112 ENDHEADERS
|
'<th>'.&mt('History').'</th>'. |
'<th>'.&mt('History').'</th>'. |
&Apache::loncommon::end_data_table_header_row() |
&Apache::loncommon::end_data_table_header_row() |
); |
); |
foreach my $key (sort(keys(%changes))) { |
foreach my $chg (sort {$b <=> $a } keys(%changedbytime)) { |
#excludes not versionable problems from resource version history: |
foreach my $key (sort(@{$changedbytime{$chg}})) { |
next unless ($changes{$key}>$starttime && $key !~ /^\/res\/lib\/templates/); |
my ($root,$extension)=($key=~/^(.*)\.(\w+)$/); |
my ($root,$extension)=($key=~/^(.*)\.(\w+)$/); |
my $currentversion=&Apache::lonnet::getversion($key); |
my $currentversion=&Apache::lonnet::getversion($key); |
if ($currentversion<0) { |
if ($currentversion<0) { |
$currentversion='<span class="LC_error">'.&mt('Could not be determined.').'</span>'; |
$currentversion='<span class="LC_error">'.&mt('Could not be determined.').'</span>'; |
} |
} |
my $linkurl=&Apache::lonnet::clutter($key); |
my $linkurl=&Apache::lonnet::clutter($key); |
$r->print( |
$r->print( |
&Apache::loncommon::start_data_table_row(). |
&Apache::loncommon::start_data_table_row(). |
'<td><b>'.&Apache::lonnet::gettitle($linkurl).'</b><br />'. |
'<td><b>'.&Apache::lonnet::gettitle($linkurl).'</b><br />'. |
'<a href="'.$linkurl.'" target="cat">'.$linkurl.'</a></td>'. |
'<a href="'.$linkurl.'" target="cat">'.$linkurl.'</a></td>'. |
'<td align="right">'.$currentversion.'<span class="LC_fontsize_medium"><br />('. |
'<td align="right">'.$currentversion.'<span class="LC_fontsize_medium"><br />('. |
&Apache::lonlocal::locallocaltime($chg).')</span></td>'. |
&Apache::lonlocal::locallocaltime(&Apache::lonnet::metadata($root.'.'.$extension,'lastrevisiondate')).')</span></td>'. |
'<td align="right">' |
'<td align="right">' |
); |
); |
# Used in course |
# Used in course |
my $usedversion=$hash{'version_'.$linkurl}; |
my $usedversion=$hash{'version_'.$linkurl}; |
if (($usedversion) && ($usedversion ne 'mostrecent')) { |
if (($usedversion) && ($usedversion ne 'mostrecent')) { |
|
if ($usedversion != $currentversion) { |
if ($usedversion != $currentversion) { |
$r->print('<span class="LC_warning">'.$usedversion.'</span>'); |
$r->print('<span class="LC_warning">'.$usedversion.'</span>'); |
} else { |
} else { |
Line 4231 ENDHEADERS
|
Line 5139 ENDHEADERS
|
} else { |
} else { |
$r->print($currentversion); |
$r->print($currentversion); |
} |
} |
$r->print('</td><td title="'.$lt{'vu'}.'">'); |
$r->print('</td><td title="'.$lt{'vu'}.'">'); |
# Set version |
# Set version |
$r->print(&Apache::loncommon::select_form( |
$r->print(&Apache::loncommon::select_form( |
$setversions{$linkurl}, |
$setversions{$linkurl}, |
'set_version_'.$linkurl, |
'set_version_'.$linkurl, |
{'select_form_order' => ['',1..$currentversion,'mostrecent'], |
{'select_form_order' => ['',1..$currentversion,'mostrecent'], |
'' => '', |
'' => '', |
'mostrecent' => &mt('most recent'), |
'mostrecent' => &mt('most recent'), |
map {$_,$_} (1..$currentversion)})); |
map {$_,$_} (1..$currentversion)},'',$readonly)); |
my $lastold=1; |
my $lastold=1; |
for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) { |
for (my $prevvers=1;$prevvers<$currentversion;$prevvers++) { |
my $url=$root.'.'.$prevvers.'.'.$extension; |
my $url=$root.'.'.$prevvers.'.'.$extension; |
if (&Apache::lonnet::metadata($url,'lastrevisiondate')<$starttime) { |
if (&Apache::lonnet::metadata($url,'lastrevisiondate')<$starttime) { |
$lastold=$prevvers; |
$lastold=$prevvers; |
} |
} |
} |
} |
$r->print('</td>'); |
$r->print('</td>'); |
# List all available versions |
# List all available versions |
$r->print('<td valign="top"><span class="LC_fontsize_medium">'); |
$r->print('<td valign="top"><span class="LC_fontsize_medium">'); |
for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) { |
for (my $prevvers=$lastold;$prevvers<$currentversion;$prevvers++) { |
my $url=$root.'.'.$prevvers.'.'.$extension; |
my $url=$root.'.'.$prevvers.'.'.$extension; |
$r->print( |
|
'<span class="LC_nobreak">' |
|
.'<a href="'.&Apache::lonnet::clutter($url).'">' |
|
.&mt('Version [_1]',$prevvers).'</a>' |
|
.' ('.&Apache::lonlocal::locallocaltime( |
|
&Apache::lonnet::metadata($url,'lastrevisiondate')) |
|
.')'); |
|
if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') { |
|
$r->print( |
$r->print( |
' <a href="/adm/diff?filename='. |
'<span class="LC_nobreak">' |
&Apache::lonnet::clutter($root.'.'.$extension). |
.'<a href="'.&Apache::lonnet::clutter($url).'">' |
&HTML::Entities::encode('&versionone='.$prevvers,'"<>&'). |
.&mt('Version [_1]',$prevvers).'</a>' |
'" target="diffs">'.&mt('Diffs').'</a>'); |
.' ('.&Apache::lonlocal::locallocaltime( |
|
&Apache::lonnet::metadata($url,'lastrevisiondate')) |
|
.')'); |
|
if (&Apache::loncommon::fileembstyle($extension) eq 'ssi') { |
|
$r->print( |
|
' <a href="/adm/diff?filename='. |
|
&Apache::lonnet::clutter($root.'.'.$extension). |
|
&HTML::Entities::encode('&versionone='.$prevvers,'"<>&'). |
|
'" target="diffs">'.&mt('Diffs').'</a>'); |
|
} |
|
$r->print('</span><br />'); |
} |
} |
$r->print('</span><br />'); |
$r->print('</span></td>'.&Apache::loncommon::end_data_table_row()); |
} |
} |
$r->print('</span></td>'.&Apache::loncommon::end_data_table_row()); |
|
} |
} |
$r->print( |
$r->print( |
&Apache::loncommon::end_data_table(). |
&Apache::loncommon::end_data_table(). |
'<input type="submit" name="setversions" value="'.$lt{'save'}.'" />'. |
'<input type="submit" name="setversions" value="'.$lt{'save'}.'"'.$disabled.' />'. |
'</form>' |
'</form>' |
); |
); |
|
|
&untiehash(); |
&untiehash(); |
$r->print(&endContentScreen()); |
$r->print(&endContentScreen()); |
|
return; |
} |
} |
|
|
sub mark_hash_old { |
sub mark_hash_old { |
Line 4332 $help{'Caching'}.'</p></form>'."\n\n");
|
Line 5242 $help{'Caching'}.'</p></form>'."\n\n");
|
|
|
|
|
sub init_breadcrumbs { |
sub init_breadcrumbs { |
my ($form,$text)=@_; |
my ($form,$text,$help)=@_; |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs?tools=1", |
&Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs?tools=1", |
text=>&Apache::loncommon::course_type().' Editor', |
text=>&Apache::loncommon::course_type().' Editor', |
faq=>273, |
faq=>273, |
bug=>'Instructor Interface', |
bug=>'Instructor Interface', |
help => 'Docs_Adding_Course_Doc'}); |
help => $help}); |
&Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs?".$form.'=1', |
&Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs?".$form.'=1', |
text=>$text, |
text=>$text, |
faq=>273, |
faq=>273, |
Line 4374 sub startContentScreen {
|
Line 5284 sub startContentScreen {
|
if (($mode eq 'navmaps') || ($mode eq 'supplemental')) { |
if (($mode eq 'navmaps') || ($mode eq 'supplemental')) { |
$output .= '<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b> '.&mt('Content Overview').' </b></a></li>'."\n"; |
$output .= '<li'.(($mode eq 'navmaps')?' class="active"':'').'><a href="/adm/navmaps"><b> '.&mt('Content Overview').' </b></a></li>'."\n"; |
$output .= '<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b> '.&mt('Content Search').' </b></a></li>'."\n"; |
$output .= '<li'.(($mode eq 'coursesearch')?' class="active"':'').'><a href="/adm/searchcourse"><b> '.&mt('Content Search').' </b></a></li>'."\n"; |
|
$output .= '<li'.(($mode eq 'courseindex')?' class="active"':'').'><a href="/adm/indexcourse"><b> '.&mt('Content Index').' </b></a></li>'."\n"; |
$output .= '<li '.(($mode eq 'suppdocs')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>'; |
$output .= '<li '.(($mode eq 'suppdocs')?' class="active"':'').'><a href="/adm/supplemental"><b>'.&mt('Supplemental Content').'</b></a></li>'; |
} else { |
} else { |
$output .= '<li '.(($mode eq 'docs')?' class="active"':'').' id="tabbededitor"><a href="/adm/coursedocs?forcestandard=1"><b> '.&mt('Main Content Editor').' </b></a></li>'."\n"; |
$output .= '<li '.(($mode eq 'docs')?' class="active"':'').' id="tabbededitor"><a href="/adm/coursedocs?forcestandard=1"><b> '.&mt('Main Content Editor').' </b></a></li>'."\n"; |
Line 4411 sub handler {
|
Line 5322 sub handler {
|
my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'}; |
my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'}; |
my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'}; |
|
|
|
# get docroot |
|
my $londocroot = $r->dir_config('lonDocRoot'); |
|
|
# graphics settings |
# graphics settings |
$iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL').'/'); |
$iconpath = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL').'/'); |
|
|
# |
# |
# --------------------------------------------- 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', |
'Importing_IMS_Course','Uploading_From_Harddrive', |
'Check_Resource_Versions','Verify_Content', |
'Course_Roster','Web_Page','Dropbox','Simple_Problem') { |
'Course_Roster','Web_Page','Dropbox') { |
|
$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 4431 sub handler {
|
Line 5344 sub handler {
|
'Docs_About_Syllabus,Docs_Editing_Templated_Pages'); |
'Docs_About_Syllabus,Docs_Editing_Templated_Pages'); |
$help{'Simple Page'} = &Apache::loncommon::help_open_topic( |
$help{'Simple Page'} = &Apache::loncommon::help_open_topic( |
'Docs_About_Simple_Page,Docs_Editing_Templated_Pages'); |
'Docs_About_Simple_Page,Docs_Editing_Templated_Pages'); |
$help{'Simple Problem'} = &Apache::loncommon::help_open_topic( |
|
'Option_Response_Simple'); |
|
$help{'Bulletin Board'} = &Apache::loncommon::help_open_topic( |
$help{'Bulletin Board'} = &Apache::loncommon::help_open_topic( |
'Docs_About_Bulletin_Board,Docs_Editing_Templated_Pages'); |
'Docs_About_Bulletin_Board,Docs_Editing_Templated_Pages'); |
$help{'My Personal Information Page'} = &Apache::loncommon::help_open_topic( |
$help{'My Personal Information Page'} = &Apache::loncommon::help_open_topic( |
Line 4440 sub handler {
|
Line 5351 sub handler {
|
$help{'Group Portfolio'} = &Apache::loncommon::help_open_topic('Docs_About_Group_Files'); |
$help{'Group Portfolio'} = &Apache::loncommon::help_open_topic('Docs_About_Group_Files'); |
$help{'Caching'} = &Apache::loncommon::help_open_topic('Caching'); |
$help{'Caching'} = &Apache::loncommon::help_open_topic('Caching'); |
|
|
my $allowed; |
my ($allowed,$canedit,$canview,$noendpage,$disabled); |
# 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. |
# does this user have privileges to modify content. |
$allowed = &Apache::lonnet::allowed('mdc',$env{'request.course.id'}); |
if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { |
|
$allowed = 1; |
|
$canedit = 1; |
|
$canview = 1; |
|
} elsif (&Apache::lonnet::allowed('cev',$env{'request.course.id'})) { |
|
$allowed = 1; |
|
$canview = 1; |
|
} |
|
} |
|
unless ($canedit) { |
|
$disabled = ' disabled="disabled"'; |
|
} |
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['inhibitmenu']); |
|
if ($env{'form.inhibitmenu'}) { |
|
unless ($env{'form.inhibitmenu'} eq 'yes') { |
|
delete($env{'form.inhibitmenu'}); |
|
} |
} |
} |
|
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['chooseserver', |
if ($allowed && $env{'form.verify'}) { |
'inhibitmenu']); |
&init_breadcrumbs('verify','Verify Content','Docs_Verify_Content'); |
if ($allowed && $env{'form.chooseserver'}) { |
if (!$canedit) { |
&choose_dump_server($r); |
&verifycontent($r); |
return OK; |
} elsif (($env{'form.checkstale'} ne '') && ($env{'form.checkstale'} =~ /^\d$/)) { |
} elsif ($allowed && $env{'form.verify'}) { |
&Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs?tools=1&verify=1&checkstale=$env{'form.checkstale'}", |
&init_breadcrumbs('verify','Verify Content'); |
text=>'Results', |
&verifycontent($r); |
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'}; |
if ($folder eq '') { |
if ($folder eq '') { |
$folder='default'; |
$folder='default'; |
} |
} |
&docs_change_log($r,$coursenum,$coursedom,$folder,$allowed,$crstype,$iconpath); |
&docs_change_log($r,$coursenum,$coursedom,$folder,$allowed,$crstype,$iconpath,$canedit); |
} elsif ($allowed && $env{'form.versions'}) { |
} elsif ($allowed && $env{'form.versions'}) { |
&init_breadcrumbs('versions','Check/Set Resource Versions'); |
&init_breadcrumbs('versions','Check/Set Resource Versions','Docs_Check_Resource_Versions'); |
&checkversions($r); |
&checkversions($r,$canedit); |
} elsif ($allowed && $env{'form.dumpcourse'}) { |
} elsif ($canedit && $env{'form.dumpcourse'}) { |
&init_breadcrumbs('dumpcourse','Copy '.&Apache::loncommon::course_type().' Content to Authoring Space'); |
&init_breadcrumbs('dumpcourse','Copy '.&Apache::loncommon::course_type().' Content to Authoring Space'); |
&dumpcourse($r); |
&dumpcourse($r); |
} elsif ($allowed && $env{'form.exportcourse'}) { |
} elsif ($canedit && $env{'form.exportcourse'}) { |
&init_breadcrumbs('exportcourse','IMS Export'); |
&init_breadcrumbs('exportcourse','IMS Export'); |
&Apache::imsexport::exportcourse($r); |
&Apache::imsexport::exportcourse($r); |
} else { |
} else { |
|
if ($canedit && $env{'form.authorrole'}) { |
|
$noendpage = 1; |
|
my ($redirect,$error) = &makenewproblem($r,$coursedom,$coursenum); |
|
if ($redirect) { |
|
if (($env{'form.newresourceadd'}) && ($env{'form.folderpath'})) { |
|
my $container = 'sequence'; |
|
my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain, |
|
$is_random_order,$container) = |
|
&Apache::lonhtmlcommon::docs_breadcrumbs($allowed,$crstype,1); |
|
my (@folders)=split('&',$env{'form.folderpath'}); |
|
$env{'form.foldername'}=&unescape(pop(@folders)); |
|
my $folder=pop(@folders); |
|
my ($errtext,$fatal) = &mapread($coursenum,$coursedom, |
|
$folder.'.'.$container); |
|
my $warning; |
|
if ($fatal) { |
|
if ($container eq 'page') { |
|
$warning = &mt('An error occurred retrieving the contents of the current page.'); |
|
} else { |
|
$warning = &mt('An error occurred retrieving the contents of the current folder.'); |
|
} |
|
} else { |
|
my $url = $redirect; |
|
my $srcfile = $londocroot.$url; |
|
$url =~ s{^/priv/}{/res/}; |
|
my $targetfile = $londocroot.$url; |
|
my $nokeyref = &Apache::lonpublisher::getnokey($r->dir_config('lonIncludes')); |
|
my $output = &Apache::lonpublisher::batchpublish($r,$srcfile,$targetfile,$nokeyref,1); |
|
$env{'form.folder'} = $folder; |
|
&snapshotbefore(); |
|
my $title = &LONCAPA::map::qtunescape($env{'form.newresourcetitle'}); |
|
my $ext = 'false'; |
|
my $newidx = &LONCAPA::map::getresidx(&LONCAPA::map::qtunescape($url)); |
|
$LONCAPA::map::resources[$newidx]=$title.':'.&LONCAPA::map::qtunescape($url). |
|
':'.$ext.':normal:res'; |
|
push(@LONCAPA::map::order,$newidx); |
|
&LONCAPA::map::storeparameter($newidx,'parameter_hiddenresource','yes', |
|
'string_yesno'); |
|
&remember_parms($newidx,'hiddenresource','set','yes'); |
|
($errtext,$fatal) = |
|
&storemap($coursenum, $coursedom, $folder.'.'.$container,1); |
|
&log_differences($plain); |
|
&mark_hash_old(); |
|
$r->internal_redirect($redirect); |
|
return OK; |
|
} |
|
} |
|
} |
|
} |
# |
# |
# Done catching special calls |
# Done catching special calls |
# The whole rest is for course and supplemental documents and utilities menu |
# The whole rest is for course and supplemental documents and utilities menu |
Line 4485 sub handler {
|
Line 5469 sub handler {
|
'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 4507 sub handler {
|
Line 5511 sub handler {
|
my $toolsflag=0; |
my $toolsflag=0; |
if ($env{'form.tools'}) { $toolsflag=1; } |
if ($env{'form.tools'}) { $toolsflag=1; } |
|
|
|
if ($env{'form.folderpath'} ne '') { |
|
my @items = split(/\&/,$env{'form.folderpath'}); |
|
my $badpath; |
|
for (my $i=0; $i<@items; $i++) { |
|
my $odd = $i%2; |
|
if (($odd) && (!$supplementalflag) && ($items[$i] !~ /^[^:]*:(|\d+):(|1):(|1):(|1):(|1)$/)) { |
|
$badpath = 1; |
|
} elsif ((!$odd) && ($items[$i] !~ /^(default|supplemental)(|_\d+)$/)) { |
|
$badpath = 1; |
|
} |
|
last if ($badpath); |
|
} |
|
if ($badpath) { |
|
delete($env{'form.folderpath'}); |
|
} |
|
} |
|
|
|
if ($env{'form.supppath'} ne '') { |
|
my @items = split(/\&/,$env{'form.supppath'}); |
|
my $badpath; |
|
for (my $i=0; $i<@items; $i++) { |
|
my $odd = $i%2; |
|
if ((!$odd) && ($items[$i] !~ /^supplemental(|_\d+)$/)) { |
|
$badpath = 1; |
|
} |
|
last if ($badpath); |
|
} |
|
if ($badpath) { |
|
delete($env{'form.supppath'}); |
|
} |
|
} |
|
|
my $script=''; |
my $script=''; |
my $showdoc=0; |
my $showdoc=0; |
my $addentries = {}; |
my $addentries = {}; |
my $container; |
my $container; |
my $containertag; |
my $containertag; |
my $pathitem; |
my $pathitem; |
|
my %ltitools; |
|
my $hiddentop; |
|
my $navmap; |
|
my $filterFunc = sub { my $res = shift; return (!$res->randomout() && !$res->is_map()) }; |
|
|
# Do we directly jump somewhere? |
# Do we directly jump somewhere? |
|
|
if (($env{'form.command'} eq 'direct') || ($env{'form.command'} eq 'directnav')) { |
if (($env{'form.command'} eq 'direct') || ($env{'form.command'} eq 'directnav')) { |
if ($env{'form.symb'} ne '') { |
if ($env{'form.symb'} ne '') { |
$env{'form.folderpath'}= |
$env{'form.folderpath'}= |
&Apache::loncommon::symb_to_docspath($env{'form.symb'}); |
&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 '') { |
Line 4528 sub handler {
|
Line 5567 sub handler {
|
$env{'form.command'}.'_'.$env{'form.supppath'}}); |
$env{'form.command'}.'_'.$env{'form.supppath'}}); |
} |
} |
} elsif ($env{'form.command'} eq 'editdocs') { |
} elsif ($env{'form.command'} eq 'editdocs') { |
$env{'form.folderpath'} = 'default&'. |
$env{'form.folderpath'} = &default_folderpath($coursenum,$coursedom,\$navmap); |
&escape(&mt('Main Content').':::::'); |
|
&Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => $env{'form.command'}}); |
&Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => $env{'form.command'}}); |
} elsif ($env{'form.command'} eq 'editsupp') { |
} elsif ($env{'form.command'} eq 'editsupp') { |
$env{'form.folderpath'} = 'supplemental&'. |
$env{'form.folderpath'} = &supplemental_base(); |
&escape('Supplemental Content'); |
|
&Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => '/adm/supplemental'}); |
&Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => '/adm/supplemental'}); |
} elsif ($env{'form.command'} eq 'contents') { |
} elsif ($env{'form.command'} eq 'contents') { |
&Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => '/adm/navmaps'}); |
&Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => '/adm/navmaps'}); |
Line 4552 sub handler {
|
Line 5589 sub handler {
|
if ((!$env{'form.folderpath'}) && $allowed) { |
if ((!$env{'form.folderpath'}) && $allowed) { |
&Apache::loncommon::restore_course_settings($stored_folderpath, |
&Apache::loncommon::restore_course_settings($stored_folderpath, |
{'folderpath' => 'scalar'}); |
{'folderpath' => 'scalar'}); |
unless (&unescape($env{'form.folderpath'}) =~ m{^(default|supplemental)&}) { |
|
|
if (&unescape($env{'form.folderpath'}) =~ m{^(default|supplemental)&}) { |
|
if ($supplementalflag) { |
|
undef($env{'form.folderpath'}) if ($1 eq 'default'); |
|
} else { |
|
undef($env{'form.folderpath'}) if ($1 eq 'supplemental'); |
|
} |
|
} else { |
undef($env{'form.folderpath'}); |
undef($env{'form.folderpath'}); |
} |
} |
} |
} |
Line 4569 sub handler {
|
Line 5613 sub handler {
|
.'&'. |
.'&'. |
$env{'form.folderpath'}; |
$env{'form.folderpath'}; |
} |
} |
|
# If allowed and user's role is not advanced check folderpath is not hidden |
|
if (($allowed) && (!$env{'request.role.adv'}) && |
|
($env{'form.folderpath'} ne '') && (!$supplementalflag)) { |
|
my $folderurl; |
|
my @pathitems = split(/\&/,$env{'form.folderpath'}); |
|
my $folder = $pathitems[-2]; |
|
if ($folder eq '') { |
|
undef($env{'form.folderpath'}); |
|
} else { |
|
$folderurl = "uploaded/$coursedom/$coursenum/$folder"; |
|
if ((split(/\:/,$pathitems[-1]))[4]) { |
|
$folderurl .= '.page'; |
|
} else { |
|
$folderurl .= '.sequence'; |
|
} |
|
unless (ref($navmap)) { |
|
$navmap = Apache::lonnavmaps::navmap->new(); |
|
} |
|
if (ref($navmap)) { |
|
if (lc($navmap->get_mapparam(undef,$folderurl,"0.hiddenresource")) eq 'yes') { |
|
my @resources = $navmap->retrieveResources($folderurl,$filterFunc,1,1); |
|
unless (@resources) { |
|
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) { |
$env{'form.folderpath'}=&supplemental_base(); |
$env{'form.folderpath'}=&supplemental_base(); |
} else { |
} elsif ($allowed) { |
$env{'form.folderpath'}='default&'.&escape(&mt('Main Content'). |
($env{'form.folderpath'},$hiddentop) = &default_folderpath($coursenum,$coursedom,\$navmap); |
':::::'); |
|
} |
} |
} |
} |
|
|
# Store this |
# Store this |
unless ($toolsflag) { |
unless ($toolsflag) { |
if ($allowed) { |
if (($allowed) && ($env{'form.folderpath'} ne '')) { |
&Apache::loncommon::store_course_settings($stored_folderpath, |
&Apache::loncommon::store_course_settings($stored_folderpath, |
{'folderpath' => 'scalar'}); |
{'folderpath' => 'scalar'}); |
} |
} |
Line 4599 sub handler {
|
Line 5672 sub handler {
|
} else { |
} else { |
if ($env{'form.folder'} eq '' || |
if ($env{'form.folder'} eq '' || |
$env{'form.folder'} eq 'supplemental') { |
$env{'form.folder'} eq 'supplemental') { |
$folderpath='default&'. |
if ($env{'form.folder'} eq 'supplemental') { |
&escape(&mt('Main Content').':::::'); |
$folderpath=&supplemental_base(); |
|
} elsif (!$hiddentop) { |
|
$folderpath='default&'. |
|
&escape(&mt('Main Content').':::::'); |
|
} |
} |
} |
} |
} |
$containertag = '<input type="hidden" name="folderpath" value="" />'; |
$containertag = '<input type="hidden" name="folderpath" value="" />'; |
Line 4611 sub handler {
|
Line 5688 sub handler {
|
if ($showdoc) { # got called in sequence from course |
if ($showdoc) { # got called in sequence from course |
$allowed=0; |
$allowed=0; |
} else { |
} else { |
if ($allowed) { |
if ($canedit) { |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']); |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']); |
$script=&Apache::lonratedt::editscript('simple'); |
$script=&Apache::lonratedt::editscript('simple'); |
} |
} |
Line 4650 sub handler {
|
Line 5727 sub handler {
|
} |
} |
} |
} |
my $tabidstr = join("','",@tabids); |
my $tabidstr = join("','",@tabids); |
$script .= &editing_js($udom,$uname,$supplementalflag). |
%ltitools = &Apache::lonnet::get_domain_lti($coursedom,'consumer'); |
|
my $posslti = keys(%ltitools); |
|
my $hostname = $r->hostname(); |
|
$script .= &editing_js($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti, |
|
$londocroot,$canedit,$hostname,\$navmap). |
&history_tab_js(). |
&history_tab_js(). |
&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(); |
&Apache::lonextresedit::extedit_javascript(\%ltitools); |
$addentries = { |
$addentries = { |
onload => "javascript:resize_scrollbox('contentscroll','1','1');", |
onload => "javascript:resize_scrollbox('contentscroll','1','1');", |
}; |
}; |
Line 4670 sub handler {
|
Line 5751 sub handler {
|
.'// <![CDATA['."\n" |
.'// <![CDATA['."\n" |
.$script."\n" |
.$script."\n" |
.'// ]]>'."\n" |
.'// ]]>'."\n" |
.'</script>'."\n"; |
.'</script>'."\n" |
|
.'<script type="text/javascript" |
|
src="/res/adm/includes/file_upload.js"></script>'."\n"; |
|
|
# Breadcrumbs |
# Breadcrumbs |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
&Apache::lonhtmlcommon::clear_breadcrumbs(); |
Line 4678 sub handler {
|
Line 5761 sub handler {
|
if ($showdoc) { |
if ($showdoc) { |
$r->print(&Apache::loncommon::start_page("$crstype documents",undef, |
$r->print(&Apache::loncommon::start_page("$crstype documents",undef, |
{'force_register' => $showdoc,})); |
{'force_register' => $showdoc,})); |
|
} elsif ($toolsflag) { |
|
my ($breadtext,$breadtitle); |
|
$breadtext = "$crstype Editor"; |
|
if ($canedit) { |
|
$breadtitle = 'Editing '.$crstype.' Contents'; |
|
} else { |
|
$breadtext .= ' (View-only mode)'; |
|
$breadtitle = 'Viewing '.$crstype.' Contents'; |
|
} |
|
&Apache::lonhtmlcommon::add_breadcrumb({ |
|
href=>"/adm/coursedocs",text=>$breadtext}); |
|
$r->print(&Apache::loncommon::start_page("$crstype Contents", $script) |
|
.&Apache::loncommon::help_open_menu('','',273,'RAT') |
|
.&Apache::lonhtmlcommon::breadcrumbs( |
|
$breadtitle) |
|
); |
} elsif ($r->uri eq '/adm/supplemental') { |
} elsif ($r->uri eq '/adm/supplemental') { |
my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype); |
my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype); |
$r->print(&Apache::loncommon::start_page("Supplemental $crstype Content",undef, |
$r->print(&Apache::loncommon::start_page("Supplemental $crstype Content",undef, |
{'bread_crumbs' => $brcrum,})); |
{'bread_crumbs' => $brcrum,})); |
} else { |
} else { |
|
my ($breadtext,$breadtitle,$helpitem); |
|
$breadtext = "$crstype Editor"; |
|
if ($canedit) { |
|
$breadtitle = 'Editing '.$crstype.' Contents'; |
|
$helpitem = 'Docs_Adding_Course_Doc'; |
|
} else { |
|
$breadtext .= ' (View-only mode)'; |
|
$breadtitle = 'Viewing '.$crstype.' Contents'; |
|
$helpitem = 'Docs_Viewing_Course_Doc'; |
|
} |
&Apache::lonhtmlcommon::add_breadcrumb({ |
&Apache::lonhtmlcommon::add_breadcrumb({ |
href=>"/adm/coursedocs",text=>"$crstype Contents"}); |
href=>"/adm/coursedocs",text=>$breadtext}); |
$r->print(&Apache::loncommon::start_page("$crstype Contents", $script, |
$r->print(&Apache::loncommon::start_page("$crstype Contents", $script, |
{'add_entries' => $addentries} |
{'add_entries' => $addentries} |
) |
) |
.&Apache::loncommon::help_open_menu('','',273,'RAT') |
.&Apache::loncommon::help_open_menu('','',273,'RAT') |
.&Apache::lonhtmlcommon::breadcrumbs( |
.&Apache::lonhtmlcommon::breadcrumbs( |
'Editing '.$crstype.' Contents', |
$breadtitle, |
'Docs_Adding_Course_Doc') |
$helpitem) |
); |
); |
} |
} |
|
|
my %allfiles = (); |
my %allfiles = (); |
my %codebase = (); |
my %codebase = (); |
my ($upload_result,$upload_output,$uploadphase); |
my ($upload_result,$upload_output,$uploadphase); |
if ($allowed) { |
if ($canedit) { |
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 4706 sub handler {
|
Line 5815 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(); |
} |
} |
Line 4721 sub handler {
|
Line 5831 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 4732 sub handler {
|
Line 5842 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 4750 sub handler {
|
Line 5860 sub handler {
|
|
|
if ($allowed && $toolsflag) { |
if ($allowed && $toolsflag) { |
$r->print(&startContentScreen('tools')); |
$r->print(&startContentScreen('tools')); |
$r->print(&generate_admin_menu($crstype)); |
$r->print(&generate_admin_menu($crstype,$canedit)); |
$r->print(&endContentScreen()); |
$r->print(&endContentScreen()); |
} elsif ((!$showdoc) && (!$uploadphase)) { |
} elsif ((!$showdoc) && (!$uploadphase)) { |
# ----------------------------------------------------------------------------- |
# ----------------------------------------------------------------------------- |
Line 4762 sub handler {
|
Line 5872 sub handler {
|
'impo' => 'Import', |
'impo' => 'Import', |
'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', |
|
'extr' => 'External Resource', |
|
'extt' => 'External Tool', |
'selm' => 'Select Map', |
'selm' => 'Select Map', |
'load' => 'Load Map', |
'load' => 'Load Map', |
'newf' => 'New Folder', |
'newf' => 'New Folder', |
Line 4771 sub handler {
|
Line 5884 sub handler {
|
'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', |
|
'news' => 'New sub-directory', |
|
'crpr' => 'Create Problem', |
'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 4784 sub handler {
|
Line 5900 sub handler {
|
'se' => 'Select', |
'se' => 'Select', |
'file' => 'File', |
'file' => 'File', |
'title' => 'Title', |
'title' => 'Title', |
|
'addp' => 'Add Placeholder to course?', |
|
'uste' => 'Use Template?', |
|
'fnam' => 'File Name:', |
|
'loca' => 'Location:', |
|
'dire' => 'Directory:', |
|
'cate' => 'Category:', |
|
'tmpl' => 'Template:', |
'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', |
|
'bb6' => 'Blackboard 6', |
|
'angel5' => 'ANGEL 5.5', |
|
'webctce4' => 'WebCT 4 Campus Edition', |
|
'yes' => 'Yes', |
|
'no' => 'No', |
|
'er' => 'Editing rights unavailable for your current role.', |
|
); |
# ----------------------------------------------------------------------------- |
# ----------------------------------------------------------------------------- |
|
|
|
# Calculate free quota space for a user or course. A javascript function checks |
|
# file size to determine if upload should be allowed. |
|
my $quotatype = 'unofficial'; |
|
if ($crstype eq 'Community') { |
|
$quotatype = 'community'; |
|
} elsif ($crstype eq 'Placement') { |
|
$quotatype = 'placement'; |
|
} elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.coursecode'}) { |
|
$quotatype = 'official'; |
|
} elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.textbook'}) { |
|
$quotatype = 'textbook'; |
|
} |
|
my $disk_quota = &Apache::loncommon::get_user_quota($coursenum,$coursedom, |
|
'course',$quotatype); # expressed in MB |
|
my $current_disk_usage = 0; |
|
foreach my $subdir ('docs','supplemental') { |
|
$current_disk_usage += &Apache::lonnet::diskusage($coursedom,$coursenum, |
|
"userfiles/$subdir",1); # expressed in kB |
|
} |
|
my $free_space = 1024 * ((1024 * $disk_quota) - $current_disk_usage); |
|
my $usage = $current_disk_usage/1024; # in MB |
|
my $quota = $disk_quota; |
|
my $percent; |
|
if ($disk_quota == 0) { |
|
$percent = 100.0; |
|
} else { |
|
$percent = 100*($usage/$disk_quota); |
|
} |
|
$usage = sprintf("%.2f",$usage); |
|
$quota = sprintf("%.2f",$quota); |
|
$percent = sprintf("%.0f",$percent); |
|
my $quotainfo = '<p>'.&mt('Currently using [_1] of the [_2] available.', |
|
$percent.'%',$quota.' MB').'</p>'; |
|
|
my $fileupload=(<<FIUP); |
my $fileupload=(<<FIUP); |
|
$quotainfo |
$lt{'file'}:<br /> |
$lt{'file'}:<br /> |
<input type="file" name="uploaddoc" size="40" /> |
<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); |
Line 4798 FIUP
|
Line 5965 FIUP
|
<input type="checkbox" name="parserflag" /> |
<input type="checkbox" name="parserflag" /> |
</label> --> |
</label> --> |
<label> |
<label> |
<input type="checkbox" name="parserflag" checked="checked" /> $lt{'parse'} |
<input type="checkbox" name="parserflag" checked="checked" $disabled /> $lt{'parse'} |
</label> |
</label> |
CHBO |
CHBO |
my $imsfolder = $env{'form.folder'}; |
my $imsfolder = $env{'form.folder'}; |
Line 4815 CHBO
|
Line 5982 CHBO
|
<br /> |
<br /> |
<p> |
<p> |
$lt{'cms'}: |
$lt{'cms'}: |
<select name="source"> |
<select name="source" $disabled> |
<option value="-1" selected="selected">$lt{'se'}</option> |
<option value="-1" selected="selected">$lt{'se'}</option> |
<option value="bb5">Blackboard 5</option> |
<option value="bb5">$lt{'bb5'}</option> |
<option value="bb6">Blackboard 6</option> |
<option value="bb6">$lt{'bb6'}</option> |
<option value="angel5">ANGEL 5.5</option> |
<option value="angel5">$lt{'angel5'}</option> |
<option value="webctce4">WebCT 4 Campus Edition</option> |
<option value="webctce4">$lt{'webctce4'}</option> |
</select> |
</select> |
<input type="hidden" name="folder" value="$imsfolder" /> |
<input type="hidden" name="folder" value="$imsfolder" /> |
</p> |
</p> |
<input type="hidden" name="phase" value="one" /> |
<input type="hidden" name="phase" value="one" /> |
<input type="button" value="$lt{'imsl'}" onclick="makeims(this.form);" /> |
<input type="button" value="$lt{'imsl'}" onclick="makeims(this.form);" $disabled /> |
</fieldset> |
</fieldset> |
</form> |
</form> |
IMSFORM |
IMSFORM |
Line 4837 IMSFORM
|
Line 6004 IMSFORM
|
<fieldset id="uploaddocform" style="display: none;"> |
<fieldset id="uploaddocform" style="display: none;"> |
<legend>$lt{'upfi'}</legend> |
<legend>$lt{'upfi'}</legend> |
<input type="hidden" name="active" value="aa" /> |
<input type="hidden" name="active" value="aa" /> |
$fileupload |
$fileupload |
<br /> |
<br /> |
$lt{'title'}:<br /> |
$lt{'title'}:<br /> |
<input type="text" size="60" name="comment" /> |
<input type="text" size="60" name="comment" $disabled /> |
$pathitem |
$pathitem |
<input type="hidden" name="cmd" value="upload_default" /> |
<input type="hidden" name="cmd" value="upload_default" /> |
<br /> |
<br /> |
Line 4848 IMSFORM
|
Line 6015 IMSFORM
|
$checkbox |
$checkbox |
</span> |
</span> |
<br clear="all" /> |
<br clear="all" /> |
<input type="submit" value="$lt{'upld'}" /> |
<input type="submit" value="$lt{'upld'}" $disabled /> |
</fieldset> |
</fieldset> |
</form> |
</form> |
FUFORM |
FUFORM |
|
|
|
my $mapimportjs; |
|
if ($canedit) { |
|
$mapimportjs = "javascript:openbrowser('mapimportform','importmap','sequence,page','');"; |
|
} else { |
|
$mapimportjs = "javascript:alert('".&js_escape($lt{'er'})."');"; |
|
} |
my $importpubform=(<<SEDFFORM); |
my $importpubform=(<<SEDFFORM); |
<a class="LC_menubuttons_link" href="javascript:toggleMap('map');"> |
<a class="LC_menubuttons_link" href="javascript:toggleMap('map');"> |
$lt{'impm'}</a>$help{'Load_Map'} |
$lt{'impm'}</a>$help{'Load_Map'} |
Line 4863 FUFORM
|
Line 6036 FUFORM
|
$lt{'copm'}<br /> |
$lt{'copm'}<br /> |
<span class="LC_nobreak"> |
<span class="LC_nobreak"> |
<input type="text" name="importmap" size="40" value="" |
<input type="text" name="importmap" size="40" value="" |
onfocus="this.blur();openbrowser('mapimportform','importmap','sequence,page','');" /> |
onfocus="this.blur();$mapimportjs" $disabled /> |
<a href="javascript:openbrowser('mapimportform','importmap','sequence,page','');">$lt{'selm'}</a></span><br /> |
<a href="$mapimportjs">$lt{'selm'}</a></span><br /> |
<input type="submit" name="loadmap" value="$lt{'load'}" /> |
<input type="submit" name="loadmap" value="$lt{'load'}" $disabled /> |
</fieldset> |
</fieldset> |
</form> |
</form> |
|
|
SEDFFORM |
SEDFFORM |
|
my $importcrsresform; |
|
my ($numdirs,$pickfile) = |
|
&Apache::loncommon::import_crsauthor_form('crsresimportform','coursepath','coursefile', |
|
"resize_scrollbox('contentscroll','1','0');", |
|
undef,'res'); |
|
if ($pickfile) { |
|
$importcrsresform=(<<CRSFORM); |
|
<a class="LC_menubuttons_link" href="javascript:toggleImportCrsres('res','$numdirs');"> |
|
$lt{'imcr'}</a>$help{'Course_Resources'} |
|
<form action="/adm/coursedocs" method="post" name="crsresimportform" onsubmit="return validImportCrsRes();"> |
|
<fieldset id="importcrsresform" style="display: none;"> |
|
<legend>$lt{'imcr'}</legend> |
|
<input type="hidden" name="active" value="bb" /> |
|
$pickfile |
|
<p> |
|
$lt{'title'}: <input type="textbox" name="crsrestitle" value="" $disabled /> |
|
</p> |
|
<input type="hidden" name="importdetail" value="" /> |
|
<input type="submit" name="crsres" value="$lt{'impo'}" $disabled /> |
|
</fieldset> |
|
</form> |
|
CRSFORM |
|
} |
|
|
|
my $fromstoredjs; |
|
if ($canedit) { |
|
$fromstoredjs = 'open_StoredLinks_Import()'; |
|
} else { |
|
$fromstoredjs = "alert('".&js_escape($lt{'er'})."')"; |
|
} |
|
|
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>" }, |
{ '<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:open_StoredLinks_Import();" />' => "<a class='LC_menubuttons_link' href='javascript:open_StoredLinks_Import();'>$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>' }, |
{ '<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) { |
|
push(@importpubforma,{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{imcr}.'" onclick="javascript:toggleImportCrsres(\'res\','."'$numdirs'".');"/>' => $importcrsresform}); |
|
} |
$importpubform = &create_form_ul(&create_list_elements(@importpubforma)); |
$importpubform = &create_form_ul(&create_list_elements(@importpubforma)); |
my $extresourcesform = |
my $extresourcesform = |
&Apache::lonextresedit::extedit_form(0,0,undef,undef,$pathitem, |
&Apache::lonextresedit::extedit_form(0,0,undef,undef,$pathitem, |
$help{'Adding_External_Resource'}); |
$help{'Adding_External_Resource'}, |
|
undef,undef,undef,undef,undef,undef,$disabled); |
|
my $exttoolform = |
|
&Apache::lonextresedit::extedit_form(0,0,undef,undef,$pathitem, |
|
$help{'Adding_External_Tool'},undef, |
|
undef,'tool',$coursedom,$coursenum, |
|
\%ltitools,$disabled); |
if ($allowed) { |
if ($allowed) { |
my $folder = $env{'form.folder'}; |
my $folder = $env{'form.folder'}; |
if ($folder eq '') { |
if ($folder eq '') { |
$folder='default'; |
$folder='default'; |
} |
} |
my $output = &update_paste_buffer($coursenum,$coursedom,$folder); |
if ($canedit) { |
if ($output) { |
my $output = &update_paste_buffer($coursenum,$coursedom,$folder); |
$r->print($output); |
if ($output) { |
|
$r->print($output); |
|
} |
} |
} |
$r->print(<<HIDDENFORM); |
$r->print(<<HIDDENFORM); |
<form name="renameform" method="post" action="/adm/coursedocs"> |
<form name="renameform" method="post" action="/adm/coursedocs"> |
Line 4897 SEDFFORM
|
Line 6112 SEDFFORM
|
<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 4919 HIDDENFORM
|
Line 6139 HIDDENFORM
|
} |
} |
|
|
# |
# |
|
my $hostname = $r->hostname(); |
my $savefolderpath; |
my $savefolderpath; |
|
|
if ($allowed) { |
if ($allowed) { |
my $folder=$env{'form.folder'}; |
my $folder=$env{'form.folder'}; |
if ($folder eq '' || $supplementalflag) { |
if ((($folder eq '') && (!$hiddentop)) || ($supplementalflag)) { |
$folder='default'; |
$folder='default'; |
$savefolderpath = $env{'form.folderpath'}; |
$savefolderpath = $env{'form.folderpath'}; |
$env{'form.folderpath'}='default&'.&escape(&mt('Main Content')); |
$env{'form.folderpath'}='default&'.&escape(&mt('Main Content')); |
Line 4952 HIDDENFORM
|
Line 6172 HIDDENFORM
|
$pathitem |
$pathitem |
<input type="hidden" name="importdetail" |
<input type="hidden" name="importdetail" |
value="$lt{'navc'}=/adm/navmaps" /> |
value="$lt{'navc'}=/adm/navmaps" /> |
<a class="LC_menubuttons_link" href="javascript:document.newnav.submit()">$lt{'navc'}</a> |
<a class="LC_menubuttons_link" href="javascript:makenew(document.newnav);">$lt{'navc'}</a> |
$help{'Navigate_Content'} |
$help{'Navigate_Content'} |
</form> |
</form> |
NNFORM |
NNFORM |
Line 4972 NSPFORM
|
Line 6192 NSPFORM
|
$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> |
$help{'Simple Problem'} |
$help{'Simple_Problem'} |
</form> |
</form> |
|
|
NSPROBFORM |
NSPROBFORM |
Line 5013 NBFORM
|
Line 6233 NBFORM
|
$pathitem |
$pathitem |
<input type="hidden" name="importdetail" |
<input type="hidden" name="importdetail" |
value="$plainname=/adm/$udom/$uname/aboutme" /> |
value="$plainname=/adm/$udom/$uname/aboutme" /> |
<a class="LC_menubuttons_link" href="javascript:document.newaboutme.submit()">$lt{'mypi'}</a> |
<a class="LC_menubuttons_link" href="javascript:makenew(document.newaboutme);">$lt{'mypi'}</a> |
$help{'My Personal Information Page'} |
$help{'My Personal Information Page'} |
</form> |
</form> |
NAMFORM |
NAMFORM |
Line 5033 NASOFORM
|
Line 6253 NASOFORM
|
$pathitem |
$pathitem |
<input type="hidden" name="importdetail" |
<input type="hidden" name="importdetail" |
value="$lt{'rost'}=/adm/viewclasslist" /> |
value="$lt{'rost'}=/adm/viewclasslist" /> |
<a class="LC_menubuttons_link" href="javascript:document.newroster.submit()">$lt{'rost'}</a> |
<a class="LC_menubuttons_link" href="javascript:makenew(document.newroster);">$lt{'rost'}</a> |
$help{'Course_Roster'} |
$help{'Course_Roster'} |
</form> |
</form> |
NROSTFORM |
NROSTFORM |
Line 5057 NROSTFORM
|
Line 6277 NROSTFORM
|
$help{'Web_Page'} |
$help{'Web_Page'} |
</form> |
</form> |
NWEBFORM |
NWEBFORM |
|
|
|
my @ids=&Apache::lonnet::current_machine_ids(); |
|
my %select_menus; |
|
my $numauthor = 0; |
|
my $numcrsdirs = 0; |
|
my $toppath = "/priv/$env{'user.domain'}/$env{'user.name'}"; |
|
if ($env{'user.author'}) { |
|
$numauthor ++; |
|
$select_menus{'author'}->{'text'} = &Apache::lonnet::plaintext('au'); |
|
if (grep(/^\Q$env{'user.home'}\E$/,@ids)) { |
|
my $is_home = 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']; |
|
} |
|
} |
|
my %roleshash = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},'userroles', |
|
['active'],['ca','aa']); |
|
my $crshome = $env{'course.'.$env{'request.course.id'}.'.home'}; |
|
my %by_roletype; |
|
if (keys(%roleshash)) { |
|
foreach my $entry (keys(%roleshash)) { |
|
my ($auname,$audom,$roletype) = split(/:/,$entry); |
|
my $key = $entry; |
|
$key =~ s/:/___/g; |
|
$by_roletype{$roletype}{$auname.'___'.$audom} = 1; |
|
$select_menus{$key}->{'text'} = &Apache::lonnet::plaintext($roletype)." ($audom/$auname)"; |
|
my $rolehome = &Apache::lonnet::homeserver($auname,$audom); |
|
if (grep(/^\Q$rolehome\E$/,@ids)) { |
|
my $is_home = 1; |
|
my (%subdirs,@ordered); |
|
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); |
|
} |
|
} |
|
} |
|
} |
|
$select_menus{'course'}->{'text'} = &mt('Course Resource'); |
|
if (grep(/^\Q$crshome\E$/,@ids)) { |
|
my $is_home = 1; |
|
my %subdirs; |
|
my $toppath="/priv/$coursedom/$coursenum"; |
|
&Apache::lonnet::recursedirs($is_home,'priv',$londocroot,$toppath,'',\%subdirs); |
|
$numcrsdirs = keys(%subdirs); |
|
$select_menus{'course'}->{'default'} = '/'; |
|
$select_menus{'course'}->{'select2'}->{'/'} = '/'; |
|
my @ordered = ('/'); |
|
foreach my $relpath (sort { lc($a) cmp lc($b) } (keys(%subdirs))) { |
|
$select_menus{'course'}->{'select2'}->{$relpath} = $relpath; |
|
push(@ordered,$relpath); |
|
} |
|
$select_menus{'course'}->{'order'} = \@ordered; |
|
} else { |
|
$select_menus{'course'}->{'select2'}->{'switch'} = &mt('Switch server required'); |
|
$select_menus{'course'}->{'default'} = 'switch'; |
|
$select_menus{'course'}->{'order'} = ['switch']; |
|
} |
|
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"; |
|
} |
|
} |
|
} |
|
|
|
my %seltemplate_menus; |
|
my @files = &Apache::lonhomework::get_template_list('problem'); |
|
my @noexamplelink = ('blank.problem','blank.library','script.library'); |
|
my $currentcategory = ''; |
|
my @ordered = (''); |
|
my %templatehelp; |
|
my $defcategory = ''; |
|
my @catorder = ($defcategory); |
|
$seltemplate_menus{$defcategory}->{'order'} = ['']; |
|
$seltemplate_menus{$defcategory}->{'text'} = ''; |
|
foreach my $file (@files) { |
|
if (ref($file) eq 'ARRAY') { |
|
my ($path,$title,$category,$help) = @{$file}; |
|
next if ($title !~ /\S/); |
|
if (&js_escape($category) ne $currentcategory) { |
|
$currentcategory = &js_escape($category); |
|
push(@catorder,&js_escape($currentcategory)); |
|
$seltemplate_menus{$currentcategory}->{'text'} = $category; |
|
$seltemplate_menus{$currentcategory}->{'default'} = ''; |
|
$seltemplate_menus{$currentcategory}->{'select2'}->{''} = ''; |
|
push(@{$seltemplate_menus{$currentcategory}->{'order'}},''); |
|
} |
|
if ($path) { |
|
$seltemplate_menus{$currentcategory}->{'select2'}->{&js_escape($path)} = $title; |
|
push(@{$seltemplate_menus{$currentcategory}->{'order'}},&js_escape($path)); |
|
if ($help) { |
|
$templatehelp{$path} = $help; |
|
} |
|
} |
|
} |
|
} |
|
|
|
my $templates = $lt{'cate'}.' '. |
|
&Apache::loncommon::linked_select_forms('courseresform','<br />'.$lt{'tmpl'}.' ', |
|
$defcategory,'tempcategory','template', |
|
\%seltemplate_menus,\@catorder, |
|
"resize_scrollbox('contentscroll','1','0');", |
|
"toggleExampleText();",'template').'<br />'; |
|
my $templatepreview = '<a href="#" target="sample" onclick="javascript:getExample(600,420,\'yes\',true); return false;">'. |
|
'<span id="newresexample">'.&mt('Example').'<span></a>'; |
|
my $crsresform=(<<RESFORM); |
|
<a class="LC_menubuttons_link" href="javascript:toggleCrsRes('res','$numauthor','$numcrsdirs');"> |
|
$lt{'stpr'}</a>$help{'Course_Resource'} |
|
<form action="/adm/coursedocs" method="post" name="courseresform"> |
|
<fieldset id="crsresform" style="display:none;"> |
|
<legend>$lt{'stpr'}</legend> |
|
<input type="hidden" name="active" value="ee" /> |
|
<p> |
|
$pickdir |
|
<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="1" onclick="toggleNewsubdir(this.form);" $disabled />Yes</label> |
|
</span><span id="newsubdir"></span> |
|
<input type="hidden" name="newsubdirname" id="newsubdirname" value="" autocomplete="off" /> |
|
</p> |
|
$lt{'fnam'} |
|
<input type="text" size="20" name="newresourcename" autocomplete="off" $disabled /> |
|
<p> |
|
<div id="newresource" style="display:$showtitle"> |
|
$lt{'addp'} |
|
<label><input type="radio" name="newresourceadd" value="0" checked="checked" onclick="toggleNewInCourse(this.form);" $disabled /> |
|
$lt{'no'}</label> |
|
<label><input type="radio" name="newresourceadd" value="1" onclick="toggleNewInCourse(this.form);" $disabled /> |
|
$lt{'yes'}</label> |
|
<span id="newrestitle"></span> |
|
<input type="hidden" size="20" name="newresourcetitle" id="newresourcetitle" autocomplete="off" $disabled /> |
|
</div> |
|
</p> |
|
<p> |
|
$lt{'uste'} |
|
<label><input type="radio" name="newresusetemp" value="0" checked="checked" onclick="toggleWithTemplate(this.form);" $disabled /> |
|
$lt{'no'}</label> |
|
<label><input type="radio" name="newresusetemp" value="1" onclick="toggleWithTemplate(this.form);" $disabled /> |
|
$lt{'yes'}</label> |
|
<div id="newrestemplate" style="display:none"> |
|
$templates |
|
$templatepreview |
|
</div> |
|
</p> |
|
<span class="LC_nobreak"> |
|
<input type="hidden" name="folderpath" value="$env{'form.folderpath'}" /> |
|
<input type="submit" name="newcrs" value="$lt{'crpr'}" $disabled /> |
|
</span> |
|
</fieldset> |
|
</form> |
|
|
|
RESFORM |
|
|
my $specialdocumentsform; |
my $specialdocumentsform; |
my @specialdocumentsforma; |
my @specialdocumentsforma; |
Line 5096 NFFORM
|
Line 6533 NFFORM
|
$pathitem |
$pathitem |
<input type="hidden" name="importdetail" |
<input type="hidden" name="importdetail" |
value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" /> |
value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" /> |
<a class="LC_menubuttons_link" href="javascript:document.newsyl.submit()">$lt{'syll'}</a> |
<a class="LC_menubuttons_link" href="javascript:makenew(document.newsyl);">$lt{'syll'}</a> |
$help{'Syllabus'} |
$help{'Syllabus'} |
|
|
</form> |
</form> |
Line 5108 NSYLFORM
|
Line 6545 NSYLFORM
|
$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" /> |
<a class="LC_menubuttons_link" href="javascript:document.newgroupfiles.submit()">$lt{'grpo'}</a> |
<a class="LC_menubuttons_link" href="javascript:makenew(document.newgroupfiles);">$lt{'grpo'}</a> |
$help{'Group Portfolio'} |
$help{'Group Portfolio'} |
</form> |
</form> |
NGFFORM |
NGFFORM |
@specialdocumentsforma=( |
@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="document.newsyl.submit()" />'=>$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="document.newnav.submit()" />'=>$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}, |
); |
); |
Line 5125 NGFFORM
|
Line 6562 NGFFORM
|
my @importdoc = ( |
my @importdoc = ( |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="toggleUpload(\'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/exttool.png" alt="'.$lt{extt}.'" onclick="toggleUpload(\'tool\');" />'=>$exttoolform}, |
|
); |
|
} |
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 5139 NGFFORM
|
Line 6581 NGFFORM
|
{'<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}, |
); |
); |
$gradingform = &create_form_ul(&create_list_elements(@gradingforma)); |
$gradingform = &create_form_ul(&create_list_elements(@gradingforma)); |
|
|
Line 5147 NGFFORM
|
Line 6589 NGFFORM
|
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/bchat.png" alt="'.$lt{bull}.'" onclick="javascript:makebulboard();" />'=>$newbulform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/bchat.png" alt="'.$lt{bull}.'" onclick="javascript:makebulboard();" />'=>$newbulform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/myaboutme.png" alt="'.$lt{mypi}.'" onclick="javascript:makebulboard();" />'=>$newaboutmeform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/myaboutme.png" alt="'.$lt{mypi}.'" onclick="javascript:makebulboard();" />'=>$newaboutmeform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/aboutme.png" alt="'.$lt{abou}.'" onclick="javascript:makeabout();" />'=>$newaboutsomeoneform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/aboutme.png" alt="'.$lt{abou}.'" onclick="javascript:makeabout();" />'=>$newaboutsomeoneform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/clst.png" alt="'.$lt{rost}.'" onclick="document.newroster.submit()" />'=>$newrosterform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/clst.png" alt="'.$lt{rost}.'" onclick="javascript:makenew(document.newroster);" />'=>$newrosterform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/groupportfolio.png" alt="'.$lt{grpo}.'" onclick="document.newgroupfiles.submit()" />'=>$newgroupfileform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/groupportfolio.png" alt="'.$lt{grpo}.'" onclick="javascript:makenew(document.newgroupfiles);" />'=>$newgroupfileform}, |
); |
); |
$communityform = &create_form_ul(&create_list_elements(@communityforma)); |
$communityform = &create_form_ul(&create_list_elements(@communityforma)); |
|
|
Line 5166 unless ($container eq 'page') {
|
Line 6608 unless ($container eq 'page') {
|
$hadchanges=0; |
$hadchanges=0; |
unless (($supplementalflag || $toolsflag)) { |
unless (($supplementalflag || $toolsflag)) { |
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, |
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, |
$supplementalflag,\%orderhash,$iconpath,$pathitem); |
$supplementalflag,\%orderhash,$iconpath,$pathitem, |
|
\%ltitools,$canedit,$hostname,\$navmap,$hiddentop); |
|
undef($navmap); |
if ($error) { |
if ($error) { |
$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 5202 unless ($container eq 'page') {
|
Line 6648 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 |
<br /> |
<br /> |
<br /> |
<br /> |
Line 5231 SNFFORM
|
Line 6677 SNFFORM
|
|
|
my $supextform = |
my $supextform = |
&Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem, |
&Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem, |
$help{'Adding_External_Resource'}); |
$help{'Adding_External_Resource'}, |
|
undef,undef,undef,undef,undef,undef, |
|
$disabled); |
|
|
|
my $supexttoolform = |
|
&Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem, |
|
$help{'Adding_External_Tool'}, |
|
undef,undef,'tool',$coursedom, |
|
$coursenum,\%ltitools,$disabled); |
|
|
my $supnewsylform=(<<SNSFORM); |
my $supnewsylform=(<<SNSFORM); |
<form action="/adm/coursedocs" method="post" name="supnewsyl"> |
<form action="/adm/coursedocs" method="post" name="supnewsyl"> |
Line 5239 SNFFORM
|
Line 6693 SNFFORM
|
$pathitem |
$pathitem |
<input type="hidden" name="importdetail" |
<input type="hidden" name="importdetail" |
value="Syllabus=/public/$coursedom/$coursenum/syllabus" /> |
value="Syllabus=/public/$coursedom/$coursenum/syllabus" /> |
<a class="LC_menubuttons_link" href="javascript:document.supnewsyl.submit()">$lt{'syll'}</a> |
<a class="LC_menubuttons_link" href="javascript:makenew(document.supnewsyl);">$lt{'syll'}</a> |
$help{'Syllabus'} |
$help{'Syllabus'} |
</form> |
</form> |
SNSFORM |
SNSFORM |
Line 5250 SNSFORM
|
Line 6704 SNSFORM
|
$pathitem |
$pathitem |
<input type="hidden" name="importdetail" |
<input type="hidden" name="importdetail" |
value="$plainname=/adm/$udom/$uname/aboutme" /> |
value="$plainname=/adm/$udom/$uname/aboutme" /> |
<a class="LC_menubuttons_link" href="javascript:document.supnewaboutme.submit()">$lt{'mypi'}</a> |
<a class="LC_menubuttons_link" href="javascript:makenew(document.supnewaboutme);">$lt{'mypi'}</a> |
$help{'My Personal Information Page'} |
$help{'My Personal Information Page'} |
</form> |
</form> |
SNAMFORM |
SNAMFORM |
Line 5277 SWEBFORM
|
Line 6731 SWEBFORM
|
|
|
|
|
my @specialdocs = ( |
my @specialdocs = ( |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="document.supnewsyl.submit()" />' |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="javascript:makenew(document.supnewsyl);" />' |
=>$supnewsylform}, |
=>$supnewsylform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/myaboutme.png" alt="'.$lt{mypi}.'" onclick="document.supnewaboutme.submit()" />' |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/myaboutme.png" alt="'.$lt{mypi}.'" onclick="javascript:makenew(document.supnewaboutme);" />' |
=>$supnewaboutmeform}, |
=>$supnewaboutmeform}, |
{'<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 @supimportdoc = ( |
{'<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:toggleUpload(\'suppext\')" />' |
=>$supextform}, |
=>$supextform}); |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'suppdoc\');" />' |
if (keys(%ltitools)) { |
|
push(@supimportdoc, |
|
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/exttool.png" alt="'.$lt{extt}.'" onclick="javascript:toggleUpload(\'supptool\')" />' |
|
=>$supexttoolform}); |
|
} |
|
push(@supimportdoc, |
|
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'suppdoc\');" />' |
=>$supupdocform}, |
=>$supupdocform}, |
); |
); |
|
|
$supupdocform = &create_form_ul(&create_list_elements(@supimportdoc)); |
$supupdocform = &create_form_ul(&create_list_elements(@supimportdoc)); |
my %suporderhash = ( |
my %suporderhash = ( |
Line 5299 my %suporderhash = (
|
Line 6759 my %suporderhash = (
|
); |
); |
if ($supplementalflag) { |
if ($supplementalflag) { |
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, |
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, |
$supplementalflag,\%suporderhash,$iconpath,$pathitem); |
$supplementalflag,\%suporderhash,$iconpath,$pathitem, |
|
\%ltitools,$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>'); |
} else { |
} else { |
Line 5319 my %suporderhash = (
|
Line 6780 my %suporderhash = (
|
} |
} |
} 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); |
$supplementalflag,'',$iconpath,$pathitem,'','',$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 5346 my %suporderhash = (
|
Line 6807 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>'); |
} |
} |
} |
} |
$r->print(&Apache::loncommon::end_page()); |
unless ($noendpage) { |
|
$r->print(&Apache::loncommon::end_page()); |
|
} |
return OK; |
return OK; |
} |
} |
|
|
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 5373 sub embedded_destination {
|
Line 6837 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 5393 sub decompression_info {
|
Line 6861 sub decompression_info {
|
my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'}; |
my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'}; |
my $container='sequence'; |
my $container='sequence'; |
my ($pathitem,$hiddenelem); |
my ($pathitem,$hiddenelem); |
my @hiddens = ('newidx','comment','position','folderpath'); |
my @hiddens = ('newidx','comment','position','folderpath','archiveurl'); |
if ($env{'form.folderpath'} =~ /\:1$/) { |
if ($env{'form.folderpath'} =~ /\:1$/) { |
$container='page'; |
$container='page'; |
} |
} |
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="'. |
$env{'form.'.$item}.'" />'."\n"; |
&HTML::Entities::encode($env{'form.'.$item},'<>&"').'" />'."\n"; |
} |
} |
} |
} |
return ($destination,$dir_root,$londocroot,$docudom,$docuname,$container, |
return ($destination,$dir_root,$londocroot,$docudom,$docuname,$container, |
Line 5416 sub decompression_phase_one {
|
Line 6887 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 5458 sub remove_archive {
|
Line 6929 sub remove_archive {
|
} else { |
} else { |
$delwarning = &mt('An error occurred retrieving the contents of the current folder.'); |
$delwarning = &mt('An error occurred retrieving the contents of the current folder.'); |
} |
} |
$delwarning .= &mt('As a result the archive file has not been removed.'); |
$delwarning .= ' '.&mt('As a result the archive file has not been removed.'); |
} else { |
} else { |
my $currcmd = $env{'form.cmd'}; |
my $currcmd = $env{'form.cmd'}; |
my $position = $env{'form.position'}; |
my $position = $env{'form.position'}; |
if ($position > 0) { |
my $archiveidx = $position; |
$env{'form.cmd'} = 'remove_'.$position; |
if ($position > 0) { |
my ($title,$url,@rrest) = |
if (($env{'form.autoextract_camtasia'}) && (scalar(@LONCAPA::map::order) == 2)) { |
split(/:/,$LONCAPA::map::resources[$LONCAPA::map::order[$position]]); |
$archiveidx = $position-1; |
if (&handle_edit_cmd($docuname,$docudom)) { |
} |
($errtext,$fatal) = &storemap($docuname,$docudom,$map,1); |
$env{'form.cmd'} = 'remove_'.$archiveidx; |
if ($fatal) { |
my ($title,$url,@rrest) = |
if ($container eq 'page') { |
split(/:/,$LONCAPA::map::resources[$LONCAPA::map::order[$archiveidx]]); |
$delwarning = &mt('An error occurred updating the contents of the current page.'); |
if ($url eq $env{'form.archiveurl'}) { |
|
if (&handle_edit_cmd($docuname,$docudom)) { |
|
($errtext,$fatal) = &storemap($docuname,$docudom,$map,1); |
|
if ($fatal) { |
|
if ($container eq 'page') { |
|
$delwarning = &mt('An error occurred updating the contents of the current page.'); |
|
} else { |
|
$delwarning = &mt('An error occurred updating the contents of the current folder.'); |
|
} |
} else { |
} else { |
$delwarning = &mt('An error occurred updating the contents of the current folder.'); |
$delresult = &mt('Archive file removed.'); |
} |
} |
} else { |
|
$delresult = &mt('Archive file removed.'); |
|
} |
} |
|
} else { |
|
$delwarning .= &mt('Archive file had unexpected item number in folder.'). |
|
' '.&mt('As a result the archive file has not been removed.'); |
} |
} |
} |
} |
$env{'form.cmd'} = $currcmd; |
$env{'form.cmd'} = $currcmd; |
Line 5495 sub remove_archive {
|
Line 6975 sub remove_archive {
|
} |
} |
|
|
sub generate_admin_menu { |
sub generate_admin_menu { |
my ($crstype) = @_; |
my ($crstype,$canedit) = @_; |
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', |
'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 5534 sub generate_admin_menu {
|
Line 7015 sub generate_admin_menu {
|
{ linktext => $lt{'vc'}, |
{ linktext => $lt{'vc'}, |
url => "javascript:injectData(document.courseverify,'dummy','verify','$lt{'vc'}')", |
url => "javascript:injectData(document.courseverify,'dummy','verify','$lt{'vc'}')", |
permission => 'F', |
permission => 'F', |
help => 'Verify_Content', |
help => 'Docs_Verify_Content', |
icon => 'verify.png', |
icon => 'verify.png', |
linktitle => 'Verify contents can be retrieved/rendered', |
linktitle => 'Verify contents can be retrieved/rendered', |
}, |
}, |
{ linktext => $lt{'cv'}, |
{ linktext => $lt{'cv'}, |
url => "javascript:injectData(document.courseverify,'dummy','versions','$lt{'cv'}')", |
url => "javascript:injectData(document.courseverify,'dummy','versions','$lt{'cv'}')", |
permission => 'F', |
permission => 'F', |
help => 'Check_Resource_Versions', |
help => 'Docs_Check_Resource_Versions', |
icon => 'resversion.png', |
icon => 'resversion.png', |
linktitle => "View version information for resources in your $lc_crstype, and fix/unfix use of specific versions", |
linktitle => "View version information for resources in your $lc_crstype, and fix/unfix use of specific versions", |
}, |
}, |
Line 5552 sub generate_admin_menu {
|
Line 7033 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) { |
|
push(@menu, |
{ categorytitle=>'Export', |
{ categorytitle=>'Export', |
items =>[ |
items =>[ |
{ linktext => $lt{'imse'}, |
{ linktext => $lt{'imse'}, |
Line 5566 sub generate_admin_menu {
|
Line 7056 sub generate_admin_menu {
|
{ linktext => $lt{'dcd'}, |
{ linktext => $lt{'dcd'}, |
url => $dumpurl, |
url => $dumpurl, |
permission => $candump, |
permission => $candump, |
#help => '', |
help => 'Docs_Dump_Course_Docs', |
icon => 'dump.png', |
icon => 'dump.png', |
linktitle => $lt{'dcd'}, |
linktitle => $lt{'dcd'}, |
}, |
}, |
] |
] |
}); |
}); |
|
} |
return '<form action="/adm/coursedocs" method="post" name="courseverify">'."\n". |
return '<form action="/adm/coursedocs" method="post" name="courseverify">'."\n". |
'<input type="hidden" id="dummy" />'."\n". |
'<input type="hidden" id="dummy" />'."\n". |
&Apache::lonhtmlcommon::generate_menu(@menu)."\n". |
&Apache::lonhtmlcommon::generate_menu(@menu)."\n". |
Line 5580 sub generate_admin_menu {
|
Line 7071 sub generate_admin_menu {
|
|
|
sub generate_edit_table { |
sub generate_edit_table { |
my ($tid,$orderhash_ref,$to_show,$iconpath,$jumpto,$readfile, |
my ($tid,$orderhash_ref,$to_show,$iconpath,$jumpto,$readfile, |
$need_save,$copyfolder) = @_; |
$need_save,$copyfolder,$canedit) = @_; |
return unless(ref($orderhash_ref) eq 'HASH'); |
return unless(ref($orderhash_ref) eq 'HASH'); |
my %orderhash = %{$orderhash_ref}; |
my %orderhash = %{$orderhash_ref}; |
my $form; |
my ($form, $activetab, $active, $disabled); |
my $activetab; |
|
my $active; |
|
if (($env{'form.active'} ne '') && ($env{'form.active'} ne '00')) { |
if (($env{'form.active'} ne '') && ($env{'form.active'} ne '00')) { |
$activetab = $env{'form.active'}; |
$activetab = $env{'form.active'}; |
} |
} |
|
unless ($canedit) { |
|
$disabled = ' disabled="disabled"'; |
|
} |
my $backicon = $iconpath.'clickhere.gif'; |
my $backicon = $iconpath.'clickhere.gif'; |
my $backtext = &mt('Exit Editor'); |
my $backtext = &mt('Exit Editor'); |
$form = '<div class="LC_Box" style="margin:0;">'. |
$form = '<div class="LC_Box" style="margin:0;">'. |
Line 5652 sub generate_edit_table {
|
Line 7144 sub generate_edit_table {
|
<input type="hidden" name="multicopy" value="" /> |
<input type="hidden" name="multicopy" value="" /> |
<input type="hidden" name="multichange" value="" /> |
<input type="hidden" name="multichange" value="" /> |
<input type="hidden" name="copyfolder" value="$copyfolder" /> |
<input type="hidden" name="copyfolder" value="$copyfolder" /> |
<input type="submit" name="savemultiples" value="$button" /> |
<input type="submit" name="savemultiples" value="$button" $disabled /> |
</form> |
</form> |
</div> |
</div> |
END |
END |
Line 5678 END
|
Line 7170 END
|
} |
} |
|
|
sub editing_js { |
sub editing_js { |
my ($udom,$uname,$supplementalflag) = @_; |
my ($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti, |
my %lt = &Apache::lonlocal::texthash( |
$londocroot,$canedit,$hostname,$navmapref) = @_; |
|
my %js_lt = &Apache::lonlocal::texthash( |
p_mnf => 'Name of New Folder', |
p_mnf => 'Name of New Folder', |
t_mnf => 'New Folder', |
t_mnf => 'New Folder', |
p_mnp => 'Name of New Page', |
p_mnp => 'Name of New Page', |
Line 5690 sub editing_js {
|
Line 7183 sub editing_js {
|
p_mdb => 'Title for the Drop Box', |
p_mdb => 'Title for the Drop Box', |
p_mbb => 'Title for the Discussion Board', |
p_mbb => 'Title for the Discussion Board', |
p_mwp => 'Title for Web Page', |
p_mwp => 'Title for Web Page', |
|
p_mnr => 'Title for the Resource', |
p_mab => "Enter user:domain for User's Personal Information Page", |
p_mab => "Enter user:domain for User's Personal Information Page", |
p_mab2 => 'Personal Information Page of ', |
p_mab2 => 'Personal Information Page of ', |
p_mab_alrt1 => 'Not a valid user:domain', |
p_mab_alrt1 => 'Not a valid user:domain', |
p_mab_alrt2 => 'Please enter both user and domain in the format user:domain', |
p_mab_alrt2 => 'Please enter both user and domain in the format user:domain', |
p_chn => 'New Title', |
p_chn => 'New Title', |
p_rmr1 => 'WARNING: Removing a resource makes associated grades and scores inaccessible!', |
p_rmr1 => 'WARNING: Removing a resource makes associated grades and scores inaccessible!', |
p_rmr2a => 'Remove[_99]', |
p_rmr2a => 'Remove', |
p_rmr2b => '?[_99]', |
p_rmr2b => '?', |
p_rmr3a => 'Remove those [_2]', |
p_rmr3a => 'Remove those', |
p_rmr3b => 'items?[_2]', |
p_rmr3b => 'items?', |
|
p_rmr4 => 'WARNING: Removing a resource uploaded to a course cannot be undone via "Undo Delete".', |
|
p_rmr5 => 'Push "Cancel" and then use "Cut" instead if you might need to undo this change.', |
p_ctr1a => 'WARNING: Cutting a resource makes associated grades and scores inaccessible!', |
p_ctr1a => 'WARNING: Cutting a resource makes associated grades and scores inaccessible!', |
p_ctr1b => 'Grades remain inaccessible if resource is pasted into another folder.', |
p_ctr1b => 'Grades remain inaccessible if resource is pasted into another folder.', |
p_ctr2a => 'Cut[_98]', |
p_ctr2a => 'Cut', |
p_ctr2b => '?[_98]', |
p_ctr2b => '?', |
p_ctr3a => 'Cut those[_2]', |
p_ctr3a => 'Cut those', |
p_ctr3b => 'items?[_2]', |
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 5716 sub editing_js {
|
Line 7214 sub editing_js {
|
noor => 'No actions selected or changes to settings specified.', |
noor => 'No actions selected or changes to settings specified.', |
noch => 'No changes to settings specified.', |
noch => 'No changes to settings specified.', |
noac => 'No actions selected.', |
noac => 'No actions selected.', |
|
nofi => 'No file selected', |
|
tinc => 'Title in course', |
|
sunm => 'Sub-directory name', |
|
edri => 'Editing rights unavailable for your current role.', |
); |
); |
|
&js_escape(\%js_lt); |
my $crstype = &Apache::loncommon::course_type(); |
my $crstype = &Apache::loncommon::course_type(); |
my $docs_folderpath = &HTML::Entities::encode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.folderpath'},'<>&"'); |
my $docs_folderpath = &HTML::Entities::encode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.folderpath'},'<>&"'); |
my $main_container_page; |
my $main_container_page; |
if (&HTML::Entities::decode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.folderpath'}) =~ /\:1$/) { |
if (&HTML::Entities::decode($env{'environment.internal.'.$env{'request.course.id'}.'.docs_folderpath.folderpath'}) =~ /\:1$/) { |
$main_container_page = 1; |
$main_container_page = 1; |
} |
} |
my $toplevelmain = |
my $backtourl; |
&escape(&mt('Main Content').':::::'); |
my $toplevelmain = &escape(&default_folderpath($coursenum,$coursedom,$navmapref)); |
my $toplevelsupp = &supplemental_base(); |
my $toplevelsupp = &supplemental_base(); |
|
|
my $backtourl; |
|
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 5737 sub editing_js {
|
Line 7238 sub editing_js {
|
my ($map,$id,$res)=&Apache::lonnet::decode_symb($caller); |
my ($map,$id,$res)=&Apache::lonnet::decode_symb($caller); |
$res = &Apache::lonnet::clutter($res); |
$res = &Apache::lonnet::clutter($res); |
if (&Apache::lonnet::is_on_map($res)) { |
if (&Apache::lonnet::is_on_map($res)) { |
$backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($res),'<>&"').'?symb='. |
my ($url,$anchor); |
&HTML::Entities::encode($caller,'<>&"'); |
if ($res =~ /^([^#]+)#([^#]+)$/) { |
|
$url = $1; |
|
$anchor = $2; |
|
if (($caller =~ m{^([^#]+)\Q#$anchor\E$})) { |
|
$caller = $1.&escape('#').$anchor; |
|
} |
|
} else { |
|
$url = $res; |
|
} |
|
$backtourl = &HTML::Entities::encode(&Apache::lonnet::clutter($url),'<>&"'); |
|
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 (($ENV{'SERVER_PORT'} == 443) && |
|
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { |
|
if ($hostname ne '') { |
|
$backtourl = 'http://'.$hostname.$backtourl; |
|
} |
|
$backtourl .= (($backtourl =~ /\?/) ? '&':'?').'usehttp=1'; |
|
} |
|
} elsif ($backtourl =~ m{^/adm/wrapper/ext/(?!https:)}) { |
|
if (($ENV{'SERVER_PORT'} == 443) && ($hostname ne '')) { |
|
$backtourl = 'http://'.$hostname.$backtourl; |
|
} |
|
} |
|
if ($anchor ne '') { |
|
$backtourl .= '#'.&HTML::Entities::encode($anchor,'<>&"'); |
|
} |
|
$backtourl = &Apache::loncommon::escape_single($backtourl); |
} else { |
} else { |
$backtourl = '/adm/navmaps'; |
$backtourl = '/adm/navmaps'; |
} |
} |
Line 5752 sub editing_js {
|
Line 7285 sub editing_js {
|
} |
} |
|
|
my $fieldsets = "'ext','doc'"; |
my $fieldsets = "'ext','doc'"; |
|
if ($posslti) { |
|
$fieldsets .= ",'tool'"; |
|
} |
unless ($main_container_page) { |
unless ($main_container_page) { |
$fieldsets .=",'ims'"; |
$fieldsets .=",'ims'"; |
} |
} |
if ($supplementalflag) { |
if ($supplementalflag) { |
$fieldsets = "'suppext','suppdoc'"; |
$fieldsets = "'suppext','suppdoc'"; |
|
if ($posslti) { |
|
$fieldsets .= ",'supptool'"; |
|
} |
} |
} |
|
|
return <<ENDNEWSCRIPT; |
my $jsmakefunctions; |
|
if ($canedit) { |
|
$jsmakefunctions = <<ENDNEWSCRIPT; |
function makenewfolder(targetform,folderseq) { |
function makenewfolder(targetform,folderseq) { |
var foldername=prompt('$lt{"p_mnf"}','$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=escape(foldername)+"="+folderseq; |
targetform.submit(); |
targetform.submit(); |
Line 5769 function makenewfolder(targetform,folder
|
Line 7310 function makenewfolder(targetform,folder
|
} |
} |
|
|
function makenewpage(targetform,folderseq) { |
function makenewpage(targetform,folderseq) { |
var pagename=prompt('$lt{"p_mnp"}','$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=escape(pagename)+"="+folderseq; |
targetform.submit(); |
targetform.submit(); |
Line 5777 function makenewpage(targetform,folderse
|
Line 7318 function makenewpage(targetform,folderse
|
} |
} |
|
|
function makeexamupload() { |
function makeexamupload() { |
var title=prompt('$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'; |
escape(title)+'=/res/lib/templates/examupload.problem'; |
Line 5786 function makeexamupload() {
|
Line 7327 function makeexamupload() {
|
} |
} |
|
|
function makesmppage() { |
function makesmppage() { |
var title=prompt('$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'; |
escape(title)+'=/adm/$udom/$uname/new/smppg'; |
Line 5795 function makesmppage() {
|
Line 7336 function makesmppage() {
|
} |
} |
|
|
function makewebpage(type) { |
function makewebpage(type) { |
var title=prompt('$lt{"p_mwp"}'); |
var title=prompt('$js_lt{"p_mwp"}'); |
var formname; |
var formname; |
if (type == 'supp') { |
if (type == 'supp') { |
formname = this.document.forms.supwebpage; |
formname = this.document.forms.supwebpage; |
Line 5803 function makewebpage(type) {
|
Line 7344 function makewebpage(type) {
|
formname = this.document.forms.newwebpage; |
formname = this.document.forms.newwebpage; |
} |
} |
if (title) { |
if (title) { |
var webpage = formname.importdetail.value; |
var webpage = formname.importdetail.value; |
formname.importdetail.value = escape(title)+'='+webpage; |
formname.importdetail.value = escape(title)+'='+webpage; |
formname.submit(); |
formname.submit(); |
} |
} |
} |
} |
|
|
function makesmpproblem() { |
function makesmpproblem() { |
var title=prompt('$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'; |
escape(title)+'=/res/lib/templates/simpleproblem.problem'; |
Line 5819 function makesmpproblem() {
|
Line 7360 function makesmpproblem() {
|
} |
} |
|
|
function makedropbox() { |
function makedropbox() { |
var title=prompt('$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'; |
escape(title)+'=/res/lib/templates/DropBox.problem'; |
Line 5828 function makedropbox() {
|
Line 7369 function makedropbox() {
|
} |
} |
|
|
function makebulboard() { |
function makebulboard() { |
var title=prompt('$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'; |
escape(title)+'=/adm/$udom/$uname/new/bulletinboard'; |
Line 5837 function makebulboard() {
|
Line 7378 function makebulboard() {
|
} |
} |
|
|
function makeabout() { |
function makeabout() { |
var user=prompt("$lt{'p_mab'}"); |
var user=prompt("$js_lt{'p_mab'}"); |
if (user) { |
if (user) { |
var comp=new Array(); |
var comp=new Array(); |
comp=user.split(':'); |
comp=user.split(':'); |
if ((typeof(comp[0])!=undefined) && (typeof(comp[1])!=undefined)) { |
if ((typeof(comp[0])!=undefined) && (typeof(comp[1])!=undefined)) { |
if ((comp[0]) && (comp[1])) { |
if ((comp[0]) && (comp[1])) { |
this.document.forms.newaboutsomeone.importdetail.value= |
this.document.forms.newaboutsomeone.importdetail.value= |
'$lt{"p_mab2"}'+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme'; |
'$js_lt{"p_mab2"}'+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme'; |
this.document.forms.newaboutsomeone.submit(); |
this.document.forms.newaboutsomeone.submit(); |
} else { |
} else { |
alert("$lt{'p_mab_alrt1'}"); |
alert("$js_lt{'p_mab_alrt1'}"); |
} |
} |
} else { |
} else { |
alert("$lt{'p_mab_alrt2'}"); |
alert("$js_lt{'p_mab_alrt2'}"); |
|
} |
|
} |
|
} |
|
|
|
function makenew(targetform) { |
|
targetform.submit(); |
} |
} |
|
|
|
function changename(folderpath,index,oldtitle) { |
|
var title=prompt('$js_lt{"p_chn"}',oldtitle); |
|
if (title) { |
|
this.document.forms.renameform.markcopy.value=''; |
|
this.document.forms.renameform.title.value=title; |
|
this.document.forms.renameform.cmd.value='rename_'+index; |
|
this.document.forms.renameform.folderpath.value=folderpath; |
|
this.document.forms.renameform.submit(); |
|
} |
} |
} |
|
|
|
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 |
|
} else { |
|
$jsmakefunctions = <<ENDNEWSCRIPT; |
|
|
|
function makenewfolder() { |
|
alert("$js_lt{'edri'}"); |
|
} |
|
|
|
function makenewpage() { |
|
alert("$js_lt{'edri'}"); |
|
} |
|
|
|
function makeexamupload() { |
|
alert("$js_lt{'edri'}"); |
|
} |
|
|
|
function makesmppage() { |
|
alert("$js_lt{'edri'}"); |
|
} |
|
|
|
function makewebpage(type) { |
|
alert("$js_lt{'edri'}"); |
|
} |
|
|
|
function makesmpproblem() { |
|
alert("$js_lt{'edri'}"); |
|
} |
|
|
|
function makedropbox() { |
|
alert("$js_lt{'edri'}"); |
|
} |
|
|
|
function makebulboard() { |
|
alert("$js_lt{'edri'}"); |
|
} |
|
|
|
function makeabout() { |
|
alert("$js_lt{'edri'}"); |
|
} |
|
|
|
function changename() { |
|
alert("$js_lt{'edri'}"); |
|
} |
|
|
|
function setalias() { |
|
alert("$js_lt{'edri'}"); |
|
} |
|
|
|
function delalias() { |
|
alert("$js_lt{'edri'}"); |
|
} |
|
|
|
function makenew() { |
|
alert("$js_lt{'edri'}"); |
|
} |
|
|
|
function groupimport() { |
|
alert("$js_lt{'edri'}"); |
|
} |
|
|
|
function groupsearch() { |
|
alert("$js_lt{'edri'}"); |
|
} |
|
|
|
function groupopen(url,recover) { |
|
var options="scrollbars=1,resizable=1,menubar=0"; |
|
idxflag=1; |
|
idx=open("/adm/groupsort?inhibitmenu=yes&mode=simple&recover="+recover+"&readfile="+url,"idxout",options); |
|
idx.focus(); |
|
} |
|
|
|
ENDNEWSCRIPT |
|
|
|
} |
|
return <<ENDSCRIPT; |
|
|
|
$jsmakefunctions |
|
|
function toggleUpload(caller) { |
function toggleUpload(caller) { |
var blocks = Array($fieldsets); |
var blocks = Array($fieldsets); |
for (var i=0; i<blocks.length; i++) { |
for (var i=0; i<blocks.length; i++) { |
Line 5866 function toggleUpload(caller) {
|
Line 7518 function toggleUpload(caller) {
|
} |
} |
} |
} |
document.getElementById('upload'+blocks[i]+'form').style.display=disp; |
document.getElementById('upload'+blocks[i]+'form').style.display=disp; |
|
if ((caller == 'tool') || (caller == 'supptool')) { |
|
if (disp == 'block') { |
|
if (document.getElementById('LC_exttoolid')) { |
|
var toolselector = document.getElementById('LC_exttoolid'); |
|
var suppflag = 0; |
|
if (caller == 'supptool') { |
|
suppflag = 1; |
|
} |
|
currForm = document.getElementById('new'+caller); |
|
updateExttool(toolselector,currForm,suppflag); |
|
} |
|
} |
|
} |
} |
} |
resize_scrollbox('contentscroll','1','1'); |
resize_scrollbox('contentscroll','1','1'); |
return; |
return; |
Line 5886 function toggleMap(caller) {
|
Line 7551 function toggleMap(caller) {
|
return; |
return; |
} |
} |
|
|
|
function toggleCrsRes(caller,numauthorrole,numcrsdirs) { |
|
var disp = 'none'; |
|
if (document.getElementById('crsresform')) { |
|
if (caller == 'res') { |
|
var curr = document.getElementById('crsresform').style.display; |
|
if (curr == 'none') { |
|
disp='block'; |
|
numauthor = parseInt(numauthorrole); |
|
if (numauthor > 0) { |
|
document.courseresform.authorrole.selectedIndex = 0; |
|
select1priv_changed(); |
|
document.courseresform.authorpath.selectedIndex = 0; |
|
document.courseresform.newresourceadd.selectedIndex = 0; |
|
toggleNewInCourse(document.courseresform); |
|
if (document.getElementById('newresource')) { |
|
document.getElementById('newresource').style.display = 'none'; |
|
} |
|
} else { |
|
if (numcrsdirs) { |
|
document.courseresform.authorpath.selectedIndex = 0; |
|
} |
|
} |
|
if (document.courseresform.newresusetemp.length) { |
|
document.courseresform.newresusetemp[0].checked = true; |
|
toggleWithTemplate(document.courseresform); |
|
} |
|
document.courseresform.newresourcename.value = ''; |
|
} |
|
} |
|
if (document.courseresform.newsubdir.length) { |
|
for (var j=0; j<document.courseresform.newsubdir.length; j++) { |
|
if (document.courseresform.newsubdir[j].value == 0) { |
|
document.courseresform.newsubdir[j].checked = true; |
|
} |
|
break; |
|
} |
|
if (document.getElementById('newsubdirname')) { |
|
document.getElementById('newsubdirname').type = "hidden"; |
|
document.getElementById('newsubdirname').value = ""; |
|
} |
|
if (document.getElementById('newsubdir')) { |
|
document.getElementById('newsubdir').innerHTML = ""; |
|
} |
|
} |
|
document.getElementById('crsresform').style.display=disp; |
|
resize_scrollbox('contentscroll','1','0'); |
|
} |
|
return; |
|
} |
|
|
|
function toggleNewsubdir(form) { |
|
if (form.newsubdir.length) { |
|
for (var j=0; j<form.newsubdir.length; j++) { |
|
if (form.newsubdir[j].checked) { |
|
if (document.getElementById('newsubdirname')) { |
|
if (form.newsubdir[j].value == '1') { |
|
document.getElementById('newsubdirname').type = "text"; |
|
if (document.getElementById('newsubdir')) { |
|
document.getElementById('newsubdir').innerHTML = '<br />$js_lt{'sunm'}'; |
|
} |
|
} else { |
|
document.getElementById('newsubdirname').type = "hidden"; |
|
document.getElementById('newsubdirname').value = ""; |
|
document.getElementById('newsubdir').innerHTML = ""; |
|
} |
|
} |
|
break; |
|
} |
|
} |
|
} |
|
} |
|
|
|
function toggleCrsResTitle() { |
|
if (document.getElementById('newresource')) { |
|
if (document.courseresform.authorrole.options[document.courseresform.authorrole.selectedIndex].value == 'course') { |
|
document.getElementById('newresource').style.display = 'inline'; |
|
document.courseresform.newresourceadd[0].checked = true; |
|
toggleNewInCourse(document.courseresform); |
|
} else { |
|
document.getElementById('newresource').style.display = 'none'; |
|
} |
|
} |
|
} |
|
|
|
function toggleNewInCourse(form) { |
|
if (form.newresourceadd.length) { |
|
for (var i=0; i<form.newresourceadd.length; i++) { |
|
if (form.newresourceadd[i].checked) { |
|
if (document.getElementById('newresourcetitle')) { |
|
if (form.newresourceadd[i].value == '1') { |
|
document.getElementById('newresourcetitle').type = 'text'; |
|
if (document.getElementById('newrestitle')) { |
|
document.getElementById('newrestitle').innerHTML = "<br />$js_lt{'tinc'}"; |
|
} |
|
} else { |
|
document.getElementById('newresourcetitle').type = 'hidden'; |
|
document.getElementById('newresourcetitle').value = ''; |
|
if (document.getElementById('newrestitle')) { |
|
document.getElementById('newrestitle').innerHTML = ''; |
|
} |
|
} |
|
} |
|
break; |
|
} |
|
} |
|
} |
|
} |
|
|
|
function toggleWithTemplate(form) { |
|
if (form.newresusetemp.length) { |
|
for (var i=0; i<form.newresusetemp.length; i++) { |
|
if (form.newresusetemp[i].checked) { |
|
if (document.getElementById('newrestemplate')) { |
|
if (form.newresusetemp[i].value == '1') { |
|
document.getElementById('newrestemplate').style.display = 'inline'; |
|
toggleExampleText(); |
|
} else { |
|
form.tempcategory.selectedIndex = 0; |
|
select1template_changed(); |
|
document.getElementById('newrestemplate').style.display = 'none'; |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
|
|
function toggleExampleText() { |
|
if (document.getElementById('newresexample')) { |
|
var url = document.courseresform.template.options[document.courseresform.template.selectedIndex].value; |
|
if (url == '') { |
|
document.getElementById('newresexample').style.fontWeight = 'normal'; |
|
} else { |
|
document.getElementById('newresexample').style.fontWeight = 'bold'; |
|
} |
|
} |
|
} |
|
|
|
function getExample(width,height,scrolling,transparency) { |
|
var url; |
|
if (document.courseresform.newresusetemp.length) { |
|
for (var i=0; i<document.courseresform.newresusetemp.length; i++) { |
|
if (document.courseresform.newresusetemp[i].checked) { |
|
if (document.courseresform.newresusetemp[i].value == '1') { |
|
var url = document.courseresform.template.options[document.courseresform.template.selectedIndex].value; |
|
if (url == '') { |
|
alert('Pick a category and template'); |
|
} else { |
|
url = url.replace("$londocroot",""); |
|
url += '?inhibitmenu=yes'; |
|
} |
|
} |
|
break; |
|
} |
|
} |
|
} |
|
if (url != '') { |
|
openMyModal(url,width,height,scrolling,transparency,''); |
|
} |
|
} |
|
|
|
function toggleImportCrsres(caller,dircount) { |
|
var disp = 'none'; |
|
if (document.getElementById('importcrsresform')) { |
|
if (caller == 'res') { |
|
var numdirs = parseInt(dircount); |
|
var curr = document.getElementById('importcrsresform').style.display; |
|
if (curr == 'none') { |
|
disp='block'; |
|
if (numdirs > 1) { |
|
select1res_changed(); |
|
} |
|
} |
|
} |
|
document.getElementById('importcrsresform').style.display=disp; |
|
resize_scrollbox('contentscroll','1','0'); |
|
} |
|
return; |
|
} |
|
|
function makeims(imsform) { |
function makeims(imsform) { |
if ((imsform.uploaddoc.value == '') || (!imsform.uploaddoc.value)) { |
if ((imsform.uploaddoc.value == '') || (!imsform.uploaddoc.value)) { |
alert("$lt{'imsfile'}"); |
alert("$js_lt{'imsfile'}"); |
return; |
return; |
} |
} |
if (imsform.source.selectedIndex == 0) { |
if (imsform.source.selectedIndex == 0) { |
alert("$lt{'imscms'}"); |
alert("$js_lt{'imscms'}"); |
return; |
return; |
} |
} |
newWindow = window.open('', 'IMSimport',"HEIGHT=700,WIDTH=750,scrollbars=yes"); |
newWindow = window.open('', 'IMSimport',"HEIGHT=700,WIDTH=750,scrollbars=yes"); |
imsform.submit(); |
imsform.submit(); |
} |
} |
|
|
function changename(folderpath,index,oldtitle) { |
|
var title=prompt('$lt{"p_chn"}',oldtitle); |
|
if (title) { |
|
this.document.forms.renameform.markcopy.value=''; |
|
this.document.forms.renameform.title.value=title; |
|
this.document.forms.renameform.cmd.value='rename_'+index; |
|
this.document.forms.renameform.folderpath.value=folderpath; |
|
this.document.forms.renameform.submit(); |
|
} |
|
} |
|
|
|
function updatePick(targetform,index,caller) { |
function updatePick(targetform,index,caller) { |
var pickitem; |
var pickitem; |
var picknumitem; |
var picknumitem; |
Line 5924 function updatePick(targetform,index,cal
|
Line 7758 function updatePick(targetform,index,cal
|
picknumtext = document.getElementById('randompicknum_'+index); |
picknumtext = document.getElementById('randompicknum_'+index); |
} |
} |
if (pickitem.checked) { |
if (pickitem.checked) { |
var picknum=prompt('$lt{"rpck"}',picknumitem.value); |
var picknum=prompt('$js_lt{"rpck"}',picknumitem.value); |
if (picknum == '' || picknum == null) { |
if (picknum == '' || picknum == null) { |
if (caller == 'check') { |
if (caller == 'check') { |
pickitem.checked=false; |
pickitem.checked=false; |
Line 6074 function propagateState(form,param) {
|
Line 7908 function propagateState(form,param) {
|
return; |
return; |
} |
} |
|
|
function checkForSubmit(targetform,param,context,idx,folderpath,index,oldtitle,skip_confirm,container,folder) { |
function checkForSubmit(targetform,param,context,idx,folderpath,index,oldtitle,skip_confirm,container,folder,confirm_removal) { |
|
var canedit = '$canedit'; |
|
if (canedit == '') { |
|
alert("$js_lt{'edri'}"); |
|
return; |
|
} |
var dosettings; |
var dosettings; |
var doaction; |
var doaction; |
var control = document.togglemultsettings; |
var control = document.togglemultsettings; |
Line 6112 function checkForSubmit(targetform,param
|
Line 7951 function checkForSubmit(targetform,param
|
targetform.markcopy.value=idx+':'+param; |
targetform.markcopy.value=idx+':'+param; |
targetform.copyfolder.value=folder+'.'+container; |
targetform.copyfolder.value=folder+'.'+container; |
if (param == 'remove') { |
if (param == 'remove') { |
if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) { |
var doremove = 0; |
|
if (skip_confirm) { |
|
if (confirm_removal) { |
|
if (confirm('$js_lt{"p_rmr4"}\\n$js_lt{"p_rmr5"}\\n\\n$js_lt{"p_rmr2a"} "'+oldtitle+'"$js_lt{"p_rmr2b"}')) { |
|
doremove = 1; |
|
} |
|
} else { |
|
doremove = 1; |
|
} |
|
} else { |
|
if (confirm('$js_lt{"p_rmr1"}\\n\\n$js_lt{"p_rmr2a"} "'+oldtitle+'" $js_lt{"p_rmr2b"}')) { |
|
doremove = 1; |
|
} |
|
} |
|
if (doremove) { |
targetform.markcopy.value=''; |
targetform.markcopy.value=''; |
targetform.copyfolder.value=''; |
targetform.copyfolder.value=''; |
targetform.submit(); |
targetform.submit(); |
} |
} |
} |
} |
if (param == 'cut') { |
if (param == 'cut') { |
if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) { |
if (skip_confirm || confirm('$js_lt{"p_ctr1a"}\\n$js_lt{"p_ctr1b"}\\n\\n$js_lt{"p_ctr2a"} "'+oldtitle+'" $js_lt{"p_ctr2b"}')) { |
targetform.submit(); |
targetform.submit(); |
return; |
return; |
} |
} |
Line 6184 for (i = 0; i < currentLis.length; i++)
|
Line 8037 for (i = 0; i < currentLis.length; i++)
|
|
|
function hideAll(current, nav, data) { |
function hideAll(current, nav, data) { |
unselectInactive(nav); |
unselectInactive(nav); |
if (current) { |
if (current) { |
if (current.className == 'right'){ |
if (current.className == 'right'){ |
current.className = 'right active' |
current.className = 'right active' |
} else { |
} else { |
current.className = 'active'; |
current.className = 'active'; |
} |
} |
} |
} |
currentData = document.getElementById(data); |
currentData = document.getElementById(data); |
Line 6226 function showPage(current, pageId, nav,
|
Line 8079 function showPage(current, pageId, nav,
|
unselectInactive(nav); |
unselectInactive(nav); |
if ((currstate == 'active') || (currstate == 'right active')) { |
if ((currstate == 'active') || (currstate == 'right active')) { |
if (currstate == 'active') { |
if (currstate == 'active') { |
current.className = ''; |
current.className = ''; |
} else { |
} else { |
current.className = 'right'; |
current.className = 'right'; |
} |
} |
activeTab = ''; |
activeTab = ''; |
toggleUpload(); |
toggleUpload(); |
toggleMap(); |
toggleMap(); |
|
toggleCrsRes(); |
|
toggleImportCrsres(); |
resize_scrollbox('contentscroll','1','0'); |
resize_scrollbox('contentscroll','1','0'); |
return; |
return; |
} else { |
} else { |
Line 6243 function showPage(current, pageId, nav,
|
Line 8098 function showPage(current, pageId, nav,
|
activeTab = pageId; |
activeTab = pageId; |
toggleUpload(); |
toggleUpload(); |
toggleMap(); |
toggleMap(); |
|
toggleCrsRes(); |
|
toggleImportCrsres(); |
if (nav == 'mainnav') { |
if (nav == 'mainnav') { |
var storedpath = "$docs_folderpath"; |
var storedpath = "$docs_folderpath"; |
var storedpage = "$main_container_page"; |
var storedpage = "$main_container_page"; |
Line 6298 function togglePick(caller,value) {
|
Line 8155 function togglePick(caller,value) {
|
} |
} |
document.getElementById('multi'+caller).style.display=disp; |
document.getElementById('multi'+caller).style.display=disp; |
if (value == 1) { |
if (value == 1) { |
document.getElementById('more'+caller).innerHTML = ' <a href="javascript:toggleCheckUncheck(\\''+caller+'\\',1);" style="text-decoration:none;">$lt{'more'}</a>'; |
document.getElementById('more'+caller).innerHTML = ' <a href="javascript:toggleCheckUncheck(\\''+caller+'\\',1);" style="text-decoration:none;">$js_lt{'more'}</a>'; |
} else { |
} else { |
document.getElementById('more'+caller).innerHTML = ''; |
document.getElementById('more'+caller).innerHTML = ''; |
} |
} |
Line 6324 function togglePick(caller,value) {
|
Line 8181 function togglePick(caller,value) {
|
|
|
function toggleCheckUncheck(caller,more) { |
function toggleCheckUncheck(caller,more) { |
if (more == 1) { |
if (more == 1) { |
document.getElementById('more'+caller).innerHTML = ' <a href="javascript:toggleCheckUncheck(\\''+caller+'\\',0);" style="text-decoration:none;">$lt{'less'}</a>'; |
document.getElementById('more'+caller).innerHTML = ' <a href="javascript:toggleCheckUncheck(\\''+caller+'\\',0);" style="text-decoration:none;">$js_lt{'less'}</a>'; |
document.getElementById('allfields'+caller).style.display='block'; |
document.getElementById('allfields'+caller).style.display='block'; |
} else { |
} else { |
document.getElementById('more'+caller).innerHTML = ' <a href="javascript:toggleCheckUncheck(\\''+caller+'\\',1);" style="text-decoration:none;">$lt{'more'}</a>'; |
document.getElementById('more'+caller).innerHTML = ' <a href="javascript:toggleCheckUncheck(\\''+caller+'\\',1);" style="text-decoration:none;">$js_lt{'more'}</a>'; |
document.getElementById('allfields'+caller).style.display='none'; |
document.getElementById('allfields'+caller).style.display='none'; |
} |
} |
resize_scrollbox('contentscroll','1','1'); |
resize_scrollbox('contentscroll','1','1'); |
Line 6369 function checkSubmits() {
|
Line 8226 function checkSubmits() {
|
var doactions = multiActions(); |
var doactions = multiActions(); |
var cutwarnings = 0; |
var cutwarnings = 0; |
var remwarnings = 0; |
var remwarnings = 0; |
|
var removalinfo = 0; |
if (doactions == 1) { |
if (doactions == 1) { |
var remidxlist = document.cumulativeactions.allremoveidx.value; |
var remidxlist = document.cumulativeactions.allremoveidx.value; |
if ((remidxlist != '') && (remidxlist != null)) { |
if ((remidxlist != '') && (remidxlist != null)) { |
Line 6383 function checkSubmits() {
|
Line 8241 function checkSubmits() {
|
remwarnings ++; |
remwarnings ++; |
} |
} |
} |
} |
|
if (document.getElementById('confirm_removal_'+remidxs[i])) { |
|
if (document.getElementById('confirm_removal_'+remidxs[i]).value == 1) { |
|
removalinfo ++; |
|
} |
|
} |
} |
} |
} |
} |
} |
} |
Line 6481 function checkSubmits() {
|
Line 8344 function checkSubmits() {
|
} |
} |
if (doactions == 1) { |
if (doactions == 1) { |
if (numchanges > 0) { |
if (numchanges > 0) { |
if ((cutwarnings > 0) || (remwarnings > 0)) { |
if ((cutwarnings > 0) || (remwarnings > 0) || (removalinfo > 0)) { |
if (remwarnings > 0) { |
if (remwarnings > 0) { |
if (!confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr3a"} '+remwarnings+' $lt{"p_rmr3b"}')) { |
if (!confirm('$js_lt{"p_rmr1"}\\n\\n$js_lt{"p_rmr3a"} '+remwarnings+' $js_lt{"p_rmr3b"}')) { |
|
return false; |
|
} |
|
} |
|
if (removalinfo > 0) { |
|
if (!confirm('$js_lt{"p_rmr4"}\\n$js_lt{"p_rmr5"}\\n\\n$js_lt{"p_rmr3a"} '+removalinfo+' $js_lt{"p_rmr3b"}')) { |
return false; |
return false; |
} |
} |
} |
} |
if (cutwarnings > 0) { |
if (cutwarnings > 0) { |
if (!confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr3a"} '+cutwarnings+' $lt{"p_ctr3b"}')) { |
if (!confirm('$js_lt{"p_ctr1a"}\\n$js_lt{"p_ctr1b"}\\n\\n$js_lt{"p_ctr3a"} '+cutwarnings+' $js_lt{"p_ctr3b"}')) { |
return false; |
return false; |
} |
} |
} |
} |
Line 6504 function checkSubmits() {
|
Line 8372 function checkSubmits() {
|
} |
} |
} |
} |
if ((dosettings == 1) && (doactions == 1)) { |
if ((dosettings == 1) && (doactions == 1)) { |
alert("$lt{'noor'}"); |
alert("$js_lt{'noor'}"); |
} else { |
} else { |
if (dosettings == 1) { |
if (dosettings == 1) { |
alert("$lt{'noch'}"); |
alert("$js_lt{'noch'}"); |
} else { |
} else { |
alert("$lt{'noac'}"); |
alert("$js_lt{'noac'}"); |
} |
} |
} |
} |
return false; |
return false; |
Line 6595 function setBoxes(value) {
|
Line 8463 function setBoxes(value) {
|
return; |
return; |
} |
} |
|
|
ENDNEWSCRIPT |
function validImportCrsRes() { |
|
var path = document.crsresimportform.coursepath.options[document.crsresimportform.coursepath.selectedIndex].value; |
|
var fname = document.crsresimportform.coursefile.options[document.crsresimportform.coursefile.selectedIndex].value; |
|
if ((fname == '') || (fname == null)) { |
|
alert("$js_lt{'nofi'}"); |
|
return false; |
|
} |
|
var url = '/res/$coursedom/$coursenum/'; |
|
if (path && path != '/') { |
|
url += path+'/'; |
|
} |
|
if (fname != '') { |
|
url += fname; |
|
} |
|
var title = document.crsresimportform.crsrestitle.value; |
|
document.crsresimportform.importdetail.value=escape(title)+'='+escape(url); |
|
return true; |
|
} |
|
|
|
function validateNewRes(caller) { |
|
if (caller == 'single') { |
|
var role = document.courseresform.authorrole.options[document.courseresform.authorrole.selectedIndex].value; |
|
var authorpath = document.courseresform.authorpath.options[document.courseresform.authorpath.selectedIndex].value; |
|
var resname = document.courseresform.newresourcename.value; |
|
} |
|
} |
|
|
|
ENDSCRIPT |
} |
} |
|
|
sub history_tab_js { |
sub history_tab_js { |
Line 6624 ENDINJECT
|
Line 8519 ENDINJECT
|
|
|
sub dump_switchserver_js { |
sub dump_switchserver_js { |
my @hosts = @_; |
my @hosts = @_; |
my %lt = &Apache::lonlocal::texthash( |
my %js_lt = &Apache::lonlocal::texthash( |
dump => 'Copying Content to Authoring Space requires switching server.', |
dump => 'Copying content to Authoring Space requires switching server.', |
|
swit => 'Switch server?', |
|
); |
|
my %html_js_lt = &Apache::lonlocal::texthash( |
swit => 'Switch server?', |
swit => 'Switch server?', |
duco => 'Copying Content to Authoring Space', |
duco => 'Copying Content to Authoring Space', |
yone => 'You need to switch to a server housing an Authoring Space for which you are author or co-author.', |
yone => 'You need to switch to a server housing an Authoring Space for which you are author or co-author.', |
chos => 'Choose server', |
chos => 'Choose server', |
); |
); |
|
&js_escape(\%js_lt); |
|
&html_escape(\%html_js_lt); |
|
&js_escape(\%html_js_lt); |
my $role = $env{'request.role'}; |
my $role = $env{'request.role'}; |
my $js = <<"ENDSWJS"; |
my $js = <<"ENDSWJS"; |
<script type="text/javascript"> |
<script type="text/javascript"> |
Line 6671 ENDSWJS
|
Line 8572 ENDSWJS
|
|
|
function dump_needs_switchserver(url) { |
function dump_needs_switchserver(url) { |
if (url!='' && url!= null) { |
if (url!='' && url!= null) { |
if (confirm("$lt{'dump'}\\n$lt{'swit'}")) { |
if (confirm("$js_lt{'dump'}\\n$js_lt{'swit'}")) { |
go(url); |
go(url); |
} |
} |
} |
} |
Line 6682 function choose_switchserver_window() {
|
Line 8583 function choose_switchserver_window() {
|
newWindow = window.open('','ChooseServer','height=400,width=500,scrollbars=yes') |
newWindow = window.open('','ChooseServer','height=400,width=500,scrollbars=yes') |
newWindow.document.open(); |
newWindow.document.open(); |
newWindow.document.writeln('$startpage'); |
newWindow.document.writeln('$startpage'); |
newWindow.document.write('<h3>$lt{'duco'}<\\/h3>\\n'+ |
newWindow.document.write('<h3>$html_js_lt{'duco'}<\\/h3>\\n'+ |
'<p>$lt{'yone'}<\\/p>\\n'+ |
'<p>$html_js_lt{'yone'}<\\/p>\\n'+ |
'<div class="LC_left_float"><fieldset><legend>$lt{'chos'}<\\/legend>\\n'+ |
'<div class="LC_left_float"><fieldset><legend>$html_js_lt{'chos'}<\\/legend>\\n'+ |
'<form name="setserver" method="post" action="" \\/>\\n'+ |
'<form name="setserver" method="post" action="" \\/>\\n'+ |
'$hostpicker\\n'+ |
'$hostpicker\\n'+ |
'<br \\/><br \\/>\\n'+ |
'<br \\/><br \\/>\\n'+ |
'<input type="button" name="makeswitch" value="$lt{'swit'}" '+ |
'<input type="button" name="makeswitch" value="$html_js_lt{'swit'}" '+ |
'onclick="write_switchserver();" \\/>\\n'+ |
'onclick="write_switchserver();" \\/>\\n'+ |
'<\\/form><\\/fieldset><\\/div><br clear="all" \\/>\\n'); |
'<\\/form><\\/fieldset><\\/div><br clear="all" \\/>\\n'); |
newWindow.document.writeln('$endpage'); |
newWindow.document.writeln('$endpage'); |
Line 6719 sub makesimpleeditform {
|
Line 8620 sub makesimpleeditform {
|
SIMPFORM |
SIMPFORM |
} |
} |
|
|
|
sub makenewproblem { |
|
my ($r,$coursedom,$coursenum) = @_; |
|
# Creating a new problem |
|
my ($redirect,$error); |
|
if ($env{'form.authorrole'}) { |
|
my ($newsubdir,$filename); |
|
if ($env{'form.newsubdir'}) { |
|
if ($env{'form.newsubdirname'} ne '') { |
|
$newsubdir = $env{'form.newsubdirname'}; |
|
} |
|
} |
|
if ($env{'form.newresourcename'}) { |
|
$filename = $env{'form.newresourcename'}; |
|
$filename =~ s/\.(\d+)(\.\w+)$/$2/; |
|
$filename =~ s/`//g; |
|
$filename =~ s{/\.\./}{_}g; |
|
$filename =~ s/\.+/./g; |
|
$filename =~ s{/+}{_}g; |
|
if ($filename ne '') { |
|
my ($name,$ext) = ($filename =~ /(.+)\.([^.]+)$/); |
|
if (($ext) && ($ext ne '.problem')) { |
|
$filename = $name.'.problem'; |
|
} elsif ($ext eq '') { |
|
$filename .= '.problem'; |
|
} |
|
my $docroot = $r->dir_config('lonDocRoot'); |
|
my @ids=&Apache::lonnet::current_machine_ids(); |
|
if ($env{'form.authorrole'} eq 'author') { |
|
if ($env{'user.author'}) { |
|
if ($env{'user.home'} && grep(/^\Q$env{'user.home'}\E$/,@ids)) { |
|
my $url = "/priv/$env{'user.domain'}/$env{'user.name'}"; |
|
my $path = $docroot.$url; |
|
my $subdir = $env{'form.authorpath'}; |
|
$redirect = &finishnewprob($url,$path,$subdir,$newsubdir,$filename); |
|
} |
|
} |
|
} elsif ($env{'form.authorrole'} eq 'course') { |
|
my $chome = $env{'course.'.$env{'request.course.id'}.'.home'}; |
|
if ($chome && grep(/^\Q$chome\E$/,@ids)) { |
|
my $url = "/priv/$coursedom/$coursenum"; |
|
my $path=$docroot.$url; |
|
my $subdir = $env{'form.authorpath'}; |
|
$redirect = &finishnewprob($url,$path,$subdir,$newsubdir,$filename); |
|
if ($redirect) { |
|
my $rightsfile = 'default.rights'; |
|
my $sourcerights = "$path/$rightsfile"; |
|
my $targetrights = $docroot."/res/$coursedom/$coursenum/$rightsfile"; |
|
my $now = time; |
|
if (!-e $sourcerights) { |
|
my $cid = $coursedom.'_'.$coursenum; |
|
if (open(my $fh,">$sourcerights")) { |
|
print $fh <<END; |
|
<accessrule effect="deny" realm="" type="course" role="" /> |
|
<accessrule effect="allow" realm="$cid" type="course" role="" /> |
|
END |
|
close($fh); |
|
} |
|
} |
|
if (!-e "$sourcerights.meta") { |
|
if (open(my $fh,">$sourcerights.meta")) { |
|
my $author=$env{'environment.firstname'}.' '. |
|
$env{'environment.middlename'}.' '. |
|
$env{'environment.lastname'}.' '. |
|
$env{'environment.generation'}; |
|
$author =~ s/\s+$//; |
|
print $fh <<"END"; |
|
|
|
<abstract></abstract> |
|
<author>$author</author> |
|
<authorspace>$coursenum:$coursedom</authorspace> |
|
<copyright>private</copyright> |
|
<creationdate>$now</creationdate> |
|
<customdistributionfile></customdistributionfile> |
|
<dependencies></dependencies> |
|
<domain>$coursedom</domain> |
|
<highestgradelevel>0</highestgradelevel> |
|
<keywords></keywords> |
|
<language>notset </language> |
|
<lastrevisiondate>$now</lastrevisiondate> |
|
<lowestgradelevel>0</lowestgradelevel> |
|
<mime>rights</mime> |
|
<modifyinguser>$env{'user.name'}:$env{'user.domain'}</modifyinguser> |
|
<notes></notes> |
|
<obsolete></obsolete> |
|
<obsoletereplacement></obsoletereplacement> |
|
<owner>$coursenum:$coursedom</owner> |
|
<rule>deny:::course,allow:$cid::course</rule> |
|
<sourceavail></sourceavail> |
|
<standards></standards> |
|
<subject></subject> |
|
<title></title> |
|
END |
|
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'}) { |
|
my $template = $env{'form.template'}; |
|
my $source = $docroot.$redirect; |
|
my $target = $redirect; |
|
$target =~ s{^/priv/}{/res/}; |
|
$target = $docroot.$target; |
|
if (!-e $source) { |
|
my $copyfrom; |
|
if ($template) { |
|
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; |
|
} |
|
} |
|
unless ($copyfrom) { |
|
$copyfrom = $r->dir_config('lonIncludes').'/templates/blank.problem'; |
|
} |
|
&File::Copy::copy($copyfrom,$source); |
|
} |
|
if (!-e "$source.meta") { |
|
my $cid = $coursedom.'_'.$coursenum; |
|
my $now = time; |
|
if (open(my $fh,">$source.meta")) { |
|
my $author=$env{'environment.firstname'}.' '. |
|
$env{'environment.middlename'}.' '. |
|
$env{'environment.lastname'}.' '. |
|
$env{'environment.generation'}; |
|
$author =~ s/\s+$//; |
|
my $title = $env{'form.newresourcetitle'}; |
|
$title =~ s/^\s+|\s+$//g; |
|
print $fh <<END; |
|
|
|
<abstract></abstract> |
|
<author>$author</author> |
|
<authorspace>$coursenum:$coursedom</authorspace> |
|
<copyright>custom</copyright> |
|
<creationdate>$now</creationdate> |
|
<customdistributionfile>/res/$coursedom/$coursenum/default.rights</customdistributionfile> |
|
<dependencies></dependencies> |
|
<domain>$coursedom</domain> |
|
<highestgradelevel>0</highestgradelevel> |
|
<keywords></keywords> |
|
<language>notset </language> |
|
<lastrevisiondate>$now</lastrevisiondate> |
|
<lowestgradelevel>0</lowestgradelevel> |
|
<mime>problem</mime> |
|
<modifyinguser>$coursenum:$coursedom</modifyinguser> |
|
<notes></notes> |
|
<obsolete></obsolete> |
|
<obsoletereplacement></obsoletereplacement> |
|
<owner>$coursenum:$coursedom</owner> |
|
<sourceavail></sourceavail> |
|
<standards></standards> |
|
<subject></subject> |
|
<title>$title</title> |
|
END |
|
close($fh); |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} else { |
|
my ($auname,$audom,$role) = split('___',$env{'form.authorrole'}); |
|
my $rolehome = &Apache::lonnet::homeserver($auname,$audom); |
|
if (grep(/^\Q$rolehome\E$/,@ids)) { |
|
my $now = time; |
|
if (exists($env{'user.role.'.$role.'./'.$audom.'/'.$auname})) { |
|
my ($start,$end) = split(/\./,$env{'user.role.'.$role.'./'.$audom.'/'.$auname}); |
|
if (($start <= $now) && (($end == 0) || ($end >= $now))) { |
|
my $url = "/priv/$audom/$auname"; |
|
my $path = $r->dir_config('lonDocRoot').$url; |
|
my $subdir = $env{'form.authorpath'}; |
|
$redirect = &finishnewprob($url,$path,$subdir,$newsubdir,$filename); |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
} |
|
return ($redirect,$error); |
|
} |
|
|
|
sub finishnewprob { |
|
my ($url,$path,$subdir,$newsubdir,$filename) = @_; |
|
unless (-d $path) { |
|
unless (mkdir($path,02770)) { |
|
return; |
|
} |
|
} |
|
my $redirect; |
|
if ($subdir ne '/') { |
|
$subdir = &cleandir($subdir); |
|
if (($subdir ne '') && (-d "$path/$subdir")) { |
|
$path .= "/$subdir"; |
|
$url .= "/$subdir"; |
|
} |
|
} |
|
my $dest; |
|
if ($newsubdir ne '') { |
|
$newsubdir = &cleandir($newsubdir); |
|
} |
|
if ($newsubdir ne '') { |
|
if (-d "$path/$newsubdir") { |
|
$dest = "$path/$newsubdir/$filename"; |
|
} else { |
|
my $dirok; |
|
unless (-e "$path/$newsubdir") { |
|
if (mkdir("$path/$newsubdir",02770)) { |
|
if (chmod(02770,"$path/$newsubdir")) { |
|
$dirok = 1; |
|
} |
|
} |
|
} |
|
if ($dirok) { |
|
$dest = "$path/$newsubdir/$filename"; |
|
} |
|
} |
|
if (($dest ne '') && (!-e $dest)) { |
|
$redirect = "$url/$newsubdir/$filename"; |
|
} |
|
} else { |
|
$dest = "$path/$filename"; |
|
if (($dest ne '') && (!-e $dest)) { |
|
$redirect = "$url/$filename"; |
|
} |
|
} |
|
return $redirect; |
|
} |
|
|
|
sub cleandir { |
|
my ($dir) = @_; |
|
$dir =~ s/^\s+//; |
|
$dir =~ s/\s+$//; |
|
$dir =~ s/\.+//g; |
|
$dir =~ s/[\#\?&%\":]//g; |
|
return $dir; |
|
} |
|
|
1; |
1; |
__END__ |
__END__ |
|
|
Line 6818 check on this
|
Line 8975 check on this
|
|
|
Verify Content |
Verify Content |
|
|
=item devalidateversioncache() & checkversions() |
=item devalidateversioncache() |
|
|
|
=item checkversions() |
|
|
Check Versions |
Check Versions |
|
|