|
version 1.484.2.93.2.5, 2023/01/18 22:38:46
|
version 1.722, 2025/01/07 21:01:37
|
|
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::loncourserespicker(); |
use Apache::loncourserespicker(); |
| use HTML::Entities; |
use HTML::Entities; |
| use HTML::TokeParser; |
use HTML::TokeParser; |
| |
use HTML::LCParser; |
| use GDBM_File; |
use GDBM_File; |
| use File::MMagic; |
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 86 sub storemap {
|
Line 91 sub storemap {
|
| |
|
| if ($map =~ /^default/) { |
if ($map =~ /^default/) { |
| $hadchanges=1; |
$hadchanges=1; |
| } else { |
} elsif ($contentchg) { |
| $suppchanges=1; |
$suppchanges=1; |
| } |
} |
| return ($errtext,0); |
return ($errtext,0); |
|
Line 98 sub authorhosts {
|
Line 103 sub authorhosts {
|
| my %outhash=(); |
my %outhash=(); |
| my $home=0; |
my $home=0; |
| my $other=0; |
my $other=0; |
| |
my @ids=&Apache::lonnet::current_machine_ids(); |
| foreach my $key (keys(%env)) { |
foreach my $key (keys(%env)) { |
| if ($key=~/^user\.role\.(au|ca)\.(.+)$/) { |
if ($key=~/^user\.role\.(au|ca)\.(.+)$/) { |
| my $role=$1; |
my $role=$1; |
|
Line 114 sub authorhosts {
|
Line 120 sub authorhosts {
|
| } |
} |
| my $allowed=0; |
my $allowed=0; |
| my $myhome=&Apache::lonnet::homeserver($ca,$cd); |
my $myhome=&Apache::lonnet::homeserver($ca,$cd); |
| my @ids=&Apache::lonnet::current_machine_ids(); |
|
| foreach my $id (@ids) { |
foreach my $id (@ids) { |
| if ($id eq $myhome) { |
if ($id eq $myhome) { |
| $allowed=1; |
$allowed=1; |
|
Line 178 sub default_folderpath {
|
Line 183 sub default_folderpath {
|
| } |
} |
| } |
} |
| |
|
| sub validate_folderpath { |
sub validate_supppath { |
| my ($supplementalflag) = @_; |
my ($coursenum,$coursedom) = @_; |
| if ($env{'form.folderpath'} ne '') { |
my $backto; |
| my @items = split(/\&/,$env{'form.folderpath'}); |
|
| my $badpath; |
|
| for (my $i=0; $i<@items; $i++) { |
|
| my $odd = $i%2; |
|
| if (($odd) && (!$supplementalflag) && ($items[$i] !~ /^[^:]*:(|\d+):(|1):(|1):(|1):(|1)$/)) { |
|
| $badpath = 1; |
|
| } elsif ((!$odd) && ($items[$i] !~ /^(default|supplemental)(|_\d+)$/)) { |
|
| $badpath = 1; |
|
| } |
|
| last if ($badpath); |
|
| } |
|
| if ($badpath) { |
|
| delete($env{'form.folderpath'}); |
|
| } |
|
| } |
|
| return; |
|
| } |
|
| |
|
| sub validate_suppath { |
|
| if ($env{'form.supppath'} ne '') { |
if ($env{'form.supppath'} ne '') { |
| my @items = split(/\&/,$env{'form.supppath'}); |
my @items = split(/\&/,$env{'form.supppath'}); |
| my $badpath; |
my ($badpath,$got_supp,$supppath,%supphidden,%suppids); |
| for (my $i=0; $i<@items; $i++) { |
for (my $i=0; $i<@items; $i++) { |
| my $odd = $i%2; |
my $odd = $i%2; |
| if ((!$odd) && ($items[$i] !~ /^supplemental(|_\d+)$/)) { |
if ((!$odd) && ($items[$i] !~ /^supplemental(|_\d+)$/)) { |
| $badpath = 1; |
$badpath = 1; |
| |
last; |
| |
} elsif ($odd) { |
| |
my $suffix; |
| |
my $idx = $i-1; |
| |
if ($items[$i] =~ /^([^:]*)::(|1):::$/) { |
| |
$backto .= '&'.$1; |
| |
} elsif ($items[$idx] eq 'supplemental') { |
| |
$backto .= '&'.$items[$i]; |
| |
} else { |
| |
$backto .= '&'.$items[$i]; |
| |
my $is_hidden; |
| |
unless ($got_supp) { |
| |
my ($supplemental) = &Apache::loncommon::get_supplemental($coursenum,$coursedom); |
| |
if (ref($supplemental) eq 'HASH') { |
| |
if (ref($supplemental->{'hidden'}) eq 'HASH') { |
| |
%supphidden = %{$supplemental->{'hidden'}}; |
| |
} |
| |
if (ref($supplemental->{'ids'}) eq 'HASH') { |
| |
%suppids = %{$supplemental->{'ids'}}; |
| |
} |
| |
} |
| |
$got_supp = 1; |
| |
} |
| |
if (ref($suppids{"/uploaded/$coursedom/$coursenum/$items[$idx].sequence"}) eq 'ARRAY') { |
| |
my $mapid = $suppids{"/uploaded/$coursedom/$coursenum/$items[$idx].sequence"}->[0]; |
| |
if ($supphidden{$mapid}) { |
| |
$is_hidden = 1; |
| |
} |
| |
} |
| |
$suffix = '::'.$is_hidden.':::'; |
| |
} |
| |
$supppath .= '&'.$items[$i].$suffix; |
| |
} else { |
| |
$supppath .= '&'.$items[$i]; |
| |
$backto .= '&'.$items[$i]; |
| } |
} |
| last if ($badpath); |
|
| } |
} |
| if ($badpath) { |
if ($badpath) { |
| delete($env{'form.supppath'}); |
delete($env{'form.supppath'}); |
| |
} else { |
| |
$supppath =~ s/^\&//; |
| |
$backto =~ s/^\&//; |
| |
$env{'form.supppath'} = $supppath; |
| } |
} |
| } |
} |
| return; |
return $backto; |
| } |
} |
| |
|
| sub dumpcourse { |
sub dumpcourse { |
|
Line 240 ENDJS
|
Line 264 ENDJS
|
| add_entries => {'onload' => "hide_searching();"}, |
add_entries => {'onload' => "hide_searching();"}, |
| }; |
}; |
| } |
} |
| $r->print(&Apache::loncommon::start_page('Copy '.$crstype.' Content to Authoring Space',$js,$starthash)."\n". |
$r->print(&Apache::loncommon::start_page('Copy uploaded content to Authoring Space',$js,$starthash)."\n". |
| &Apache::lonhtmlcommon::breadcrumbs('Copy '.$crstype.' Content to Authoring Space')."\n"); |
&Apache::lonhtmlcommon::breadcrumbs('Copy uploaded content to Authoring Space')."\n"); |
| $r->print(&startContentScreen('tools')); |
$r->print(&startContentScreen('tools')); |
| my ($home,$other,%outhash)=&authorhosts(); |
my ($home,$other,%outhash)=&authorhosts(); |
| unless ($home) { |
unless ($home) { |
| |
$r->print('<p class="LC_info">'.&mt('No author or co-author roles on this server.').'</p>'); |
| $r->print(&endContentScreen()); |
$r->print(&endContentScreen()); |
| return ''; |
return ''; |
| } |
} |
|
Line 253 ENDJS
|
Line 278 ENDJS
|
| if (($env{'form.authorspace'}) && ($env{'form.authorfolder'}=~/\w/)) { |
if (($env{'form.authorspace'}) && ($env{'form.authorfolder'}=~/\w/)) { |
| # Do the dumping |
# Do the dumping |
| unless ($outhash{'home_'.$env{'form.authorspace'}}) { |
unless ($outhash{'home_'.$env{'form.authorspace'}}) { |
| $r->print(&endContentScreen()); |
$r->print('<p class="LC_info">'.&mt('Selected Authoring Space is not on this server.').'</p>'. |
| |
&endContentScreen()); |
| return ''; |
return ''; |
| } |
} |
| my ($ca,$cd)=split(/\:/,$env{'form.authorspace'}); |
my ($ca,$cd)=split(/\:/,$env{'form.authorspace'}); |
|
Line 272 ENDJS
|
Line 298 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 283 ENDJS
|
Line 309 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 383 $contents{content}.'
|
Line 409 $contents{content}.'
|
| </div>'; |
</div>'; |
| } |
} |
| if ($contents{webreferences}) { |
if ($contents{webreferences}) { |
| $content .= ' |
$content .= ' |
| <div class="LC_Box"> |
<div class="LC_Box"> |
| <h4 class="LC_hcell">'.&mt('Web References').'</h4>'. |
<h4 class="LC_hcell">'.&mt('Web References').'</h4>'. |
| $contents{webreferences}.' |
$contents{webreferences}.' |
|
Line 393 $contents{webreferences}.'
|
Line 419 $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 427 $contents{webreferences}.'
|
Line 453 $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 481 $contents{webreferences}.'
|
Line 507 $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 507 $contents{webreferences}.'
|
Line 533 $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 549 $contents{webreferences}.'
|
Line 575 $contents{webreferences}.'
|
| if (!ref($navmap)) { |
if (!ref($navmap)) { |
| $r->print($errormsg); |
$r->print($errormsg); |
| } else { |
} else { |
| $r->print('<div id="searching">'.&mt('Searching ...').'</div>'); |
my $title=$origcrsdata{'description'}; |
| $r->rflush(); |
$title=~s/[\/\s]+/\_/gs; |
| my ($preamble,$formname); |
$title=&clean($title); |
| $formname = 'dumpdoc'; |
my $formname = 'dumpdoc'; |
| unless ($home==1) { |
my $preamble = &authorspace_selector($r,$formname,$home,$title,%outhash). |
| $preamble = '<div class="LC_left_float">'. |
'<div style="padding:0;clear:both;margin:0;border:0"></div>'."\n"; |
| '<fieldset><legend>'. |
my %uploadedfiles; |
| &mt('Select the Authoring Space'). |
&tiehash(); |
| '</legend><select name="authorspace">'; |
foreach my $file (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) { |
| } |
my ($ext)=($file=~/\.(\w+)$/); |
| my @orderspaces = (); |
|
| foreach my $key (sort(keys(%outhash))) { |
|
| if ($key=~/^home_(.+)$/) { |
|
| if ($1 eq $env{'user.name'}.':'.$env{'user.domain'}) { |
|
| unshift(@orderspaces,$1); |
|
| } else { |
|
| push(@orderspaces,$1); |
|
| } |
|
| } |
|
| } |
|
| if ($home>1) { |
|
| $preamble .= '<option value="" selected="selected">'.&mt('Select').'</option>'; |
|
| } |
|
| foreach my $user (@orderspaces) { |
|
| if ($home==1) { |
|
| $preamble .= '<input type="hidden" name="authorspace" value="'.$user.'" />'; |
|
| } else { |
|
| $preamble .= '<option value="'.$user.'">'.$user.' - '. |
|
| &Apache::loncommon::plainname(split(/\:/,$user)).'</option>'; |
|
| } |
|
| } |
|
| unless ($home==1) { |
|
| $preamble .= '</select></fieldset></div>'."\n"; |
|
| } |
|
| my $title=$origcrsdata{'description'}; |
|
| $title=~s/[\/\s]+/\_/gs; |
|
| $title=&clean($title); |
|
| $preamble .= '<div class="LC_left_float">'. |
|
| '<fieldset><legend>'.&mt('Folder in Authoring Space').'</legend>'. |
|
| '<input type="text" size="50" name="authorfolder" value="'. |
|
| $title.'" />'. |
|
| '</fieldset></div><div style="padding:0;clear:both;margin:0;border:0"></div>'."\n"; |
|
| my %uploadedfiles; |
|
| &tiehash(); |
|
| foreach my $file (&Apache::lonclonecourse::crsdirlist($origcrsid,'userfiles')) { |
|
| 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 617 $contents{webreferences}.'
|
Line 607 $contents{webreferences}.'
|
| $r->print(&endContentScreen()); |
$r->print(&endContentScreen()); |
| } |
} |
| |
|
| |
sub authorspace_selector { |
| |
my ($r,$formname,$home,$title,%outhash) = @_; |
| |
$r->print('<div id="searching">'.&mt('Searching ...').'</div>'."\n"); |
| |
$r->rflush(); |
| |
my $preamble; |
| |
unless ($home==1) { |
| |
$preamble = '<div class="LC_left_float">'. |
| |
'<fieldset><legend>'. |
| |
&mt('Select the Authoring Space'). |
| |
'</legend><select name="authorspace">'; |
| |
} |
| |
my @orderspaces = (); |
| |
foreach my $key (sort(keys(%outhash))) { |
| |
if ($key=~/^home_(.+)$/) { |
| |
if ($1 eq $env{'user.name'}.':'.$env{'user.domain'}) { |
| |
unshift(@orderspaces,$1); |
| |
} else { |
| |
push(@orderspaces,$1); |
| |
} |
| |
} |
| |
} |
| |
if ($home>1) { |
| |
$preamble .= '<option value="" selected="selected">'.&mt('Select').'</option>'; |
| |
} |
| |
foreach my $user (@orderspaces) { |
| |
if ($home==1) { |
| |
$preamble .= '<input type="hidden" name="authorspace" value="'.$user.'" />'; |
| |
} else { |
| |
$preamble .= '<option value="'.$user.'">'.$user.' - '. |
| |
&Apache::loncommon::plainname(split(/\:/,$user)).'</option>'; |
| |
} |
| |
} |
| |
unless ($home==1) { |
| |
$preamble .= '</select></fieldset></div>'."\n"; |
| |
} |
| |
$preamble .= '<div class="LC_left_float">'. |
| |
'<fieldset><legend>'.&mt('Folder in Authoring Space').'</legend>'. |
| |
'<input type="text" size="30" name="authorfolder" value="'.$title.'" />'."\n". |
| |
'</fieldset></div>'."\n"; |
| |
return $preamble; |
| |
} |
| |
|
| sub recurse_html { |
sub recurse_html { |
| my ($mm,$prefix,$currdirpath,$currurlpath,$container,$item,$replacehash,$deps) = @_; |
my ($mm,$prefix,$currdirpath,$currurlpath,$container,$item,$replacehash,$deps) = @_; |
| return unless ((ref($replacehash) eq 'HASH') && (ref($deps) eq 'HASH')); |
return unless ((ref($replacehash) eq 'HASH') && (ref($deps) eq 'HASH')); |
|
Line 640 sub recurse_html {
|
Line 672 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 649 sub recurse_html {
|
Line 681 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 661 sub recurse_html {
|
Line 693 sub recurse_html {
|
| return; |
return; |
| } |
} |
| |
|
| |
sub copycrsauthored { |
| |
my ($r,$coursenum,$coursedom,$coursehome,$readonly) = @_; |
| |
my ($starthash,$js,$title,$formname); |
| |
my %origcrsdata=&Apache::lonnet::coursedescription($env{'request.course.id'}); |
| |
$title=$origcrsdata{'description'}; |
| |
$title=~s/[\/\s]+/\_/gs; |
| |
$title=&clean($title); |
| |
my ($home,$other,%outhash)=&authorhosts(); |
| |
unless (($env{'form.authorspace'}) && ($env{'form.authorfolder'}=~/\w/)) { |
| |
my %js_lt; |
| |
$formname = 'copycrsauthored'; |
| |
if ($home) { |
| |
%js_lt = |
| |
&Apache::lonlocal::texthash( |
| |
yomu => 'You must select an Authoring Space', |
| |
whco => 'When Copyright set to "custom", URL of a published rights file is needed.', |
| |
); |
| |
&js_escape(\%js_lt); |
| |
} |
| |
if ($home > 1) { |
| |
$js = <<"ENDJS"; |
| |
<script type="text/javascript"> |
| |
// <![CDATA[ |
| |
|
| |
function validCrsCopy() { |
| |
var dest = document.$formname.authorspace.options[document.$formname.authorspace.selectedIndex].value; |
| |
if (dest == '') { |
| |
alert("$js_lt{'yomu'}"); |
| |
return false; |
| |
} |
| |
var dist = document.$formname.copyright.options[document.$formname.copyright.selectedIndex].value; |
| |
if (dist == 'custom') { |
| |
if (document.$formname.customrights.value == '') { |
| |
alert("$js_lt{'whco'}"); |
| |
return false; |
| |
} |
| |
} |
| |
return true; |
| |
} |
| |
|
| |
function init_copycrs_form() { |
| |
document.$formname.authorspace.selectedIndex = "0"; |
| |
document.$formname.authorfolder.value = '$title'; |
| |
document.$formname.copyright.selectedIndex = "0"; |
| |
} |
| |
|
| |
// ]]> |
| |
</script> |
| |
|
| |
ENDJS |
| |
} elsif ($home) { |
| |
$js = <<"ENDJS"; |
| |
<script type="text/javascript"> |
| |
// <![CDATA[ |
| |
|
| |
function init_copycrs_form() { |
| |
document.$formname.authorfolder.value = '$title'; |
| |
document.$formname.copyright.selectedIndex = "0"; |
| |
} |
| |
|
| |
// ]]> |
| |
</script> |
| |
|
| |
ENDJS |
| |
} |
| |
$js .= <<"ENDJS"; |
| |
<script type="text/javascript"> |
| |
// <![CDATA[ |
| |
|
| |
function hide_searching() { |
| |
if (document.getElementById('searching')) { |
| |
document.getElementById('searching').style.display = 'none'; |
| |
} |
| |
return; |
| |
} |
| |
|
| |
function showHideCustom(caller,divid) { |
| |
if (document.getElementById(divid)) { |
| |
if (caller.options[caller.selectedIndex].value == 'custom') { |
| |
document.getElementById(divid).style.display="inline-block"; |
| |
} else { |
| |
document.getElementById(divid).style.display="none"; |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| |
// ]]> |
| |
</script> |
| |
ENDJS |
| |
|
| |
$js .= "\n".&Apache::lonhtmlcommon::scripttag(&Apache::loncommon::browser_and_searcher_javascript())."\n"; |
| |
$starthash = { |
| |
add_entries => {'onload' => "hide_searching(); init_copycrs_form();"}, |
| |
}; |
| |
} |
| |
$r->print(&Apache::loncommon::start_page('Copy from Course Authoring to User Authoring',$js,$starthash)."\n". |
| |
&Apache::lonhtmlcommon::breadcrumbs('Copy from Course Authoring Space')."\n"); |
| |
$r->print(&startContentScreen('tools')); |
| |
unless ($home) { |
| |
$r->print('<p class="LC_info">'.&mt('No author or co-author roles on this server.').'</p>'); |
| |
$r->print(&endContentScreen()); |
| |
return ''; |
| |
} |
| |
my $docroot = $r->dir_config('lonDocRoot'); |
| |
my $is_course_home; |
| |
my @ids=&Apache::lonnet::current_machine_ids(); |
| |
if (($coursehome ne '') && (grep(/^\Q$coursehome\E$/,@ids))) { |
| |
$is_course_home = 1; |
| |
} |
| |
my $exclude = &Apache::lonnet::priv_exclude(); |
| |
my $srcurl = "/priv/$coursedom/$coursenum"; |
| |
my $srctop = $docroot.$srcurl; |
| |
my $resurl = "/res/$coursedom/$coursenum"; |
| |
my $res_exclude = &Apache::lonnet::res_exclude(); |
| |
if (($env{'form.authorspace'}) && ($env{'form.authorfolder'}=~/\w/)) { |
| |
$r->print('<h3>'.&mt('Copying Files and/or Sub-directories').'</h3>'); |
| |
if ($readonly) { |
| |
$r->print('<p class="LC_info">'. |
| |
&mt('You do not have permission to copy files and/or directories from Course Authoring Space.'). |
| |
'</p>'. |
| |
&endContentScreen()); |
| |
return ''; |
| |
} |
| |
unless ($outhash{'home_'.$env{'form.authorspace'}}) { |
| |
$r->print('<p class="LC_info">'.&mt('Selected Authoring Space is not on this server.').'</p>'. |
| |
&endContentScreen()); |
| |
return ''; |
| |
} |
| |
my ($ca,$cd)=split(/\:/,$env{'form.authorspace'}); |
| |
my $desturl = "/priv/$cd/$ca"; |
| |
my $destresurl = "/res/$cd/$ca"; |
| |
my $desttop = $docroot.$desturl; |
| |
my $subdir = &clean($env{'form.authorfolder'}); |
| |
$subdir = &cleandir($subdir); |
| |
if ($subdir eq '') { |
| |
$r->print('<p class="LC_info">'.&mt('After removal of disallowed characters target sub-directory name was blank.').'</p>'. |
| |
&endContentScreen()); |
| |
return ''; |
| |
} elsif ($subdir =~/^_+$/) { |
| |
$r->print('<p class="LC_info">'.&mt('After replacement of non-alphanumeric characters with _ in target sub-directory name, nothing but underscores was left.').'</p>'. |
| |
&endContentScreen()); |
| |
return ''; |
| |
} |
| |
my (%tocopy,%dirs_to_make,%files_to_copy); |
| |
map { $tocopy{&unescape($_)} = 1; } &Apache::loncommon::get_env_multiple('form.copytouser'); |
| |
if (keys(%tocopy)) { |
| |
my (%subdirs,%files); |
| |
&Apache::lonnet::recursedirs($is_course_home,1,undef,$exclude,0,0,$srcurl,'',\%subdirs,\%files); |
| |
foreach my $possible (sort(keys(%tocopy))) { |
| |
if ($possible =~ m{/$}) { |
| |
my $possdir = $possible; |
| |
$possdir =~ s{^/+|/+$}{}g; |
| |
if (exists($subdirs{$possdir})) { |
| |
$dirs_to_make{$possdir} = 1; |
| |
} else { |
| |
delete($tocopy{$possible}); |
| |
} |
| |
} else { |
| |
my ($path,$fname) = ($possible =~ m{(.*/)([^/]+)$}); |
| |
my $found = 0; |
| |
if ($path eq '/') { |
| |
if (ref($files{$path}) eq 'HASH') { |
| |
if (exists($files{$path}{$fname})) { |
| |
$found = 1; |
| |
$files_to_copy{$fname} = 1; |
| |
} |
| |
} |
| |
} else { |
| |
$path =~ s{^/+|/+$}{}g; |
| |
if (ref($files{$path}) eq 'HASH') { |
| |
if (exists($files{$path}{$fname})) { |
| |
$dirs_to_make{$path} = 1; |
| |
$files_to_copy{"$path/$fname"} = 1; |
| |
$found = 1; |
| |
} |
| |
} |
| |
} |
| |
unless ($found) { |
| |
delete($tocopy{$possible}); |
| |
} |
| |
} |
| |
} |
| |
} else { |
| |
$r->print('<p>'.&mt('No files or directories selected for copying').'</p>'); |
| |
$r->print(&endContentScreen()); |
| |
return ''; |
| |
} |
| |
if (keys(%tocopy)) { |
| |
my (%resdirs,%resfiles); |
| |
&Apache::lonnet::recursedirs($is_course_home,1,undef,$res_exclude,0,0,$resurl,'',\%resdirs,\%resfiles); |
| |
my ($notopdir,%newdir,%newfile,%checkdeps,%newresfile); |
| |
$r->print('<p>'.&mt('Copy to: [_1]', |
| |
'<span class="LC_filename">'.$desturl.'/'.$subdir.'</span>'). |
| |
'</p>'."\n"); |
| |
if (keys(%dirs_to_make)) { |
| |
unless (-e $desttop.'/'.$subdir) { |
| |
mkdir($desttop.'/'.$subdir,0755); |
| |
} |
| |
if (-e $desttop.'/'.$subdir) { |
| |
foreach my $dir (sort(keys(%dirs_to_make))) { |
| |
my @dirs=split(/\//,$dir); |
| |
my $path="$desttop/$subdir"; |
| |
my $makepath=$path; |
| |
my $fail; |
| |
for (my $i=0;$i<@dirs;$i++) { |
| |
$makepath.='/'.$dirs[$i]; |
| |
unless (-e $makepath) { |
| |
unless (mkdir($makepath,0755)) { |
| |
$fail = 1; |
| |
last; |
| |
} |
| |
if (($i == scalar(@dirs)-1) && (!$fail)) { |
| |
$newdir{$dir} = 1; |
| |
} |
| |
} |
| |
} |
| |
if ($fail) { |
| |
$r->print('<p class="LC_warning">'.&mt('Target directory: [_1] does not exist, and could not be created.', |
| |
'<span class="LC_filename">'.$desturl.'/'.$subdir.'/'.$dir.'</span>'). |
| |
'</p>'."\n"); |
| |
} |
| |
} |
| |
} else { |
| |
$notopdir = 1; |
| |
} |
| |
} |
| |
if (keys(%files_to_copy)) { |
| |
unless (-e $desttop.'/'.$subdir) { |
| |
mkdir($desttop.'/'.$subdir,0755); |
| |
} |
| |
if (-e $desttop.'/'.$subdir) { |
| |
my $num = 0; |
| |
my ($copyright,$customdistfile); |
| |
if ($env{'form.copyright'} eq 'default' || $env{'form.copyright'} eq 'domain' || $env{'form.copyright'} eq 'public') { |
| |
$copyright = $env{'form.copyright'}; |
| |
} elsif ($env{'form.copyright'} eq 'custom') { |
| |
if ($env{'form.customrights'} =~ m{^/res/$match_domain/$match_username/.+\.rights$}) { |
| |
my ($rightsdom,$rightsuname) = ($1,$2); |
| |
my $rightshome = &Apache::lonnet::homeserver($rightsdom,$rightsuname); |
| |
if (($rightshome eq 'no_host') || ($rightshome eq '')) { |
| |
$copyright = 'default'; |
| |
} elsif (grep(/^\Q$rightshome\E$/,@ids)) { |
| |
if (-e $docroot.$env{'form.customrights'}) { |
| |
$copyright = 'custom'; |
| |
$customdistfile = $env{'form.customrights'}; |
| |
} else { |
| |
$copyright = 'default'; |
| |
} |
| |
} else { |
| |
my $rightsfile = &Apache::lonnet::filelocation('',$env{'form.customrights'}); |
| |
unless (&Apache::lonnet::getfile($rightsfile) eq '-1') { |
| |
$customdistfile = $env{'form.customrights'}; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
my $sourceavail; |
| |
if ($env{'form.sourceavail'} =~ /^(open|closed)$/) { |
| |
$sourceavail = $env{'form.sourceavail'}; |
| |
} |
| |
my $respublish; |
| |
if ($env{'form.respublish'}) { |
| |
$respublish = 1; |
| |
} |
| |
my $nokeyref = &Apache::lonpublisher::getnokey($r->dir_config('lonIncludes')); |
| |
foreach my $file (keys(%files_to_copy)) { |
| |
my ($fail,$dup,$dir_is_file,$src,$dest,$path,$fname); |
| |
if ($file =~ m{/}) { |
| |
($path,$fname) = ($file =~ m{^(.+)/([^/]+)$}); |
| |
if (-d "$desttop/$subdir/$path") { |
| |
if (-e "$desttop/$subdir/$path/$fname") { |
| |
$dup = 1; |
| |
} else { |
| |
$src = "$srctop/$path/$fname"; |
| |
$dest = "$desttop/$subdir/$path/$fname"; |
| |
} |
| |
} elsif (-f "$desttop/$subdir/$path") { |
| |
$dir_is_file = 1; |
| |
} else { |
| |
$fail = 1; |
| |
} |
| |
} elsif (-e "$desttop/$subdir/$file") { |
| |
$dup = 1; |
| |
} else { |
| |
$src = "$srctop/$file"; |
| |
$dest = "$desttop/$subdir/$file"; |
| |
$fname = $file; |
| |
} |
| |
if ($fail) { |
| |
$r->print('<p class="LC_warning">'.&mt('Target directory: [_1] does not exist, and could not be created.', |
| |
'<span class="LC_filename">'.$desturl.'/'.$subdir.'/'.$path.'</span>'). |
| |
'</p>'."\n"); |
| |
} elsif ($dup) { |
| |
$r->print('<p class="LC_warning">'.&mt('Target file: [_1] already exists -- not overwriting.', |
| |
'<span class="LC_filename">'.$desturl.'/'.$subdir.'/'.$file.'</span>'). |
| |
'</p>'."\n"); |
| |
} elsif ($dir_is_file) { |
| |
$r->print('<p class="LC_warning">'.&mt('Target directory: [_1] name is already in a use for a file -- not overwriting.', |
| |
'<span class="LC_filename">'.$desturl.'/'.$subdir.'/'.$file.'</span>'). |
| |
'</p>'."\n"); |
| |
} elsif (($src ne '') && ($dest ne '')) { |
| |
my $ressrc = $docroot.$resurl.'/'.$file; |
| |
my $ressrcmeta = $ressrc.'.meta'; |
| |
my ($ext) = ($file =~ /\.(\w+)$/); |
| |
my $embstyle=&Apache::loncommon::fileembstyle($ext); |
| |
my ($getres,$getresmeta); |
| |
if ($respublish) { |
| |
if ($path eq '') { |
| |
if ((ref($resfiles{'/'}) eq 'HASH') && |
| |
(exists($resfiles{'/'}{$fname}))) { |
| |
$getres = 1; |
| |
$getresmeta = 1; |
| |
} |
| |
} elsif ((ref($resfiles{$path}) eq 'HASH') && |
| |
(exists($resfiles{$path}{$fname}))) { |
| |
$getres = 1; |
| |
$getresmeta = 1; |
| |
} |
| |
} |
| |
if ($is_course_home) { |
| |
my ($needpriv,$needprivmeta); |
| |
if ($respublish) { |
| |
if ($getres) { |
| |
if (&Apache::londiff::are_different_files($src,$ressrc)) { |
| |
$needpriv = 1; |
| |
if (&File::Copy::copy($ressrc,$dest)) { |
| |
if ($embstyle eq 'ssi') { |
| |
&crsres_fixup($dest,$coursenum,$coursedom,$ca,$cd); |
| |
} |
| |
} |
| |
} else { |
| |
if (&File::Copy::copy($src,$dest)) { |
| |
$newfile{$file} = $desturl.'/'.$subdir.'/'.$file; |
| |
if ($embstyle eq 'ssi') { |
| |
&crsres_fixup($dest,$coursenum,$coursedom,$ca,$cd,$subdir); |
| |
} |
| |
} |
| |
} |
| |
} else { |
| |
$needpriv = 1; |
| |
} |
| |
if ($getresmeta) { |
| |
if ((-e $src.'.meta') && (!-e $dest.'.meta')) { |
| |
if (&Apache::londiff::are_different_files($src.'.meta',$ressrc.'.meta')) { |
| |
if (&File::Copy::copy($ressrc.'.meta',$dest.'.meta')) { |
| |
&crsres_fixup_meta($dest,$coursenum,$coursedom,$ca,$cd,$copyright, |
| |
$customdistfile,$sourceavail,\%checkdeps); |
| |
} |
| |
$needprivmeta = 1; |
| |
} else { |
| |
if (&File::Copy::copy($src.'.meta',$dest.'.meta')) { |
| |
&crsres_fixup_meta($dest,$coursenum,$coursedom,$ca,$cd,$copyright, |
| |
$customdistfile,$sourceavail,\%checkdeps); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if ($getres) { |
| |
my $destresfile = $docroot.$destresurl.'/'.$subdir.'/'.$file; |
| |
if (-e $dest) { |
| |
my $output = &Apache::lonpublisher::batchpublish($r,$dest,$destresfile,$nokeyref,1); |
| |
if (-e $destresfile) { |
| |
$newresfile{$file} = $destresurl.'/'.$subdir.'/'.$file; |
| |
} |
| |
} |
| |
} |
| |
} else { |
| |
$needpriv = 1; |
| |
if ((-e $src.'.meta') && (!-e $dest.'.meta')) { |
| |
$needprivmeta = 1; |
| |
} |
| |
} |
| |
if ($needpriv) { |
| |
if (&File::Copy::copy($src,$dest)) { |
| |
$newfile{$file} = $desturl.'/'.$subdir.'/'.$file; |
| |
if ($embstyle eq 'ssi') { |
| |
&crsres_fixup($dest,$coursenum,$coursedom,$ca,$cd,$subdir); |
| |
} |
| |
} |
| |
} |
| |
if ($needprivmeta) { |
| |
if (&File::Copy::copy($src.'.meta',$dest.'.meta')) { |
| |
&crsres_fixup_meta($dest,$coursenum,$coursedom,$ca,$cd,$copyright, |
| |
$customdistfile,$sourceavail,\%checkdeps); |
| |
} |
| |
} |
| |
} else { |
| |
my ($needpriv,$needprivmeta); |
| |
if ($respublish) { |
| |
if ($getres) { |
| |
&Apache::lonnet::repcopy($docroot.$resurl.'/'.$file); |
| |
} |
| |
if ($getresmeta) { |
| |
&Apache::lonnet::repcopy($docroot.$resurl.'/'.$file.'.meta'); |
| |
} |
| |
if (-e $docroot.$resurl.'/'.$file) { |
| |
if (&Apache::lonnet::repcopy_crsprivfile($srcurl.'/'.$file,$dest) eq 'ok') { |
| |
if (&Apache::londiff::are_different_files($docroot.$resurl.'/'.$file,$dest)) { |
| |
$needpriv = 1; |
| |
if (&File::Copy::copy($docroot.$resurl.'/'.$file,$dest)) { |
| |
if ($embstyle eq 'ssi') { |
| |
&crsres_fixup($dest,$coursenum,$coursedom,$ca,$cd); |
| |
} |
| |
} |
| |
} else { |
| |
if ($embstyle eq 'ssi') { |
| |
&crsres_fixup($dest,$coursenum,$coursedom,$ca,$cd,$subdir); |
| |
} |
| |
$newfile{$file} = $desturl.'/'.$subdir.'/'.$file; |
| |
} |
| |
} |
| |
} else { |
| |
$needpriv = 1; |
| |
} |
| |
if (-e $docroot.$resurl.'/'.$file.'.meta') { |
| |
if (&Apache::lonnet::repcopy_crsprivfile($srcurl.'/'.$file.'.meta',$dest.'.meta') eq 'ok') { |
| |
if (&Apache::londiff::are_different_files($docroot.$resurl.'/'.$file.'.meta',$dest.'.meta')) { |
| |
$needprivmeta = 1; |
| |
if (&File::Copy::copy($docroot.$resurl.'/'.$file.'.meta',$dest.'.meta')) { |
| |
&crsres_fixup_meta($dest,$coursenum,$coursedom,$ca,$cd,$copyright, |
| |
$customdistfile,$sourceavail,\%checkdeps); |
| |
} |
| |
} else { |
| |
&crsres_fixup_meta($dest,$coursenum,$coursedom,$ca,$cd,$copyright, |
| |
$customdistfile,$sourceavail,\%checkdeps); |
| |
} |
| |
} |
| |
} else { |
| |
if (!-e $dest.'.meta') { |
| |
$needprivmeta = 1; |
| |
} |
| |
} |
| |
if ($getres) { |
| |
my $destresfile = $docroot.$destresurl.'/'.$subdir.'/'.$file; |
| |
if (-e $dest) { |
| |
my $output = &Apache::lonpublisher::batchpublish($r,$dest,$destresfile,$nokeyref,1); |
| |
if (-e $destresfile) { |
| |
$newresfile{$file} = $destresurl.'/'.$subdir.'/'.$file; |
| |
} |
| |
} |
| |
} |
| |
} else { |
| |
$needpriv = 1; |
| |
if (!-e $dest.'.meta') { |
| |
$needprivmeta = 1; |
| |
} |
| |
} |
| |
if ($needpriv) { |
| |
if (&Apache::lonnet::repcopy_crsprivfile($srcurl.'/'.$file,$dest) eq 'ok') { |
| |
if ($embstyle eq 'ssi') { |
| |
&crsres_fixup($dest,$coursenum,$coursedom,$ca,$cd,$subdir); |
| |
} |
| |
$newfile{$file} = $desturl.'/'.$subdir.'/'.$file; |
| |
} |
| |
} |
| |
if ($needprivmeta) { |
| |
if (&Apache::lonnet::repcopy_crsprivfile($srcurl.'/'.$file.'.meta',$dest.'.meta') eq 'ok') { |
| |
&crsres_fixup_meta($dest,$coursenum,$coursedom,$ca,$cd,$copyright, |
| |
$customdistfile,$sourceavail,\%checkdeps); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} else { |
| |
$notopdir = 1; |
| |
} |
| |
} |
| |
if ($notopdir) { |
| |
$r->print('<p><span class="LC_info">'.&mt('No files or sub-directories copied').'</span><br />'."\n". |
| |
'<span class="LC_warning">'.&mt('Target directory: [_1] does not exist, and could not be created.', |
| |
'<span class="LC_filename">'.$desturl.'/'.$subdir.'</span>'). |
| |
'</span></p>'."\n"); |
| |
} |
| |
if (keys(%newdir)) { |
| |
$r->print('<p>'.&mt('Created the following directories in [_1]:','<span class="LC_filename">'.$desturl.'/'.$subdir.'</span>'). |
| |
'</p>'."\n". |
| |
'<ul><li>'.join('</li><li>',sort(keys(%newdir))).'</li></ul></p>'."\n"); |
| |
} |
| |
if (keys(%newfile)) { |
| |
$r->print('<p>'.&mt('Copied the following files to [_1]:','<span class="LC_filename">'.$desturl.'/'.$subdir.'</span>'). |
| |
'</p>'."\n". |
| |
'<ul><li>'.join('</li><li>',sort(keys(%newfile))).'</li></ul></p>'."\n"); |
| |
foreach my $file (keys(%newfile)) { |
| |
my %storehash = ( |
| |
'priv' => $newfile{$file}, |
| |
'who' => $env{'user.name'}.':'.$env{'user.domain'}, |
| |
); |
| |
if (exists($newresfile{$file})) { |
| |
$storehash{'res'} = 1; |
| |
} |
| |
&Apache::lonnet::store_userdata(\%storehash,$file,'copycourseauthor',$coursedom,$coursenum); |
| |
} |
| |
} |
| |
if (keys(%checkdeps)) { |
| |
my %missingdep; |
| |
foreach my $depfile (sort(keys(%checkdeps))) { |
| |
unless (-e "$desttop/$depfile") { |
| |
$missingdep{$depfile} = 1; |
| |
} |
| |
} |
| |
if (keys(%missingdep)) { |
| |
$r->print('<p>'.&mt('You may also need to copy the following missing dependencies for files copied to [_1]:', |
| |
'<span class="LC_filename">'.$desturl.'/'.$subdir.'</span>'). |
| |
'</p>'."\n". |
| |
'<ul><li>'.join('</li><li>',sort(keys(%missingdep))).'</li></ul></p>'."\n"); |
| |
} |
| |
} |
| |
} else { |
| |
$r->print('<p>'.&mt('No currently existing files or directories in Course Authoring Space selected for copying').'</p>'); |
| |
$r->print(&endContentScreen()); |
| |
return ''; |
| |
} |
| |
} else { |
| |
my $chkname = 'copytouser'; |
| |
my $context = 'crsauthored'; |
| |
my (%subdirs,%files,@dirs_by_depth,@files_by_depth,%parent,%children,%hierarchy,@checked_maps); |
| |
&Apache::lonnet::recursedirs($is_course_home,1,undef,$exclude,0,0,$srcurl,'',\%subdirs,\%files,1); |
| |
foreach my $key (keys(%subdirs)) { |
| |
next if (($key eq '/') || ($key eq '')); |
| |
my @items = split(/\//,$key); |
| |
my $dir = pop(@items); |
| |
my $depth = scalar(@items); |
| |
my $path; |
| |
if (!$depth) { |
| |
$path = '/'; |
| |
} else { |
| |
$path = join('/',@items); |
| |
} |
| |
$dirs_by_depth[$depth]{$path}{$dir} = 1; |
| |
} |
| |
foreach my $path (keys(%files)) { |
| |
next if ($path eq ''); |
| |
my $depth; |
| |
if ($path eq '/') { |
| |
$depth = 0; |
| |
} else { |
| |
$depth = scalar(split(/\//,$path)); |
| |
} |
| |
if (ref($files{$path}) eq 'HASH') { |
| |
foreach my $file (keys(%{$files{$path}})) { |
| |
$files_by_depth[$depth]{$path}{$file} = $files{$path}{$file}; |
| |
} |
| |
} |
| |
} |
| |
my ($info,$display,$onsubmit,$togglebuttons,$disabled); |
| |
my (%resdirs,%resfiles); |
| |
&Apache::lonnet::recursedirs($is_course_home,1,undef,$res_exclude,0,0,$resurl,'',\%resdirs,\%resfiles); |
| |
my $numpub = 0; |
| |
if (keys(%resfiles)) { |
| |
foreach my $dir (keys(%resfiles)) { |
| |
if (ref($resfiles{$dir}) eq 'HASH') { |
| |
foreach my $file (keys(%{$resfiles{$dir}})) { |
| |
if (exists($files{$dir}{$file})) { |
| |
$numpub ++; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if ($readonly) { |
| |
$disabled = ' disabled="disabled"'; |
| |
} |
| |
if ($disabled) { |
| |
$togglebuttons = '<br />'; |
| |
} else { |
| |
$togglebuttons = '<input type="button" value="'.&mt('check all').'" '. |
| |
'onclick="javascript:checkAll(document.'.$formname.'.'.$chkname.')" />'. |
| |
' <input type="button" value="'.&mt('uncheck all').'"'. |
| |
' onclick="javascript:uncheckAll(document.'.$formname.'.'.$chkname.')" />'; |
| |
} |
| |
my $preamble = &authorspace_selector($r,$formname,$home,$title,%outhash). |
| |
&courseresource_options($formname,$numpub). |
| |
'<div style="padding:0;clear:both;margin:0;border:0"></div>'."\n"; |
| |
my $display = '<form name="'.$formname.'" action="" method="post" onsubmit="return validCrsCopy();">'."\n". |
| |
$preamble."\n". |
| |
'<div class="LC_float_left">'."\n". |
| |
'<fieldset>'."\n". |
| |
'<legend>'.&mt('Content to copy').(' 'x4).$togglebuttons.'</legend>'."\n". |
| |
'<span class="LC_fontsize_medium">'. |
| |
&mt('Choose the files and/or folders to copy from Course Authoring to User Authoring'). |
| |
'</span><br /><br />'."\n"; |
| |
my $count = 0; |
| |
# |
| |
# Warning to developers: |
| |
# |
| |
# If you add or remove form elements which precede the table of items to copy |
| |
# you will need to modify the value for startcount. Form elements include both: |
| |
# <input> and <fieldset> tags. |
| |
# $startcount (set to 9) contains the following: |
| |
# fieldsets with following legends: (a) Folder in Authoring Space, (b) Distribution to set in metadata |
| |
# (c) Content to copy |
| |
# inputs: textbox for destination folder; dropdown lists: (a) Copyright, (b) Source |
| |
# hidden: customrights file; buttons: (a) check all, (b) uncheck all. |
| |
# authorspace: if more than 1: a fieldset with legend: Select the Authoring Space, |
| |
# or if 1: an input (hidden) with available author/coauthor role. |
| |
# if there are multiple possible author/coauthor roles (i.e., $home > 1), |
| |
# incerement startcount by 1 for the dropdown list uses to select the target. |
| |
# |
| |
# If there are published files, increment startcount by 3: |
| |
# fieldset (legend: Published Resources), and two radio buttons (Yes/No). |
| |
# |
| |
my $startcount = 9; |
| |
if ($home > 1) { |
| |
$startcount ++; |
| |
} |
| |
if ($numpub) { |
| |
$startcount += 3; |
| |
} |
| |
my $lastcontainer = $startcount; |
| |
$display .= &Apache::loncommon::start_data_table()."\n". |
| |
&Apache::loncommon::start_data_table_header_row(). |
| |
'<th>'.&mt('Copy?').'</th>'. |
| |
'<th>'.&mt('Name').'</th>'. |
| |
'<th>'.&mt('Last modified').'</th>'. |
| |
'<th>'.&mt('Published?').'</th>'. |
| |
&Apache::loncommon::end_data_table_header_row()."\n"; |
| |
$count = &recurse_crsauthored(0,\@dirs_by_depth,\@files_by_depth,'/',$startcount, |
| |
$count,\$display,\%parent,\%children,$readonly, |
| |
$formname,$chkname,\$lastcontainer,\%resfiles); |
| |
$display .= &Apache::loncommon::end_data_table().'</fieldset>'; |
| |
unless ($readonly) { |
| |
$display .= '</div><div style="padding:0;clear:both;margin:0;border:0"></div>'. |
| |
'<div>'. |
| |
'<input type="submit" name="copyauthored" value="'.&mt("Copy Selected Content").'" />'. |
| |
'</div>'; |
| |
} |
| |
$display .= &Apache::loncourserespicker::respicker_javascript($startcount,$count,$context,$formname,\%children, |
| |
\%hierarchy,\@checked_maps,$home,$chkname); |
| |
$r->print($display); |
| |
} |
| |
$r->print(&endContentScreen()); |
| |
} |
| |
|
| |
sub recurse_crsauthored { |
| |
my ($currdepth,$dirs_by_depth,$files_by_depth,$currpath,$startcount,$count,$displayref, |
| |
$parent,$children,$readonly,$formname,$chkname,$lastcontainerref,$resfilesref) = @_; |
| |
return $count unless ((ref($dirs_by_depth) eq 'ARRAY') && (ref($files_by_depth) eq 'ARRAY') && |
| |
(ref($resfilesref) eq 'HASH')); |
| |
my ($disabled,$hasdirs,$hasfiles,%unique,%dirs,%files); |
| |
if ((ref($dirs_by_depth->[$currdepth]) eq 'HASH') && |
| |
(ref($dirs_by_depth->[$currdepth]{$currpath}) eq 'HASH')) { |
| |
$hasdirs = 1; |
| |
%dirs = %{$dirs_by_depth->[$currdepth]{$currpath}}; |
| |
map { $unique{$_} = 1; } keys(%dirs); |
| |
} |
| |
if ((ref($files_by_depth->[$currdepth]) eq 'HASH') && |
| |
(ref($files_by_depth->[$currdepth]{$currpath}) eq 'HASH')) { |
| |
$hasfiles = 1; |
| |
%files = %{$files_by_depth->[$currdepth]{$currpath}}; |
| |
map { $unique{$_} = 1; } keys(%files); |
| |
} |
| |
if ($readonly) { |
| |
$disabled = ' disabled="disabled"'; |
| |
} |
| |
my $location=&Apache::loncommon::lonhttpdurl("/adm/lonIcons"); |
| |
my $whitespace = |
| |
'<img src="'.$location.'/whitespace_21.gif" class="LC_docs_spacer" alt="" />'; |
| |
$parent->{$currdepth} = $$lastcontainerref; |
| |
foreach my $item (sort { lc($a) cmp lc($b) } (keys(%unique))) { |
| |
next if ($item eq ''); |
| |
my $currelem; |
| |
if ($hasdirs && exists($dirs{$item})) { |
| |
$count ++; |
| |
my $deeper = $currdepth+1; |
| |
my ($newpath,$showpath); |
| |
if ($currpath eq '/') { |
| |
$newpath = $item; |
| |
$showpath = $currpath.$item.'/'; |
| |
} else { |
| |
$newpath = $currpath.'/'.$item; |
| |
$showpath = '/'.$currpath.'/'.$item.'/'; |
| |
} |
| |
$currelem = $count+$startcount; |
| |
$$lastcontainerref = $currelem; |
| |
$children->{$parent->{$currdepth}} .= $currelem.':'; |
| |
my $icon = 'src="'.$location.'/navmap.folder.open.gif" alt="'.&mt('Folder').'"'; |
| |
$$displayref .= &Apache::loncommon::start_data_table_row(). |
| |
'<td><input type="checkbox" name="'.$chkname.'" value="'.&escape($showpath).'" '. |
| |
'onclick="javascript:checkFolder(document.'.$formname.','."'$currelem'".')" '. |
| |
$disabled.' /></td><td>'; |
| |
for (my $i=0; $i<$currdepth; $i++) { |
| |
$$displayref .= "$whitespace\n"; |
| |
} |
| |
$$displayref .= '<img '.$icon.' /> '.$item.'</td><td> </td><td> </td>'. |
| |
&Apache::loncommon::end_data_table_row()."\n"; |
| |
$count = &recurse_crsauthored($deeper,$dirs_by_depth,$files_by_depth,$newpath, |
| |
$startcount,$count,$displayref,$parent,$children, |
| |
$readonly,$formname,$chkname,$lastcontainerref,$resfilesref); |
| |
} |
| |
if ($hasfiles && exists($files{$item})) { |
| |
$count ++; |
| |
$currelem = $count+$startcount; |
| |
$children->{$parent->{$currdepth}} .= $currelem.':'; |
| |
my $icon = 'src="'.&Apache::loncommon::icon($item).'"'; |
| |
my ($ext) = ($item =~ /\.([^.]+)$/); |
| |
my $alttext; |
| |
if (lc($ext) eq 'problem') { |
| |
$alttext = ' alt="'.&mt('Problem Icon').'"'; |
| |
} elsif ($ext =~ /^x?html?$/i) { |
| |
$alttext = ' alt="'.&mt('Web Page Icon').'"'; |
| |
} elsif ($ext =~ /^(jpg|gif|png|svg|jpeg)$/) { |
| |
$alttext = ' alt="'.&mt('Image Icon').'"'; |
| |
} else { |
| |
$alttext = ' alt="'.&mt('Resource Icon').'"'; |
| |
} |
| |
my $showpath; |
| |
if ($currpath eq '/') { |
| |
$showpath = $currpath; |
| |
} else { |
| |
$showpath = "/$currpath/"; |
| |
} |
| |
my ($published,$lastmod); |
| |
if ((ref($resfilesref->{$currpath})) && (exists($resfilesref->{$currpath}{$item}))) { |
| |
$published = '<img src="'.$location.'/navmap.correct.gif" alt="'.&mt('yes').'" />'; |
| |
} else { |
| |
$published = '<img src="'.$location.'/navmap.wrong.gif" alt="'.&mt('no').'" />'; |
| |
} |
| |
$$displayref .= &Apache::loncommon::start_data_table_row(). |
| |
'<td><input type="checkbox" name="'.$chkname.'" value="'.&escape($showpath.$item).'" '. |
| |
'onclick="javascript:checkResource(document.'.$formname.','."'$currelem'".')" '. |
| |
$disabled.' /></td><td>'; |
| |
for (my $i=0; $i<$currdepth; $i++) { |
| |
$$displayref .= "$whitespace\n"; |
| |
} |
| |
$$displayref .= '<img '.$icon.$alttext.' /> '.$item.'</td>'. |
| |
'<td>'.&Apache::lonlocal::locallocaltime($files{$item}).'</td>'. |
| |
'<td style="text-align: center;">'.$published.'</td>'. |
| |
&Apache::loncommon::end_data_table_row()."\n"; |
| |
} |
| |
} |
| |
$$lastcontainerref = $parent->{$currdepth}; |
| |
return $count; |
| |
} |
| |
|
| |
sub courseresource_options { |
| |
my ($formname,$numpub) = @_; |
| |
my %lt = &Apache::lonlocal::texthash( |
| |
'default' => 'System wide - can be used for any courses system wide', |
| |
'domain' => 'Domain only - use limited to courses in the domain', |
| |
'custom' => 'Customized right of use ...', |
| |
'public' => 'Public - no authentication or authorization required for use', |
| |
'closed' => 'Closed - XML source is closed to everyone', |
| |
'open' => 'Open - XML source is open to people who want to use it', |
| |
'sel' => 'Select', |
| |
); |
| |
my $output; |
| |
if ($numpub) { |
| |
$output .= '<div class="LC_left_float">'. |
| |
'<fieldset><legend>'.&mt('Published Resources').'</legend>'. |
| |
&mt('[quant,_1,file] in Course Authoring Space also exist in Resource Space.', |
| |
$numpub).'</br />'. |
| |
&mt('Publish copied files in selected Authoring Space?').': '."\n". |
| |
'<label><input type="radio" name="respublish" checked="checked" value="1" />'. |
| |
&mt('Yes').'</label>'."\n". |
| |
'<label><input type="radio" name="respublish" value="0" />'. |
| |
&mt('No').'</label>'."\n". |
| |
'</fieldset></div>'."\n"; |
| |
} |
| |
$output .= '<div class="LC_left_float">'. |
| |
'<fieldset><legend>'.&mt('Distribution to set in metadata').'</legend>'. |
| |
&mt('Copyright').': '. |
| |
'<select name="copyright" onchange="showHideCustom(this,'."'LC_customfile'".');">'."\n". |
| |
'<option value="default" selected="selected">'.$lt{'default'}.'</option>'."\n". |
| |
'<option value="domain">'.$lt{'domain'}.'</option>'."\n". |
| |
'<option value="public">'.$lt{'public'}.'</option>'."\n". |
| |
'<option value="custom">'.$lt{'custom'}.'</option>'."\n". |
| |
'</select><div id="LC_customfile" style="padding:0;clear:both;margin:0;border:0;display:none">'."\n". |
| |
'<input type="text" name="customrights" size="60" value="" />'. |
| |
'<a href="javascript:openbrowser('."'$formname','customrights','rights'".');">'. |
| |
$lt{'sel'}.'</a></div><br />'."\n". |
| |
&mt('Source').' :'. |
| |
'<select name="sourceavail">'."\n". |
| |
'<option value="closed" selected="selected">'.$lt{'closed'}.'</option>'."\n". |
| |
'<option value="open">'.$lt{'open'}.'</option>'."\n". |
| |
'</select><br />'."\n". |
| |
'</fieldset></div>'."\n"; |
| |
return $output; |
| |
} |
| |
|
| |
sub crsres_fixup_meta { |
| |
my ($dest,$coursenum,$coursedom,$ca,$cd,$copyright,$customdistfile,$sourceavail,$checkdeps) = @_; |
| |
return unless (ref($checkdeps) eq 'HASH'); |
| |
if (open(my $fh,'<',$dest.'.meta')) { |
| |
my ($output,$now,$setsourceavail); |
| |
$now = time; |
| |
if (($dest =~ /\.(xml|html|htm|xhtml|xhtm)$/i) || ($dest =~ /$LONCAPA::assess_re/)) { |
| |
$setsourceavail = 1; |
| |
} |
| |
while (my $line=<$fh>) { |
| |
chomp($line); |
| |
if ($line eq "<authorspace>$coursenum:$coursedom</authorspace>") { |
| |
$output .= "<authorspace>$ca:$cd</authorspace>\n"; |
| |
} elsif ($line eq '<copyright>custom</copyright>') { |
| |
$output .= "<copyright>$copyright</copyright>\n"; |
| |
} elsif ($line =~ m{^<creationdate>\d+</creationdate>$}) { |
| |
$output .= "<creationdate>$now</creationdate>\n"; |
| |
} elsif ($line eq "<customdistributionfile>/res/$coursedom/$coursenum/default.rights</customdistributionfile>") { |
| |
$output .= "<customdistributionfile>$customdistfile</customdistributionfile>\n"; |
| |
} elsif ($line =~ m{^<sourceavail>(open|closed)</sourceavail>$}) { |
| |
if ($setsourceavail) { |
| |
$output .= "<sourceavail>$sourceavail</sourceavail>\n"; |
| |
} |
| |
} elsif ($line eq "<domain>$coursedom</domain>") { |
| |
$output .= "<domain>$cd</domain>\n"; |
| |
} elsif ($line =~ m{^<lastrevisiondate>\d+</lastrevisiondate>$}) { |
| |
$output .= "<lastrevisiondate>$now</lastrevisiondate>\n"; |
| |
} elsif ($line =~ m{^<modifyinguser>$match_username:$match_domain</modifyinguser>$}) { |
| |
$output .= "<modifyinguser>$env{'user.name'}:$env{'user.domain'}</modifyinguser>\n"; |
| |
} elsif ($line eq "<owner>$coursenum:$coursedom</owner>") { |
| |
$output .= "<owner>$ca:$cd</owner>\n"; |
| |
} elsif ($line =~ m{^<dependencies>(.+)</dependencies>$}) { |
| |
my @deps = split(/\s*,\s*/,$1); |
| |
my @newdeps; |
| |
my $changed = 0; |
| |
foreach my $dep (@deps) { |
| |
if ($dep =~ m{^/res/$coursedom/$coursenum/(.+)$}) { |
| |
my $rest = $1; |
| |
push(@newdeps,"/res/$cd/$ca/$rest"); |
| |
$checkdeps->{$rest} = 1; |
| |
$changed ++; |
| |
} else { |
| |
push(@newdeps,$dep); |
| |
} |
| |
} |
| |
if ($changed) { |
| |
$output .= '<dependencies>'.join(',',@newdeps).'</dependencies>'."\n"; |
| |
} |
| |
} else { |
| |
$output .= "$line\n"; |
| |
} |
| |
} |
| |
close($fh); |
| |
if (open(my $fh,'>',$dest.'.meta')) { |
| |
print $fh $output; |
| |
close($fh); |
| |
} |
| |
} |
| |
} |
| |
|
| |
sub crsres_fixup { |
| |
my ($dest,$coursenum,$coursedom,$ca,$cd,$subdir) = @_; |
| |
my $outstring=''; |
| |
my $changes = 0; |
| |
my @parser; |
| |
$parser[0]=HTML::LCParser->new($dest); |
| |
$parser[-1]->xml_mode(1); |
| |
my $token; |
| |
while (@parser) { |
| |
while ($token=$parser[-1]->get_token) { |
| |
if ($token->[0] eq 'S') { |
| |
my $tag=$token->[1]; |
| |
my $lctag=lc($tag); |
| |
my %parms=%{$token->[2]}; |
| |
foreach my $type ('src','href','background','bgimg') { |
| |
foreach my $key (keys(%parms)) { |
| |
if ($key =~ /^$type$/i) { |
| |
next if (($lctag eq 'img') && ($type eq 'src') && |
| |
($parms{$key} =~ m{^data\:image/gif;base64,})); |
| |
if ($parms{$key} =~ m{^\Q/res/$coursedom/$coursenum/\E}si) { |
| |
$parms{$key} =~ s{^\Q/res/$coursedom/$coursenum/\E}{/res/$cd/$ca/$subdir/}si; |
| |
$changes ++; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
# probably a <randomlabel> image type <label> |
| |
# or a <image> tag inside <imageresponse> or <drawimage> |
| |
if (($lctag eq 'label' && defined($parms{'description'})) |
| |
|| ($lctag eq 'image') || ($lctag eq 'import')) { |
| |
my $next_token=$parser[-1]->get_token(); |
| |
if ($next_token->[0] eq 'T') { |
| |
$next_token->[1] =~ s/[\n\r\f]+//g; |
| |
if ($next_token->[1] =~ m{^\Q/res/$coursedom/$coursenum/\E}si) { |
| |
$next_token->[1] =~ s{^\Q/res/$coursedom/$coursenum/\E}{/res/$cd/$ca/$subdir/}si; |
| |
$changes ++; |
| |
} |
| |
} |
| |
$parser[-1]->unget_token($next_token); |
| |
} |
| |
if ($lctag eq 'applet') { |
| |
my $havecodebase=0; |
| |
foreach my $key (keys(%parms)) { |
| |
if (lc($key) eq 'codebase') { |
| |
if ($parms{$key} =~ m{^\Q/res/$coursedom/$coursenum/\E}si) { |
| |
$parms{$key} =~ s{^\Q/res/$coursedom/$coursenum/\E}{/res/$cd/$ca/$subdir/}si; |
| |
$changes ++; |
| |
} |
| |
$havecodebase = 1; |
| |
} |
| |
} |
| |
unless ($havecodebase) { |
| |
foreach my $key (keys(%parms)) { |
| |
if ($key =~ /(archive|code|object)/i) { |
| |
if ($parms{$key} =~ m{^\Q/res/$coursedom/$coursenum/\E}si) { |
| |
$parms{$key} =~ s{^\Q/res/$coursedom/$coursenum/\E}{/res/$cd/$ca/$subdir/si}; |
| |
$changes ++; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
my $newparmstring=''; |
| |
my $endtag=''; |
| |
foreach my $parkey (keys(%parms)) { |
| |
if ($parkey eq '/') { |
| |
$endtag=' /'; |
| |
} else { |
| |
my $quote=($parms{$parkey}=~/\"/?"'":'"'); |
| |
$newparmstring.=' '.$parkey.'='.$quote.$parms{$parkey}.$quote; |
| |
} |
| |
} |
| |
if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; } |
| |
$outstring.='<'.$tag.$newparmstring.$endtag.'>'; |
| |
if ($lctag eq 'm' || $lctag eq 'answer' || $lctag eq 'display' || |
| |
$lctag eq 'tex') { |
| |
$outstring.=&Apache::lonxml::get_all_text_unbalanced('/'.$lctag,\@parser); |
| |
} elsif ($lctag eq 'script') { |
| |
if ($parms{'type'} eq 'loncapa/perl') { |
| |
$outstring.=&Apache::lonxml::get_all_text_unbalanced('/'.$lctag,\@parser); |
| |
} else { |
| |
my $needsupdate; |
| |
my $script = &Apache::lonxml::get_all_text_unbalanced('/'.$lctag,\@parser); |
| |
if ($script =~ m{\.addMediaSrc\((["'])((?!\1).+)\1\);}) { |
| |
my $src = $2; |
| |
if ($src =~ m{^\Q/res/$coursedom/$coursenum/\E}si) { |
| |
$needsupdate = 1; |
| |
} |
| |
} |
| |
if ($script =~ /\(document,\s*(['"])script\1,\s*\[([^\]]+)\]\);/s) { |
| |
my $scriptslist = $2; |
| |
my @srcs = split(/\s*,\s*/,$scriptslist); |
| |
foreach my $src (@srcs) { |
| |
if ($src =~ /(["'])(?:(?!\1).)+\.js\1/) { |
| |
my $quote = $1; |
| |
my ($url) = ($src =~ m/\Q$quote\E([^$quote]+)\Q$quote\E/); |
| |
if ($url =~ m{^\Q/res/$coursedom/$coursenum/\E}si) { |
| |
$needsupdate = 1; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if ($script =~ m{loadScript\(\s*(['"])((?:(?!\1).)+\.js)\1,\s*function}is) { |
| |
my $src = $2; |
| |
if ($src =~ m{^\Q/res/$coursedom/$coursenum/\E}si) { |
| |
$needsupdate = 1; |
| |
} |
| |
} |
| |
if ($needsupdate) { |
| |
$script =~ s{^\Q/res/$coursedom/$coursenum/\E}{/res/$cd/$ca/$subdir/gsi}; |
| |
$changes ++; |
| |
} |
| |
$outstring .= $script; |
| |
} |
| |
} |
| |
} elsif ($token->[0] eq 'E') { |
| |
if ($token->[2]) { |
| |
unless ($token->[1] eq 'allow') { |
| |
$outstring.='</'.$token->[1].'>'; |
| |
} |
| |
} |
| |
} else { |
| |
$outstring.=$token->[1]; |
| |
} |
| |
} |
| |
pop(@parser); |
| |
} |
| |
if ($changes) { |
| |
if (open(my $fh,'>',$dest)) { |
| |
print $fh $outstring; |
| |
close($fh); |
| |
} |
| |
} |
| |
} |
| |
|
| sub group_import { |
sub group_import { |
| my ($coursenum, $coursedom, $folder, $container, $caller, $ltitoolsref, @files) = @_; |
my ($coursenum, $coursedom, $folder, $container, $caller, $ltitoolsref, @files) = @_; |
| my ($donechk,$allmaps,%hierarchy,%titles,%addedmaps,%removefrommap, |
my ($donechk,$allmaps,%hierarchy,%titles,%addedmaps,%removefrommap, |
|
Line 695 sub group_import {
|
Line 1703 sub group_import {
|
| $url = $1; |
$url = $1; |
| my $marker = $2; |
my $marker = $2; |
| my $info = $3; |
my $info = $3; |
| my ($toolid,%toolhash,%toolsettings); |
my ($toolid,$toolprefix,$tooltype,%toolhash,%toolsettings); |
| my @extras = ('linktext','explanation','crslabel','crstitle','crsappend'); |
my @extras = ('linktext','explanation','crslabel','crstitle','crsappend'); |
| my @toolinfo = split(/:/,$info); |
my @toolinfo = split(/:/,$info); |
| if ($residx) { |
if ($residx) { |
|
Line 704 sub group_import {
|
Line 1712 sub group_import {
|
| } else { |
} else { |
| $toolid = shift(@toolinfo); |
$toolid = shift(@toolinfo); |
| } |
} |
| |
if ($toolid =~ /^c/) { |
| |
$tooltype = 'crs'; |
| |
$toolprefix = 'c'; |
| |
} else { |
| |
$tooltype = 'dom'; |
| |
} |
| $toolid =~ s/\D//g; |
$toolid =~ s/\D//g; |
| ($toolhash{'target'},$toolhash{'width'},$toolhash{'height'}, |
($toolhash{'target'},$toolhash{'width'},$toolhash{'height'}, |
| $toolhash{'linktext'},$toolhash{'explanation'}, |
$toolhash{'linktext'},$toolhash{'explanation'},$toolhash{'crslabel'}, |
| $toolhash{'crslabel'},$toolhash{'crstitle'},$toolhash{'crsappend'}) = @toolinfo; |
$toolhash{'crstitle'},$toolhash{'crsappend'},$toolhash{'gradable'}) = @toolinfo; |
| foreach my $item (@extras) { |
foreach my $item (@extras) { |
| $toolhash{$item} = &unescape($toolhash{$item}); |
$toolhash{$item} = &unescape($toolhash{$item}); |
| } |
} |
| |
if ($folder =~ /^supplemental/) { |
| |
delete($toolhash{'gradable'}); |
| |
} else { |
| |
$toolhash{'gradable'} =~ s/\D+//g; |
| |
} |
| if (ref($ltitoolsref) eq 'HASH') { |
if (ref($ltitoolsref) eq 'HASH') { |
| my @deleted; |
if (ref($ltitoolsref->{$tooltype}) eq 'HASH') { |
| if (ref($ltitoolsref->{$toolid}) eq 'HASH') { |
if (ref($ltitoolsref->{$tooltype}->{$toolid}) eq 'HASH') { |
| $toolhash{'id'} = $toolid; |
my %tools = %{$ltitoolsref->{$tooltype}->{$toolid}}; |
| if (($toolhash{'target'} eq 'iframe') || ($toolhash{'target'} eq 'tab') || |
my @deleted; |
| ($toolhash{'target'} eq 'window')) { |
$toolhash{'id'} = $toolprefix.$toolid; |
| if ($toolhash{'target'} eq 'window') { |
if (($toolhash{'target'} eq 'iframe') || ($toolhash{'target'} eq 'tab') || |
| foreach my $item ('width','height') { |
($toolhash{'target'} eq 'window')) { |
| $toolhash{$item} =~ s/^\s+//; |
if ($toolhash{'target'} eq 'window') { |
| $toolhash{$item} =~ s/\s+$//; |
foreach my $item ('width','height') { |
| if ($toolhash{$item} =~ /\D/) { |
$toolhash{$item} =~ s/^\s+//; |
| delete($toolhash{$item}); |
$toolhash{$item} =~ s/\s+$//; |
| if ($residx) { |
if ($toolhash{$item} =~ /\D/) { |
| if ($toolsettings{$item}) { |
delete($toolhash{$item}); |
| push(@deleted,$item); |
if ($residx) { |
| |
if ($toolsettings{$item}) { |
| |
push(@deleted,$item); |
| |
} |
| } |
} |
| } |
} |
| } |
} |
| } |
} |
| } |
} elsif ($residx) { |
| } elsif ($residx) { |
$toolhash{'target'} = $toolsettings{'target'}; |
| $toolhash{'target'} = $toolsettings{'target'}; |
if ($toolhash{'target'} eq 'window') { |
| if ($toolhash{'target'} eq 'window') { |
foreach my $item ('width','height') { |
| foreach my $item ('width','height') { |
$toolhash{$item} = $toolsettings{$item}; |
| $toolhash{$item} = $toolsettings{$item}; |
} |
| |
} |
| |
} elsif (ref($tools{'display'}) eq 'HASH') { |
| |
$toolhash{'target'} = $tools{'display'}{'target'}; |
| |
if ($toolhash{'target'} eq 'window') { |
| |
$toolhash{'width'} = $tools{'display'}{'width'}; |
| |
$toolhash{'height'} = $tools{'display'}{'height'}; |
| } |
} |
| } |
} |
| } elsif (ref($ltitoolsref->{$toolid}->{'display'}) eq 'HASH') { |
if ($toolhash{'target'} eq 'iframe') { |
| $toolhash{'target'} = $ltitoolsref->{$toolid}->{'display'}->{'target'}; |
foreach my $item ('width','height','linktext','explanation') { |
| if ($toolhash{'target'} eq 'window') { |
delete($toolhash{$item}); |
| $toolhash{'width'} = $ltitoolsref->{$toolid}->{'display'}->{'width'}; |
if ($residx) { |
| $toolhash{'height'} = $ltitoolsref->{$toolid}->{'display'}->{'height'}; |
if ($toolsettings{$item}) { |
| } |
push(@deleted,$item); |
| } |
} |
| if ($toolhash{'target'} eq 'iframe') { |
|
| foreach my $item ('width','height','linktext','explanation') { |
|
| delete($toolhash{$item}); |
|
| if ($residx) { |
|
| if ($toolsettings{$item}) { |
|
| push(@deleted,$item); |
|
| } |
} |
| } |
} |
| } |
} elsif ($toolhash{'target'} eq 'tab') { |
| } elsif ($toolhash{'target'} eq 'tab') { |
foreach my $item ('width','height') { |
| foreach my $item ('width','height') { |
delete($toolhash{$item}); |
| delete($toolhash{$item}); |
if ($residx) { |
| if ($residx) { |
if ($toolsettings{$item}) { |
| if ($toolsettings{$item}) { |
push(@deleted,$item); |
| push(@deleted,$item); |
} |
| } |
} |
| } |
} |
| } |
} |
| } |
if (ref($tools{'crsconf'}) eq 'HASH') { |
| if (ref($ltitoolsref->{$toolid}->{'crsconf'}) eq 'HASH') { |
foreach my $item ('label','title','linktext','explanation') { |
| foreach my $item ('label','title','linktext','explanation') { |
my $crsitem; |
| my $crsitem; |
if (($item eq 'label') || ($item eq 'title')) { |
| if (($item eq 'label') || ($item eq 'title')) { |
$crsitem = 'crs'.$item; |
| $crsitem = 'crs'.$item; |
} else { |
| } else { |
$crsitem = $item; |
| $crsitem = $item; |
} |
| } |
if ($tools{'crsconf'}{$item}) { |
| if ($ltitoolsref->{$toolid}->{'crsconf'}->{$item}) { |
$toolhash{$crsitem} =~ s/^\s+//; |
| $toolhash{$crsitem} =~ s/^\s+//; |
$toolhash{$crsitem} =~ s/\s+$//; |
| $toolhash{$crsitem} =~ s/\s+$//; |
if ($toolhash{$crsitem} eq '') { |
| if ($toolhash{$crsitem} eq '') { |
delete($toolhash{$crsitem}); |
| |
} |
| |
} else { |
| delete($toolhash{$crsitem}); |
delete($toolhash{$crsitem}); |
| } |
} |
| } else { |
if (($residx) && (exists($toolsettings{$crsitem}))) { |
| delete($toolhash{$crsitem}); |
unless (exists($toolhash{$crsitem})) { |
| |
push(@deleted,$crsitem); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if ($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 (($residx) && (exists($toolsettings{$crsitem}))) { |
if (($caller eq 'londocs') && (defined($LONCAPA::map::zombies[$residx]))) { |
| unless (exists($toolhash{$crsitem})) { |
$changegradable = 1; |
| push(@deleted,$crsitem); |
if ($toolsettings{'gradable'}) { |
| |
$toolhash{'gradable'} = 1; |
| } |
} |
| } |
} |
| } |
} |
| } |
my $putres = &Apache::lonnet::put('exttool_'.$marker,\%toolhash,$coursedom,$coursenum); |
| my $putres = &Apache::lonnet::put('exttool_'.$marker,\%toolhash,$coursedom,$coursenum); |
if ($putres eq 'ok') { |
| if ($putres eq 'ok') { |
if (@deleted) { |
| if (@deleted) { |
&Apache::lonnet::del('exttool_'.$marker,\@deleted,$coursedom,$coursenum); |
| &Apache::lonnet::del('exttool_'.$marker,\@deleted,$coursedom,$coursenum); |
} |
| |
if (($changegradable) && ($folder =~ /^default/)) { |
| |
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); |
| } |
} |
| } else { |
|
| return (&mt('Failed to save update to external tool.'),1); |
|
| } |
} |
| } |
} |
| } |
} |
|
Line 811 sub group_import {
|
Line 1871 sub group_import {
|
| } |
} |
| 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,$coursenum,$coursedom,\%removefrommap, |
&contained_map_check($url,$folder,$coursenum,$coursedom,\%removefrommap, |
| \%removeparam,\%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 878 END
|
Line 1938 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 907 END
|
Line 1967 END
|
| &storemap($coursenum, $coursedom, $folder.'.'.$container,1); |
&storemap($coursenum, $coursedom, $folder.'.'.$container,1); |
| unless ($fatal) { |
unless ($fatal) { |
| if ($folder =~ /^supplemental/) { |
if ($folder =~ /^supplemental/) { |
| &Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1); |
|
| my ($errtext,$fatal) = &mapread($coursenum,$coursedom, |
my ($errtext,$fatal) = &mapread($coursenum,$coursedom, |
| $folder.'.'.$container); |
$folder.'.'.$container); |
| } |
} |
|
Line 979 sub log_docs {
|
Line 2038 sub log_docs {
|
| sub docs_change_log { |
sub docs_change_log { |
| my ($r,$coursenum,$coursedom,$folder,$allowed,$crstype,$iconpath,$canedit)=@_; |
my ($r,$coursenum,$coursedom,$folder,$allowed,$crstype,$iconpath,$canedit)=@_; |
| my $supplementalflag=($env{'form.folderpath'}=~/^supplemental/); |
my $supplementalflag=($env{'form.folderpath'}=~/^supplemental/); |
| my $navmap; |
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, |
&editing_js($env{'user.domain'},$env{'user.name'},$supplementalflag, |
| $coursedom,$coursenum,'',$canedit,'',\$navmap)."\n". |
$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 1012 sub docs_change_log {
|
Line 2071 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 1034 sub docs_change_log {
|
Line 2093 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 1140 sub docs_change_log {
|
Line 2200 sub docs_change_log {
|
| } |
} |
| $r->print('</ul>'); |
$r->print('</ul>'); |
| if ($docslog{$id}{'logentry'}{'parameter_res'}) { |
if ($docslog{$id}{'logentry'}{'parameter_res'}) { |
| $r->print(&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'parameter_res'}))[0]).':<ul>'); |
my ($title,$url) = split(/\:/,$docslog{$id}{'logentry'}{'parameter_res'},3); |
| foreach my $parameter ('randompick','hiddenresource','encrypturl','randomorder') { |
if ($title eq '') { |
| |
($title) = ($url =~ m{/([^/]+)$}); |
| |
} elsif ($is_supp) { |
| |
$title = &Apache::loncommon::parse_supplemental_title($title); |
| |
} |
| |
$r->print(&LONCAPA::map::qtescape($title).':<ul>'); |
| |
foreach my $parameter ('randompick','hiddenresource','encrypturl','randomorder','gradable') { |
| if ($docslog{$id}{'logentry'}{'parameter_action_'.$parameter}) { |
if ($docslog{$id}{'logentry'}{'parameter_action_'.$parameter}) { |
| # FIXME: internationalization seems wrong here |
# FIXME: internationalization seems wrong here |
| $r->print('<li>'. |
$r->print('<li>'. |
|
Line 1338 sub print_paste_buffer {
|
Line 2404 sub print_paste_buffer {
|
| } |
} |
| |
|
| my @currpaste = split(/,/,$env{'docs.markedcopies'}); |
my @currpaste = split(/,/,$env{'docs.markedcopies'}); |
| my ($pasteitems,@pasteable); |
my ($pasteitems,@pasteable,$same_institution,$checkedsameinst); |
| my $clipboardcount = 0; |
my $clipboardcount = 0; |
| |
|
| # Construct identifiers for current contents of user's paste buffer |
# Construct identifiers for current contents of user's paste buffer |
|
Line 1346 sub print_paste_buffer {
|
Line 2412 sub print_paste_buffer {
|
| 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}; |
my $mapidx = $env{'docs.markedcopy_map_'.$suffix}; |
| if (($cid =~ /^$match_domain\_$match_courseid$/) && |
if (($cid =~ /^$match_domain\_$match_courseid$/) && |
| ($url ne '')) { |
($url ne '')) { |
| $clipboardcount ++; |
$clipboardcount ++; |
| my ($is_external,$othercourse,$fromsupp,$is_uploaded_map,$parent, |
my ($is_external,$othercourse,$fromsupp,$is_uploaded_map,$parent, |
| $canpaste,$nopaste,$othercrs,$areachange,$is_exttool); |
$canpaste,$nopaste,$othercrs,$areachange,$is_exttool,$toolcdom, |
| |
$toolcnum,$marker); |
| my $extension = (split(/\./,$env{'docs.markedcopy_url_'.$suffix}))[-1]; |
my $extension = (split(/\./,$env{'docs.markedcopy_url_'.$suffix}))[-1]; |
| if ($url =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?::|:))//} ) { |
if ($url =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?::|:))//} ) { |
| $is_external = 1; |
$is_external = 1; |
| } elsif ($url =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$}) { |
} elsif ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) { |
| |
($toolcdom,$toolcnum,$marker) = ($1,$2,$3); |
| $is_exttool = 1; |
$is_exttool = 1; |
| } |
} |
| if ($folder =~ /^supplemental/) { |
if ($folder =~ /^supplemental/) { |
|
Line 1393 sub print_paste_buffer {
|
Line 2461 sub print_paste_buffer {
|
| if ($cid ne $env{'request.course.id'}) { |
if ($cid ne $env{'request.course.id'}) { |
| my ($srcdom,$srcnum) = split(/_/,$cid); |
my ($srcdom,$srcnum) = split(/_/,$cid); |
| if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) { |
if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) { |
| if (($is_exttool) && ($srcdom ne $coursedom)) { |
if ($is_exttool) { |
| $canpaste = 0; |
if ($toolcdom ne $coursedom) { |
| $nopaste = &mt('Paste from another domain unavailable.'); |
$canpaste = 0; |
| } else { |
$nopaste = &mt('Paste from another domain unavailable.'); |
| $othercrs = '<br />'.&mt('(from another course)'); |
} elsif ($toolcnum ne $coursenum) { |
| |
my %toolsettings = |
| |
&Apache::lonnet::dump('exttool_'.$marker,$toolcdom,$toolcnum); |
| |
my %tooltypes = &Apache::loncommon::usable_exttools(); |
| |
if ((($toolsettings{'id'} =~ /^c\d+$/) && (!$tooltypes{'crs'})) || |
| |
(($toolsettings{'id'} =~ /^\d+$/) && (!$tooltypes{'dom'}))) { |
| |
$canpaste = 0; |
| |
$nopaste = &mt('Paste from another course unavailable.'); |
| |
} elsif ($toolsettings{'id'} =~ /^c\d+$/) { |
| |
unless ($checkedsameinst) { |
| |
my $primary_id = &Apache::lonnet::domain($coursedom,'primary'); |
| |
my $intdom = &Apache::lonnet::internet_dom($primary_id); |
| |
if ($intdom ne '') { |
| |
my $internet_names = |
| |
&Apache::lonnet::get_internet_names($Apache::lonnet::perlvar{'lonHostID'}); |
| |
if (ref($internet_names) eq 'ARRAY') { |
| |
if (grep(/^\Q$intdom\E$/,@{$internet_names})) { |
| |
$same_institution = 1; |
| |
} |
| |
} |
| |
} |
| |
$checkedsameinst = 1; |
| |
} |
| |
if ($same_institution) { |
| |
$othercrs = '<br />'.&mt('(from another course)'); |
| |
} else { |
| |
$nopaste = &mt('Paste from another course unavailable.'); |
| |
} |
| |
} else { |
| |
$othercrs = '<br />'.&mt('(from another course)'); |
| |
} |
| |
} |
| } |
} |
| } else { |
} else { |
| $canpaste = 0; |
$canpaste = 0; |
| $nopaste = &mt('Paste from another course unavailable.'); |
$nopaste = &mt('Paste from another course unavailable.'); |
| } |
} |
| } |
} |
| |
} elsif ($url =~ m{/res/($match_domain)/($match_username)/}) { |
| |
my ($audom,$auname) = ($1,$2); |
| |
unless (($auname eq $coursenum) && ($audom eq $coursedom)) { |
| |
if (&Apache::lonnet::is_course($audom,$auname)) { |
| |
$canpaste = 0; |
| |
$nopaste = &mt('Paste from another course unavailable.'); |
| |
} |
| |
} |
| } |
} |
| if ($canpaste) { |
if ($canpaste) { |
| push(@pasteable,$suffix); |
push(@pasteable,$suffix); |
|
Line 1469 sub print_paste_buffer {
|
Line 2576 sub print_paste_buffer {
|
| my $value = &mt('Paste to current folder'); |
my $value = &mt('Paste to current folder'); |
| if ($container eq 'page') { |
if ($container eq 'page') { |
| $value = &mt('Paste to current page'); |
$value = &mt('Paste to current page'); |
| } |
} |
| $buttons = '<input type="submit" name="pastemarked" value="'.$value.'" />'.(' 'x2); |
$buttons = '<input type="submit" name="pastemarked" value="'.$value.'" />'.(' 'x2); |
| } |
} |
| $buttons .= '<input type="submit" name="clearmarked" value="'.&mt('Remove from clipboard').'" />'.(' 'x2); |
$buttons .= '<input type="submit" name="clearmarked" value="'.&mt('Remove from clipboard').'" />'.(' 'x2); |
|
Line 1646 function checkClipboard() {
|
Line 2753 function checkClipboard() {
|
| if (document.pasteform.pasting.length > 1) { |
if (document.pasteform.pasting.length > 1) { |
| for (var i=0; i<document.pasteform.pasting.length; i++) { |
for (var i=0; i<document.pasteform.pasting.length; i++) { |
| document.pasteform.pasting[i].checked = true; |
document.pasteform.pasting[i].checked = true; |
| } |
} |
| } |
} |
| return; |
return; |
| } |
} |
|
Line 1696 sub do_paste_from_buffer {
|
Line 2803 sub do_paste_from_buffer {
|
| return(); |
return(); |
| } |
} |
| |
|
| my (%msgs,%before,%after,@dopaste,%is_map,%notinsupp,%notincrs,%notindom,%duplicate, |
my (%msgs,%before,%after,@dopaste,%is_map,%notinsupp,%notincrs,%notindom, |
| %prefixchg,%srcdom,%srcnum,%srcmapidx,%marktomove,$save_err,$lockerrors,$allresult); |
%othcrstool,%othcrsres,%duplicate,%prefixchg,%srcdom,%srcnum,%srcmapidx, |
| |
%marktomove,$save_err,$lockerrors,$allresult,%currcrsltitools, |
| |
%currltititles,$currltimax,$gotcrsltitools); |
| |
$currltimax = 0; |
| |
$gotcrsltitools = 0; |
| foreach my $suffix (@topaste) { |
foreach my $suffix (@topaste) { |
| my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix}); |
my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix}); |
| my $cid=&LONCAPA::map::qtescape($env{'docs.markedcopy_crs_'.$suffix}); |
my $cid=&LONCAPA::map::qtescape($env{'docs.markedcopy_crs_'.$suffix}); |
| my $mapidx=&LONCAPA::map::qtescape($env{'docs.markedcopy_map_'.$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 1724 sub do_paste_from_buffer {
|
Line 2834 sub do_paste_from_buffer {
|
| } |
} |
| $srcdom{$suffix} = $srcd; |
$srcdom{$suffix} = $srcd; |
| $srcnum{$suffix} = $srcn; |
$srcnum{$suffix} = $srcn; |
| } elsif ($url =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$}) { |
} 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); |
my ($srcd,$srcn) = split(/_/,$cid); |
| # When paste buffer was populated using an active role in a different course |
# When paste buffer was populated using an active role in a different course |
| # check for mdc privilege in the course from which the resource was pasted |
# check for mdc privilege in the course from which the resource was pasted |
|
Line 1735 sub do_paste_from_buffer {
|
Line 2847 sub do_paste_from_buffer {
|
| } |
} |
| } |
} |
| # When buffer was populated using an active role in a different course |
# When buffer was populated using an active role in a different course |
| # disallow pasting of External Tool if course is in a different domain. |
# disallow pasting of External Tool if course is in a different domain, |
| if ($srcd ne $coursedom) { |
# or if External Tool use is not permitted in this course. |
| $notindom{$suffix} = 1; |
if ($url =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) { |
| next; |
my ($toolcdom,$toolcnum,$marker) = ($1,$2,$3); |
| |
if ($toolcdom ne $coursedom) { |
| |
$notindom{$suffix} = 1; |
| |
next; |
| |
} elsif ($toolcnum ne $coursenum) { |
| |
my %toolsettings = |
| |
&Apache::lonnet::dump('exttool_'.$marker,$toolcdom,$toolcnum); |
| |
my %tooltypes = &Apache::loncommon::usable_exttools(); |
| |
if ((($toolsettings{'id'} =~ /^c\d+$/) && (!$tooltypes{'crs'})) || |
| |
(($toolsettings{'id'} =~ /^\d+$/) && (!$tooltypes{'dom'}))) { |
| |
$othcrstool{$suffix} = 1; |
| |
next; |
| |
} |
| |
if ($toolsettings{'id'} =~ /^c\d+$/) { |
| |
unless ($gotcrsltitools) { |
| |
%currcrsltitools = |
| |
&Apache::lonnet::get_course_lti($coursenum,$coursedom,'consumer'); |
| |
foreach my $item (sort(keys(%currcrsltitools))) { |
| |
if (ref($currcrsltitools{$item}) eq 'HASH') { |
| |
$currltimax ++; |
| |
if (ref($currltititles{$currcrsltitools{$item}{'title'}}) eq 'ARRAY') { |
| |
push(@{$currltititles{$currcrsltitools{$item}{'title'}}},$item); |
| |
} else { |
| |
$currltititles{$currcrsltitools{$item}{'title'}} = [$item]; |
| |
} |
| |
} |
| |
} |
| |
$gotcrsltitools = 1; |
| |
} |
| |
} |
| |
} |
| } |
} |
| $srcdom{$suffix} = $srcd; |
$srcdom{$suffix} = $srcd; |
| $srcnum{$suffix} = $srcn; |
$srcnum{$suffix} = $srcn; |
| } elsif (($url =~ m{^/res/lib/templates/\w+\.problem$}) || |
} elsif ($url =~ m{^/res/($match_domain)/($match_courseid)/}) { |
| ($url =~ m{^/adm/$match_domain/$match_username/\d+/(bulletinboard|smppg)$})) { |
my ($audom,$auname) = ($1,$2); |
| my ($srcd,$srcn) = split(/_/,$cid); |
# When buffer was populated using an active role in a different course |
| # When paste buffer was populated using an active role in a different course |
# disallow pasting of published resources from Course Authoring Space |
| # check for mdc privilege in the course from which the resource was pasted |
unless (($auname eq $coursenum) && ($audom eq $coursedom)) { |
| if (($srcd ne $coursedom) || ($srcn ne $coursenum)) { |
if (&Apache::lonnet::is_course($audom,$auname)) { |
| unless ($env{"user.priv.cm./$srcd/$srcn"} =~ /\Q:mdc&F\E/) { |
$othcrsres{$suffix} = 1; |
| $notincrs{$suffix} = 1; |
|
| next; |
next; |
| } |
} |
| } |
} |
| $srcdom{$suffix} = $srcd; |
|
| $srcnum{$suffix} = $srcn; |
|
| } |
} |
| $srcmapidx{$suffix} = $mapidx; |
$srcmapidx{$suffix} = $mapidx; |
| push(@dopaste,$suffix); |
push(@dopaste,$suffix); |
| if ($url=~/\.(page|sequence)$/) { |
if ($url=~/\.(page|sequence)$/) { |
| $is_map{$suffix} = 1; |
$is_map{$suffix} = 1; |
| } |
} |
| |
|
| if ($url =~ m{^/uploaded/$match_domain/$match_courseid/([^/]+)}) { |
if ($url =~ m{^/uploaded/$match_domain/$match_courseid/([^/]+)}) { |
| my $oldprefix = $1; |
my $oldprefix = $1; |
| # When pasting content from Main Content to Supplemental Content and vice versa |
# When pasting content from Main Content to Supplemental Content and vice versa |
| # 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 1806 sub do_paste_from_buffer {
|
Line 2944 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.', |
notindom => 'Paste failed: Item is an external tool from a course in a different domain.', |
| |
othcrstool => 'Paste failed: Item is an external tool from a different course, for which use is not allowed in this course.', |
| |
othcrsres => 'Paste failed: Item is a course-authored resource from a different course', |
| duplicate => 'Paste failed: only one instance of a particular published sequence or page is allowed within each course.', |
duplicate => 'Paste failed: only one instance of a particular published sequence or page is allowed within each course.', |
| ); |
); |
| |
|
|
Line 1835 sub do_paste_from_buffer {
|
Line 2975 sub do_paste_from_buffer {
|
| # Retrieve information about all course maps in main content area |
# Retrieve information about all course maps in main content area |
| |
|
| my $allmaps = {}; |
my $allmaps = {}; |
| my (@toclear,%mapurls,%lockerrs,%msgerrs,%results,$donechk); |
my (@toclear,%mapurls,%lockerrs,%msgerrs,%results,$donechk, |
| |
@updatetoolsenc,$updatetoolscache,$checkedsameinst, |
| |
$same_institution); |
| |
|
| # Loop over the items to paste |
# Loop over the items to paste |
| foreach my $suffix (@dopaste) { |
foreach my $suffix (@dopaste) { |
|
Line 1848 sub do_paste_from_buffer {
|
Line 2990 sub do_paste_from_buffer {
|
| } |
} |
| 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 $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 |
|
Line 1858 sub do_paste_from_buffer {
|
Line 3000 sub do_paste_from_buffer {
|
| &Apache::loncommon::allmaps_incourse($coursedom,$coursenum, |
&Apache::loncommon::allmaps_incourse($coursedom,$coursenum, |
| $env{"course.$env{'request.course.id'}.home"}, |
$env{"course.$env{'request.course.id'}.home"}, |
| $env{'request.course.id'}); |
$env{'request.course.id'}); |
| $donechk = 1; |
$donechk = 1; |
| } |
} |
| &contained_map_check($url,$folder,$coursenum,$coursedom, |
&contained_map_check($url,$folder,$coursenum,$coursedom, |
| \%removefrommap,\%removeparam,\%addedmaps, |
\%removefrommap,\%removeparam,\%addedmaps, |
|
Line 1901 sub do_paste_from_buffer {
|
Line 3043 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,\%resdatacopy); |
\%tomove,\%newsubdir,\%newurls,\%resdatacopy); |
| } |
} |
| } elsif ($url=~m {^/res/}) { |
} elsif ($url=~m {^/res/}) { |
| # published map can only exist once, so remove from paste buffer when done |
# published map can only exist once, so remove from paste buffer when done |
|
Line 1924 sub do_paste_from_buffer {
|
Line 3066 sub do_paste_from_buffer {
|
| cdom => $coursedom, |
cdom => $coursedom, |
| cnum => $coursenum, |
cnum => $coursenum, |
| ); |
); |
| |
if ($prefix eq 'ext.tool') { |
| |
if ($prefixchg{$suffix} eq 'docstosupp') { |
| |
$info{'delgradable'} = 1; |
| |
} |
| |
} |
| if (($srcdom{$suffix} =~ /^$match_domain$/) && ($srcnum{$suffix} =~ /^$match_courseid$/)) { |
if (($srcdom{$suffix} =~ /^$match_domain$/) && ($srcnum{$suffix} =~ /^$match_courseid$/)) { |
| unless (($srcdom{$suffix} eq $coursedom) && ($srcnum{$suffix} eq $coursenum)) { |
unless (($srcdom{$suffix} eq $coursedom) && ($srcnum{$suffix} eq $coursenum)) { |
| $fromothercrs = 1; |
$fromothercrs = 1; |
| $info{'cdom'} = $srcdom{$suffix}; |
$info{'cdom'} = $srcdom{$suffix}; |
| $info{'cnum'} = $srcnum{$suffix}; |
$info{'cnum'} = $srcnum{$suffix}; |
| |
unless ($checkedsameinst) { |
| |
my $primary_id = &Apache::lonnet::domain($coursedom,'primary'); |
| |
my $intdom = &Apache::lonnet::internet_dom($primary_id); |
| |
if ($intdom ne '') { |
| |
my $internet_names = |
| |
&Apache::lonnet::get_internet_names($Apache::lonnet::perlvar{'lonHostID'}); |
| |
if (ref($internet_names) eq 'ARRAY') { |
| |
if (grep(/^\Q$intdom\E$/,@{$internet_names})) { |
| |
$same_institution = 1; |
| |
} |
| |
} |
| |
} |
| |
$checkedsameinst = 1; |
| |
} |
| } |
} |
| } |
} |
| unless (($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') && (!$fromothercrs)) { |
unless (($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') && (!$fromothercrs)) { |
| my (%lockerr,$msg); |
my (%lockerr,$msg); |
| my ($newurl,$result,$errtext) = |
my ($newurl,$result,$errtext) = |
| &dbcopy(\%info,$coursedom,$coursenum,\%lockerr); |
&dbcopy(\%info,$coursedom,$coursenum,\%lockerr,\%currltititles, |
| |
\$currltimax,\@updatetoolsenc,\$updatetoolscache,$same_institution); |
| if ($result eq 'ok') { |
if ($result eq 'ok') { |
| $url = $newurl; |
$url = $newurl; |
| $title=&mt('Copy of').' '.$title; |
$title=&mt('Copy of').' '.$title; |
|
Line 1952 sub do_paste_from_buffer {
|
Line 3114 sub do_paste_from_buffer {
|
| next; |
next; |
| } |
} |
| if ($lockerr{$prefix}) { |
if ($lockerr{$prefix}) { |
| $lockerrs{$suffix} = $lockerr{$prefix}; |
$lockerrs{$suffix} = $lockerr{$prefix}; |
| } |
} |
| } |
} |
| } |
} |
|
Line 1992 sub do_paste_from_buffer {
|
Line 3154 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 2015 sub do_paste_from_buffer {
|
Line 3177 sub do_paste_from_buffer {
|
| ©_templated_files($url,$srcdom{$suffix},$srcnum{$suffix},$srcmapidx{$suffix}, |
©_templated_files($url,$srcdom{$suffix},$srcnum{$suffix},$srcmapidx{$suffix}, |
| $coursedom,$coursenum,$template,$newidx,"$folder.$container"); |
$coursedom,$coursenum,$template,$newidx,"$folder.$container"); |
| } |
} |
| |
} elsif ($url =~ /ext\.tool$/) { |
| |
if (($newidx) && ($folder=~/^default/)) { |
| |
my $marker = (split(m{/},$url))[4]; |
| |
my %toolsettings = &Apache::lonnet::dump('exttool_'.$marker,$coursedom,$coursenum); |
| |
my $val = 'no'; |
| |
if ($toolsettings{'gradable'}) { |
| |
$val = 'yes'; |
| |
} |
| |
&LONCAPA::map::storeparameter($newidx,'parameter_0_gradable',$val, |
| |
'string_yesno'); |
| |
&remember_parms($newidx,'gradable','set',$val); |
| |
} |
| } |
} |
| $LONCAPA::map::resources[$newidx]=$title.':'.&LONCAPA::map::qtunescape($url). |
$LONCAPA::map::resources[$newidx]=$title.':'.&LONCAPA::map::qtunescape($url). |
| ':'.$ext.':normal:res'; |
':'.$ext.':normal:res'; |
|
Line 2028 sub do_paste_from_buffer {
|
Line 3202 sub do_paste_from_buffer {
|
| } |
} |
| } |
} |
| |
|
| # Apply any changes to maps, or copy dependencies for uploaded HTML pages, or update |
# Apply any changes to maps, or copy dependencies for uploaded HTML pages, or update |
| # resourcedata for simpleproblems copied from another course |
# resourcedata for simpleproblems copied from another course |
| unless ($allresult eq 'fail') { |
unless ($allresult eq 'fail') { |
| my %updated = ( |
my %updated = ( |
| rewrites => \%rewrites, |
rewrites => \%rewrites, |
|
Line 2091 sub do_paste_from_buffer {
|
Line 3265 sub do_paste_from_buffer {
|
| } |
} |
| } |
} |
| } |
} |
| |
if (($updatetoolscache) || (@updatetoolsenc)) { |
| |
&update_ltitools_caches($coursedom,$coursenum,$updatetoolscache, |
| |
\@updatetoolsenc); |
| |
} |
| &clear_from_buffer(\@toclear,\@currpaste); |
&clear_from_buffer(\@toclear,\@currpaste); |
| my $msgsarray; |
my $msgsarray; |
| foreach my $suffix (keys(%msgs)) { |
foreach my $suffix (keys(%msgs)) { |
|
Line 2139 sub clear_from_buffer {
|
Line 3317 sub clear_from_buffer {
|
| return $numdel; |
return $numdel; |
| } |
} |
| |
|
| |
sub update_ltitools_caches { |
| |
my ($coursedom,$coursenum,$updatetoolscache,$updatetoolsenc) = @_; |
| |
my $hashid=$coursedom.'_'.$coursenum; |
| |
if ($updatetoolscache) { |
| |
&Apache::lonnet::devalidate_cache_new('courseltitools',$hashid); |
| |
} |
| |
if ((ref($updatetoolsenc) eq 'ARRAY') && |
| |
(@{$updatetoolsenc})) { |
| |
my @ids=&Apache::lonnet::current_machine_ids(); |
| |
my $updatedone; |
| |
foreach my $lonhost (@{$updatetoolsenc}) { |
| |
if (grep(/^\Q$lonhost\E$/,@ids)) { |
| |
unless ($updatedone) { |
| |
&Apache::lonnet::devalidate_cache_new('crsltitoolsenc',$hashid); |
| |
} |
| |
$updatedone = 1; |
| |
} else { |
| |
&Apache::lonnet::remote_devalidate_cache($lonhost,["crsltitoolsenc:$hashid"]); |
| |
} |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| sub get_newmap_url { |
sub get_newmap_url { |
| my ($url,$folder,$prefixchg,$coursedom,$coursenum,$srcdom,$srcnum, |
my ($url,$folder,$prefixchg,$coursedom,$coursenum,$srcdom,$srcnum, |
| $titleref,$allmaps,$newurls) = @_; |
$titleref,$allmaps,$newurls) = @_; |
|
Line 2200 sub get_newmap_url {
|
Line 3402 sub get_newmap_url {
|
| } |
} |
| |
|
| sub dbcopy { |
sub dbcopy { |
| my ($dbref,$coursedom,$coursenum,$lockerrorsref) = @_; |
my ($dbref,$coursedom,$coursenum,$lockerrorsref,$currltititles, |
| |
$currltimax,$updatetoolsenc,$updatetoolscache,$same_institution) = @_; |
| my ($url,$result,$errtext); |
my ($url,$result,$errtext); |
| if (ref($dbref) eq 'HASH') { |
if (ref($dbref) eq 'HASH') { |
| $url = $dbref->{'src'}; |
$url = $dbref->{'src'}; |
|
Line 2209 sub dbcopy {
|
Line 3412 sub dbcopy {
|
| if ($prefix eq 'ext.tool') { |
if ($prefix eq 'ext.tool') { |
| $prefix = 'exttool'; |
$prefix = 'exttool'; |
| } |
} |
| if (($dbref->{'cdom'} =~ /^$match_domain$/) && |
if (($dbref->{'cdom'} =~ /^$match_domain$/) && |
| ($dbref->{'cnum'} =~ /^$match_courseid$/)) { |
($dbref->{'cnum'} =~ /^$match_courseid$/)) { |
| my $db_name; |
my $db_name; |
| my $marker = (split(m{/},$url))[4]; |
my $marker = (split(m{/},$url))[4]; |
|
Line 2244 sub dbcopy {
|
Line 3447 sub dbcopy {
|
| my %contents=&Apache::lonnet::dump($db_name, |
my %contents=&Apache::lonnet::dump($db_name, |
| $dbref->{'cdom'}, |
$dbref->{'cdom'}, |
| $dbref->{'cnum'}); |
$dbref->{'cnum'}); |
| |
my ($toolcopyerror,$toolpassback,$toolroster,%toolinfo,$oldtoolid,$defincrs); |
| |
if ($url eq '/adm/'.$dbref->{'cdom'}.'/'.$dbref->{'cnum'}."/$marker/ext.tool") { |
| |
if ($contents{'id'} =~ /^(|c)(\d+)$/) { |
| |
$oldtoolid = $2; |
| |
if ($1 eq 'c') { |
| |
$defincrs = 1; |
| |
%toolinfo = |
| |
&Apache::lonnet::get('ltitools',[$oldtoolid],$dbref->{'cdom'},$dbref->{'cnum'}); |
| |
} else { |
| |
%toolinfo= &Apache::lonnet::get_domain_lti($dbref->{'cdom'},'consumer'); |
| |
} |
| |
if (ref($toolinfo{$oldtoolid}) eq 'HASH') { |
| |
if ($toolinfo{$oldtoolid}{'passback'}) { |
| |
$toolpassback = 1; |
| |
} |
| |
if ($toolinfo{$oldtoolid}{'roster'}) { |
| |
$toolroster = 1; |
| |
} |
| |
} else { |
| |
$toolcopyerror = 1; |
| |
$errtext = &mt('Could not retrieve original settings for pasted external tool.'); |
| |
} |
| |
} |
| |
unless (($dbref->{'cnum'} eq $coursenum) && ($dbref->{'cdom'} eq $coursedom)) { |
| |
$url = "/adm/$coursedom/$coursenum/$marker/ext.tool"; |
| |
if ($contents{'crstitle'} ne '') { |
| |
$contents{'crstitle'} = $env{'course.'.$coursedom.'_'.$coursenum.'.description'}; |
| |
} |
| |
if (($defincrs) && (!$toolcopyerror)) { |
| |
my %newtool; |
| |
my $oldcdom = $dbref->{'cdom'}; |
| |
my $oldcnum = $dbref->{'cnum'}; |
| |
my $title = $toolinfo{$oldtoolid}{'title'}; |
| |
if (ref($currltititles) eq 'HASH') { |
| |
if (exists($currltititles->{$title})) { |
| |
$title .= ' (copied from another course)'; |
| |
} |
| |
} |
| |
my ($newid,$iderror) = |
| |
&Apache::lonnet::get_ltitools_id('course',$coursedom,$coursenum,$title); |
| |
if ($newid =~ /^\d+$/) { |
| |
%{$newtool{$newid}} = %{$toolinfo{$oldtoolid}}; |
| |
$newtool{$newid}{'title'} = $title; |
| |
if (ref($currltimax)) { |
| |
$newtool{$newid}{'order'} = $$currltimax; |
| |
} |
| |
if ($newtool{$newid}{'image'} =~ m{^\Q/uploaded/$oldcdom/$oldcnum/toollogo/$oldtoolid/\E([^/]+)$}) { |
| |
my $fname = $1; |
| |
my $content = &Apache::lonnet::getfile($newtool{$newid}{'image'}); |
| |
if ($content eq '-1') { |
| |
delete($newtool{$newid}{'image'}); |
| |
} else { |
| |
$env{'form.'.$suffix.'.image'} = $content; |
| |
my $newlogo = |
| |
&Apache::lonnet::finishuserfileupload($coursenum,$coursedom,$suffix.'.image',"toollogo/$newid/$fname"); |
| |
delete($env{'form.'.$suffix.'.image'}); |
| |
if ($newlogo =~ m{^/uploaded/}) { |
| |
$newtool{$newid}{'image'} = $newlogo; |
| |
} else { |
| |
delete($newtool{$newid}{'image'}); |
| |
} |
| |
} |
| |
} |
| |
my $newusable; |
| |
if ($same_institution) { |
| |
my %oldtoolsenc = &Apache::lonnet::eget('nohist_toolsenc',[$oldtoolid],$oldcdom,$oldcnum); |
| |
if (ref($oldtoolsenc{$oldtoolid}) eq 'HASH') { |
| |
my %newtoolsenc; |
| |
%{$newtoolsenc{$newid}} = %{$oldtoolsenc{$oldtoolid}}; |
| |
my $putres = &Apache::lonnet::put('nohist_toolsenc',\%newtoolsenc,$coursedom,$coursenum,1); |
| |
if ($putres eq 'ok') { |
| |
if (ref($updatetoolsenc) eq 'ARRAY') { |
| |
my $newhome = &Apache::lonnet::homeserver($coursenum,$coursedom); |
| |
unless (grep(/^\Q$newhome\E$/,@{$updatetoolsenc})) { |
| |
push(@{$updatetoolsenc},$newhome); |
| |
} |
| |
} |
| |
$newusable = 1; |
| |
} |
| |
} |
| |
} |
| |
if ($newtool{$newid}{'usable'}) { |
| |
unless ($newusable) { |
| |
delete($newtool{$newid}{'usable'}); |
| |
} |
| |
} |
| |
my $putres = &Apache::lonnet::put('ltitools',\%newtool,$coursedom,$coursenum); |
| |
if ($putres eq 'ok') { |
| |
$contents{'id'} = "c$newid"; |
| |
if (ref($updatetoolscache)) { |
| |
$$updatetoolscache ++; |
| |
} |
| |
if (ref($currltititles->{$title}) eq 'ARRAY') { |
| |
push(@{$currltititles->{$title}},$newid); |
| |
} else { |
| |
$currltititles->{$title} = [$newid]; |
| |
} |
| |
if (ref($currltimax)) { |
| |
$$currltimax ++; |
| |
} |
| |
} else { |
| |
$toolcopyerror = 1; |
| |
$errtext = &mt('Unable to save external tool definition in Course Settings.'); |
| |
} |
| |
} else { |
| |
$toolcopyerror = 1; |
| |
$errtext = &mt('Unable to retrieve new tool ID when adding external tool definition to Course Settings.'); |
| |
} |
| |
} |
| |
} |
| |
} |
| if (exists($contents{'uploaded.photourl'})) { |
if (exists($contents{'uploaded.photourl'})) { |
| my $photo = $contents{'uploaded.photourl'}; |
my $photo = $contents{'uploaded.photourl'}; |
| my ($subdir,$fname) = |
my ($subdir,$fname) = |
|
Line 2253 sub dbcopy {
|
Line 3567 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 2263 sub dbcopy {
|
Line 3577 sub dbcopy {
|
| } |
} |
| } |
} |
| $db_name =~ s{_\d*$ }{_$suffix}x; |
$db_name =~ s{_\d*$ }{_$suffix}x; |
| $result=&Apache::lonnet::put($db_name,\%contents, |
if ($prefix eq 'exttool') { |
| $coursedom,$coursenum); |
unless ($toolcopyerror) { |
| if ($result eq 'ok') { |
foreach my $key ('oldgradesecret','gradesecret','gradesecretdate','oldrostersecret','rostersecret','rostersecretdate') { |
| $url =~ s{/(\d*)/(smppg|bulletinboard|ext\.tool)$}{/$suffix/$2}x; |
if (exists($contents{$key})) { |
| |
delete($contents{$key}); |
| |
} |
| |
} |
| |
if ($dbref->{'delgradable'}) { |
| |
if (exists($contents{'gradable'})) { |
| |
delete($contents{'gradable'}); |
| |
} |
| |
} |
| |
if ($toolpassback) { |
| |
if ($contents{'gradable'}) { |
| |
my $gradesecret = UUID::Tiny::create_uuid_as_string(UUID_V4); |
| |
$contents{'gradesecret'} = $gradesecret; |
| |
$contents{'gradesecretdate'} = time; |
| |
} |
| |
} |
| |
if ($toolroster) { |
| |
my $rostersecret = UUID::Tiny::create_uuid_as_string(UUID_V4); |
| |
$contents{'rostersecret'} = $rostersecret; |
| |
$contents{'rostersecretdate'} = time; |
| |
} |
| |
} |
| |
} |
| |
if (($prefix eq 'exttool') && ($toolcopyerror)) { |
| |
$result = 'error'; |
| |
} else { |
| |
$result=&Apache::lonnet::put($db_name,\%contents, |
| |
$coursedom,$coursenum); |
| |
if ($result eq 'ok') { |
| |
$url =~ s{/(\d*)/(smppg|bulletinboard|ext\.tool)$}{/$suffix/$2}x; |
| |
} |
| } |
} |
| } |
} |
| if (($freedlock ne 'ok') && (ref($lockerrorsref) eq 'HASH')) { |
if (($freedlock ne 'ok') && (ref($lockerrorsref) eq 'HASH')) { |
|
Line 2421 sub contained_map_check {
|
Line 3765 sub contained_map_check {
|
| if ($token->[1] eq 'resource') { |
if ($token->[1] eq 'resource') { |
| next if ($token->[2]->{'type'} eq 'zombie'); |
next if ($token->[2]->{'type'} eq 'zombie'); |
| my $ressrc = $token->[2]->{'src'}; |
my $ressrc = $token->[2]->{'src'}; |
| if ($folder =~ /^supplemental/) { |
if ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/(\d+)/ext\.tool$}) { |
| |
my ($srcdom,$srcnum,$marker) = ($1,$2,$3); |
| |
unless ($srcdom eq $coursedom) { |
| |
$removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; |
| |
next; |
| |
} |
| |
unless ($srcnum eq $coursenum) { |
| |
my %toolsettings = |
| |
&Apache::lonnet::dump('exttool_'.$marker,$srcdom,$srcnum); |
| |
my %tooltypes = &Apache::loncommon::usable_exttools(); |
| |
if ((($toolsettings{'id'} =~ /^c\d+$/) && (!$tooltypes{'crs'})) || |
| |
(($toolsettings{'id'} =~ /^\d+$/) && (!$tooltypes{'dom'}))) { |
| |
$removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; |
| |
next; |
| |
} |
| |
} |
| |
} elsif ($folder =~ /^supplemental/) { |
| unless (&supp_pasteable($ressrc)) { |
unless (&supp_pasteable($ressrc)) { |
| $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; |
$removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; |
| next; |
next; |
| } |
} |
| } |
} |
| |
if ($ressrc =~ m{^/res/($match_domain)/($match_courseid)/}) { |
| |
my ($srcdom,$srcnum) = ($1,$2); |
| |
unless (($srcnum eq $coursenum) && ($srcdom eq $coursedom)) { |
| |
if (&Apache::lonnet::is_course($srcdom,$srcnum)) { |
| |
$removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc; |
| |
next; |
| |
} |
| |
} |
| |
} |
| if ($ressrc =~ m{^/(res|uploaded)/.+\.(sequence|page)$}) { |
if ($ressrc =~ m{^/(res|uploaded)/.+\.(sequence|page)$}) { |
| if ($1 eq 'uploaded') { |
if ($1 eq 'uploaded') { |
| $hierarchy->{$url}{$token->[2]->{'id'}} = $ressrc; |
$hierarchy->{$url}{$token->[2]->{'id'}} = $ressrc; |
|
Line 2440 sub contained_map_check {
|
Line 3809 sub contained_map_check {
|
| $addedmaps->{$ressrc} = [$url]; |
$addedmaps->{$ressrc} = [$url]; |
| } |
} |
| } |
} |
| &contained_map_check($ressrc,$folder,$coursenum,$coursedom, |
&contained_map_check($ressrc,$folder,$coursenum,$coursedom,$removefrommap, |
| $removefrommap,$removeparam, |
$removeparam,$addedmaps,$hierarchy,$titles,$allmaps); |
| $addedmaps,$hierarchy,$titles,$allmaps); |
|
| } |
} |
| } elsif ($token->[1] eq 'param') { |
} elsif ($token->[1] eq 'param') { |
| if ($folder =~ /^supplemental/) { |
if ($folder =~ /^supplemental/) { |
|
Line 2493 sub url_paste_fixups {
|
Line 3861 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 2544 sub url_paste_fixups {
|
Line 3912 sub url_paste_fixups {
|
| $changed = 1; |
$changed = 1; |
| } |
} |
| } |
} |
| } elsif ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/.+$}) { |
} elsif ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/(.+)$}) { |
| next if ($skip); |
next if ($skip); |
| my $srcdom = $1; |
my $srcdom = $1; |
| my $srcnum = $2; |
my $srcnum = $2; |
| |
my $rem = $3; |
| |
my ($is_exttool,$exttoolchg); |
| |
if ($rem =~ m{\d+/ext\.tool$}) { |
| |
$is_exttool = 1; |
| |
} |
| if (($srcdom ne $cdom) || ($srcnum ne $cnum)) { |
if (($srcdom ne $cdom) || ($srcnum ne $cnum)) { |
| $rewrites->{$oldurl}{$id} = $ressrc; |
$rewrites->{$oldurl}{$id} = $ressrc; |
| $dbcopies->{$oldurl}{$id}{'src'} = $ressrc; |
$dbcopies->{$oldurl}{$id}{'src'} = $ressrc; |
| $dbcopies->{$oldurl}{$id}{'cdom'} = $srcdom; |
$dbcopies->{$oldurl}{$id}{'cdom'} = $srcdom; |
| $dbcopies->{$oldurl}{$id}{'cnum'} = $srcnum; |
$dbcopies->{$oldurl}{$id}{'cnum'} = $srcnum; |
| $changed = 1; |
$changed = 1; |
| |
if ($is_exttool) { |
| |
$exttoolchg = 1; |
| |
} |
| |
} elsif (($is_exttool) && |
| |
($env{'form.docs.markedcopy_options'} ne 'move')) { |
| |
$dbcopies->{$oldurl}{$id}{'src'} = $ressrc; |
| |
$dbcopies->{$oldurl}{$id}{'cdom'} = $srcdom; |
| |
$dbcopies->{$oldurl}{$id}{'cnum'} = $srcnum; |
| |
$changed = 1; |
| |
$exttoolchg = 1; |
| |
} |
| |
if (($is_exttool) && ($prefixchg)) { |
| |
if ($oldurl =~ m{^/uploaded/$match_domain/$match_courseid/default}) { |
| |
if ($exttoolchg) { |
| |
$dbcopies->{$oldurl}{$id}{'delgradable'} = 1; |
| |
} |
| |
} |
| } |
} |
| } elsif ($ressrc =~ m{^/adm/$match_domain/$match_username/\d+/(smppg|bulletinboard)$}) { |
} elsif ($ressrc =~ m{^/adm/$match_domain/$match_username/\d+/(smppg|bulletinboard)$}) { |
| if (($fromcdom ne $cdom) || ($fromcnum ne $cnum) || |
if (($fromcdom ne $cdom) || ($fromcnum ne $cnum) || |
|
Line 2600 sub apply_fixups {
|
Line 3990 sub apply_fixups {
|
| $oldurl,$url,$caller) = @_; |
$oldurl,$url,$caller) = @_; |
| my (%rewrites,%zombies,%removefrommap,%removeparam,%dbcopies,%retitles, |
my (%rewrites,%zombies,%removefrommap,%removeparam,%dbcopies,%retitles, |
| %params,%newsubdir,%before,%after,%copies,%docmoves,%mapmoves,@msgs, |
%params,%newsubdir,%before,%after,%copies,%docmoves,%mapmoves,@msgs, |
| %resdatacopy,%lockerrors,$lockmsg); |
%resdatacopy,%lockerrors,$lockmsg,%currcrsltitools,$gotcrsltitools, |
| |
%currltititles,$currltimax); |
| |
$currltimax = 0; |
| if (ref($updated) eq 'HASH') { |
if (ref($updated) eq 'HASH') { |
| if (ref($updated->{'rewrites'}) eq 'HASH') { |
if (ref($updated->{'rewrites'}) eq 'HASH') { |
| %rewrites = %{$updated->{'rewrites'}}; |
%rewrites = %{$updated->{'rewrites'}}; |
|
Line 2751 sub apply_fixups {
|
Line 4143 sub apply_fixups {
|
| } |
} |
| } |
} |
| } |
} |
| |
my ($updatetoolscache,@updatetoolsenc,$same_institution,$checkedsameinst); |
| foreach my $key (keys(%updates)) { |
foreach my $key (keys(%updates)) { |
| my (%torewrite,%toretitle,%toremove,%remparam,%currparam,%zombie,%newdb); |
my (%torewrite,%toretitle,%toremove,%remparam,%currparam,%zombie,%newdb); |
| if (ref($rewrites{$key}) eq 'HASH') { |
if (ref($rewrites{$key}) eq 'HASH') { |
|
Line 2771 sub apply_fixups {
|
Line 4164 sub apply_fixups {
|
| if (ref($dbcopies{$key}) eq 'HASH') { |
if (ref($dbcopies{$key}) eq 'HASH') { |
| foreach my $idx (keys(%{$dbcopies{$key}})) { |
foreach my $idx (keys(%{$dbcopies{$key}})) { |
| if (ref($dbcopies{$key}{$idx}) eq 'HASH') { |
if (ref($dbcopies{$key}{$idx}) eq 'HASH') { |
| |
my $oldurl = $dbcopies{$key}{$idx}{'src'}; |
| |
my $oldcdom = $dbcopies{$key}{$idx}{'cdom'}; |
| |
my $oldcnum = $dbcopies{$key}{$idx}{'cnum'}; |
| |
my $oldmarker; |
| |
if ($oldurl =~ m{^\Q/adm/$oldcdom/$oldcnum/\E(\d+)/ext\.tool$}) { |
| |
$oldmarker = $1; |
| |
unless (($gotcrsltitools) || |
| |
(($oldcnum eq $cnum) && ($oldcdom eq $cdom))) { |
| |
my %oldtoolsettings=&Apache::lonnet::dump('exttool_'.$oldmarker,$oldcdom,$oldcnum); |
| |
if ($oldtoolsettings{'id'} =~ /^c\d+$/) { |
| |
unless ($gotcrsltitools) { |
| |
%currcrsltitools = |
| |
&Apache::lonnet::get_course_lti($cnum,$cdom,'consumer'); |
| |
foreach my $item (sort(keys(%currcrsltitools))) { |
| |
if (ref($currcrsltitools{$item}) eq 'HASH') { |
| |
$currltimax ++; |
| |
if (ref($currltititles{$currcrsltitools{$item}{'title'}}) eq 'ARRAY') { |
| |
push(@{$currltititles{$currcrsltitools{$item}{'title'}}},$item); |
| |
} else { |
| |
$currltititles{$currcrsltitools{$item}{'title'}} = [$item]; |
| |
} |
| |
} |
| |
} |
| |
$gotcrsltitools = 1; |
| |
} |
| |
unless ($checkedsameinst) { |
| |
my $primary_id = &Apache::lonnet::domain($cdom,'primary'); |
| |
my $intdom = &Apache::lonnet::internet_dom($primary_id); |
| |
if ($intdom ne '') { |
| |
my $internet_names = |
| |
&Apache::lonnet::get_internet_names($Apache::lonnet::perlvar{'lonHostID'}); |
| |
if (ref($internet_names) eq 'ARRAY') { |
| |
if (grep(/^\Q$intdom\E$/,@{$internet_names})) { |
| |
$same_institution = 1; |
| |
} |
| |
} |
| |
} |
| |
$checkedsameinst = 1; |
| |
} |
| |
} |
| |
} |
| |
} |
| my ($newurl,$result,$errtext) = |
my ($newurl,$result,$errtext) = |
| &dbcopy($dbcopies{$key}{$idx},$cdom,$cnum,\%lockerrors); |
&dbcopy($dbcopies{$key}{$idx},$cdom,$cnum,\%lockerrors,\%currltititles, |
| |
\$currltimax,\@updatetoolsenc,\$updatetoolscache,$same_institution); |
| if ($result eq 'ok') { |
if ($result eq 'ok') { |
| $newdb{$idx} = $newurl; |
$newdb{$idx} = $newurl; |
| |
if ($newurl =~ /ext\.tool$/) { |
| |
if ($torewrite{$idx} eq "/adm/$oldcdom/$oldcnum/$oldmarker/ext.tool") { |
| |
if ($newurl =~ m{^\Q/adm/$cdom/$cnum/\E(\d+)/ext.tool$}) { |
| |
my $newmarker = $1; |
| |
unless ($oldmarker eq $newmarker) { |
| |
$torewrite{$idx} = "/adm/$oldcdom/$oldcnum/$newmarker/ext.tool"; |
| |
} |
| |
} |
| |
} |
| |
} |
| } elsif (ref($errors) eq 'HASH') { |
} elsif (ref($errors) eq 'HASH') { |
| $errors->{$key} = 1; |
$errors->{$key} = 1; |
| } |
} |
|
Line 2913 sub apply_fixups {
|
Line 4359 sub apply_fixups {
|
| } |
} |
| } |
} |
| } |
} |
| |
if (($updatetoolscache) || (@updatetoolsenc)) { |
| |
&update_ltitools_caches($cdom,$cnum,$updatetoolscache, |
| |
\@updatetoolsenc); |
| |
} |
| } |
} |
| return ('ok',\@msgs,$lockmsg); |
return ('ok',\@msgs,$lockmsg); |
| } |
} |
|
Line 3015 sub update_parameter {
|
Line 4465 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 3067 sub update_parameter {
|
Line 4517 sub update_parameter {
|
| $oldvalue = 1; |
$oldvalue = 1; |
| } |
} |
| if ($env{'form.'.$which.'_'.$idx}) { |
if ($env{'form.'.$which.'_'.$idx}) { |
| $newvalue = ($which eq 'randompick') ? $env{'form.rpicknum_'.$idx} |
$newvalue = ($which eq 'randompick') ? $env{'form.rpicknum_'.$idx} |
| : 1; |
: 1; |
| } |
} |
| if ($oldvalue ne $newvalue) { |
if ($oldvalue ne $newvalue) { |
| $haschanges = 1; |
$haschanges = 1; |
|
Line 3077 sub update_parameter {
|
Line 4527 sub update_parameter {
|
| if ($which eq 'randompick') { |
if ($which eq 'randompick') { |
| $storeval = $newvalue; |
$storeval = $newvalue; |
| } |
} |
| &LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $storeval, |
&LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $storeval, |
| $parameter_type{$which}); |
$parameter_type{$which}); |
| &remember_parms($idx,$which,'set',$storeval); |
&remember_parms($idx,$which,'set',$storeval); |
| } else { |
} else { |
| &LONCAPA::map::delparameter($idx,'parameter_'.$which); |
&LONCAPA::map::delparameter($idx,'parameter_'.$which); |
| &remember_parms($idx,$which,'del'); |
&remember_parms($idx,$which,'del'); |
| } |
} |
| } |
} |
| return $haschanges; |
return $haschanges; |
| } |
} |
| return; |
|
| } |
} |
| |
|
| 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 3108 sub handle_edit_cmd {
|
Line 4558 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 3130 sub handle_edit_cmd {
|
Line 4580 sub handle_edit_cmd {
|
| # Devalidate title cache |
# Devalidate title cache |
| my $renamed_url=&LONCAPA::map::qtescape($url); |
my $renamed_url=&LONCAPA::map::qtescape($url); |
| &Apache::lonnet::devalidate_title_cache($renamed_url); |
&Apache::lonnet::devalidate_title_cache($renamed_url); |
| |
$haschanges = 1; |
| } else { |
} elsif ($cmd eq 'setalias') { |
| return 0; |
my $newvalue = $env{'form.alias'}; |
| |
if ($newvalue ne '') { |
| |
unless (Apache::lonnet::get_symb_from_alias($newvalue)) { |
| |
&LONCAPA::map::storeparameter($idx,'parameter_0_mapalias',$newvalue, |
| |
'string'); |
| |
&remember_parms($idx,'mapalias','set',$newvalue); |
| |
$haschanges = 1; |
| |
} |
| |
} |
| |
} elsif ($cmd eq 'delalias') { |
| |
my $current = (&LONCAPA::map::getparameter($idx,'parameter_0_mapalias'))[0]; |
| |
if ($current ne '') { |
| |
&LONCAPA::map::delparameter($idx,'parameter_0_mapalias'); |
| |
&remember_parms($idx,'mapalias','del'); |
| |
$haschanges = 1; |
| |
} |
| } |
} |
| return 1; |
return $haschanges; |
| } |
} |
| |
|
| sub editor { |
sub editor { |
|
Line 3172 sub editor {
|
Line 4637 sub editor {
|
| undef(@LONCAPA::map::zombies); |
undef(@LONCAPA::map::zombies); |
| } |
} |
| $folder = 'default'; |
$folder = 'default'; |
| $container = 'sequence'; |
$container = 'sequence'; |
| } else { |
} else { |
| ($errtext,$fatal) = &mapread($coursenum,$coursedom, |
($errtext,$fatal) = &mapread($coursenum,$coursedom, |
| $folder.'.'.$container); |
$folder.'.'.$container); |
| return $errtext if ($fatal); |
return $errtext if ($fatal); |
| } |
} |
| |
|
|
Line 3258 sub editor {
|
Line 4723 sub editor {
|
| # Rename, cut, copy or remove a single resource |
# Rename, cut, copy or remove a single resource |
| if (&handle_edit_cmd($coursenum,$coursedom)) { |
if (&handle_edit_cmd($coursenum,$coursedom)) { |
| my $contentchg; |
my $contentchg; |
| if ($env{'form.cmd'} =~ m{^(remove|cut)_}) { |
if ($env{'form.cmd'} =~ m{^(remove|cut|setalias|delalias)_}) { |
| $contentchg = 1; |
$contentchg = 1; |
| } |
} |
| ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,$contentchg); |
($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,$contentchg); |
|
Line 3444 sub editor {
|
Line 4909 sub editor {
|
| $r->print('</div>'); |
$r->print('</div>'); |
| } |
} |
| |
|
| |
if ((!$allowed) && ($folder =~ /^supplemental_\d+$/)) { |
| |
my ($supplemental) = &Apache::loncommon::get_supplemental($coursenum,$coursedom); |
| |
if (ref($supplemental) eq 'HASH') { |
| |
if ((ref($supplemental->{'hidden'}) eq 'HASH') && |
| |
(ref($supplemental->{'ids'}) eq 'HASH')) { |
| |
if (ref($supplemental->{'ids'}->{"/uploaded/$coursedom/$coursenum/$folder.$container"}) eq 'ARRAY') { |
| |
my $mapnum = $supplemental->{'ids'}->{"/uploaded/$coursedom/$coursenum/$folder.$container"}->[0]; |
| |
if ($supplemental->{'hidden'}->{$mapnum}) { |
| |
$ishidden = 1; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
|
| my ($to_show,$output,@allidx,@allmapidx,%filters,%lists,%curr_groups); |
my ($to_show,$output,@allidx,@allmapidx,%filters,%lists,%curr_groups); |
| %filters = ( |
%filters = ( |
| canremove => [], |
canremove => [], |
|
Line 3467 sub editor {
|
Line 4947 sub editor {
|
| push(@allmapidx,$res); |
push(@allmapidx,$res); |
| } |
} |
| |
|
| |
if (($supplementalflag) && (!$allowed) && (!$env{'request.role.adv'})) { |
| |
if (($ishidden) || ((&LONCAPA::map::getparameter($res,'parameter_hiddenresource'))[0]=~/^yes$/i)) { |
| |
$idx++; |
| |
next; |
| |
} |
| |
} |
| $output .= &entryline($idx,$name,$url,$folder,$allowed,$res, |
$output .= &entryline($idx,$name,$url,$folder,$allowed,$res, |
| $coursenum,$coursedom,$crstype, |
$coursenum,$coursedom,$crstype, |
| $pathitem,$supplementalflag,$container, |
$pathitem,$supplementalflag,$container, |
| \%filters,\%curr_groups,$ltitoolsref,$canedit, |
\%filters,\%curr_groups,$ltitoolsref,$canedit, |
| $isencrypted,$navmapref,$hostname); |
$isencrypted,$ishidden,$navmapref,$hostname); |
| $idx++; |
$idx++; |
| $shown++; |
$shown++; |
| } |
} |
|
Line 3480 sub editor {
|
Line 4966 sub editor {
|
| my $need_save; |
my $need_save; |
| if ($allowed || ($supplementalflag && $folder eq 'supplemental')) { |
if ($allowed || ($supplementalflag && $folder eq 'supplemental')) { |
| my $toolslink; |
my $toolslink; |
| if ($allowed) { |
if ($allowed || $canedit) { |
| |
my $helpitem = 'Navigation_Screen'; |
| |
if (!$allowed) { |
| |
$helpitem = 'Supplemental_Navigation'; |
| |
} |
| $toolslink = '<table><tr><td>' |
$toolslink = '<table><tr><td>' |
| .&Apache::loncommon::help_open_menu('Navigation Screen', |
.&Apache::loncommon::help_open_menu('Navigation Screen', |
| 'Navigation_Screen',undef,'RAT') |
$helpitem,undef,'RAT') |
| .'</td><td class="LC_middle">'.&mt('Tools:').'</td>' |
.'</td><td class="LC_middle">'.&mt('Tools:').'</td>' |
| .'<td align="left"><ul id="LC_toolbar">' |
.'<td align="left"><ul id="LC_toolbar">' |
| .'<li><a href="/adm/coursedocs?forcesupplement=1&command=editsupp" ' |
.'<li><a href="/adm/coursedocs?forcesupplement=1&command=editsupp" ' |
|
Line 3498 sub editor {
|
Line 4988 sub editor {
|
| .&Apache::loncommon::start_data_table(undef,'contentlist') |
.&Apache::loncommon::start_data_table(undef,'contentlist') |
| .&Apache::loncommon::start_data_table_header_row() |
.&Apache::loncommon::start_data_table_header_row() |
| .'<th colspan="2">'.&mt('Move').'</th>' |
.'<th colspan="2">'.&mt('Move').'</th>' |
| .'<th colspan="2">'.&mt('Actions').'</th>' |
.'<th colspan="3">'.&mt('Actions').'</th>' |
| .'<th>'.&mt('Document').'</th>'; |
.'<th>'.&mt('Document').'</th>' |
| if ($folder !~ /^supplemental/) { |
.'<th colspan="2">'.&mt('Settings').'</th>' |
| $to_show .= '<th colspan="4">'.&mt('Settings').'</th>'; |
.&Apache::loncommon::end_data_table_header_row(); |
| } |
|
| $to_show .= &Apache::loncommon::end_data_table_header_row(); |
|
| if ($folder !~ /^supplemental/) { |
if ($folder !~ /^supplemental/) { |
| $lists{'canhide'} = join(',',@allidx); |
$lists{'canhide'} = join(',',@allidx); |
| $lists{'canrandomlyorder'} = join(',',@allmapidx); |
$lists{'canrandomlyorder'} = join(',',@allmapidx); |
|
Line 3529 sub editor {
|
Line 5017 sub editor {
|
| '<td>'. |
'<td>'. |
| &multiple_check_form('actions',\%lists,$canedit). |
&multiple_check_form('actions',\%lists,$canedit). |
| '</td>'. |
'</td>'. |
| '<td> </td>'. |
'<td colspan="3"> </td>'. |
| '<td> </td>'. |
'<td colspan="2">'. |
| '<td colspan="4">'. |
|
| &multiple_check_form('settings',\%lists,$canedit). |
&multiple_check_form('settings',\%lists,$canedit). |
| '</td>'. |
'</td>'. |
| &Apache::loncommon::end_data_table_row(); |
&Apache::loncommon::end_data_table_row(); |
|
Line 3555 sub editor {
|
Line 5042 sub editor {
|
| } |
} |
| my $noresmsg; |
my $noresmsg; |
| if ($allowed && $hiddentop && !$supplementalflag) { |
if ($allowed && $hiddentop && !$supplementalflag) { |
| $noresmsg = &mt('Main Content Hidden'); |
$noresmsg = &mt('Main Content Hidden'); |
| } else { |
} else { |
| $noresmsg = &mt('Currently empty'); |
$noresmsg = &mt('Currently empty'); |
| } |
} |
|
Line 3600 sub multiple_check_form {
|
Line 5087 sub multiple_check_form {
|
| return unless (ref($listsref) eq 'HASH'); |
return unless (ref($listsref) eq 'HASH'); |
| my $disabled; |
my $disabled; |
| unless ($canedit) { |
unless ($canedit) { |
| $disabled = 'disabled="disabled"'; |
$disabled = ' disabled="disabled"'; |
| } |
} |
| my $output = |
my $output = |
| '<form action="/adm/coursedocs" method="post" name="togglemult'.$caller.'">'. |
'<form action="/adm/coursedocs" method="post" name="togglemult'.$caller.'">'. |
|
Line 3680 sub process_file_upload {
|
Line 5167 sub process_file_upload {
|
| my $quotatype = 'unofficial'; |
my $quotatype = 'unofficial'; |
| if ($crstype eq 'Community') { |
if ($crstype eq 'Community') { |
| $quotatype = 'community'; |
$quotatype = 'community'; |
| |
} elsif ($crstype eq 'Placement') { |
| |
$quotatype = 'placement'; |
| } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.coursecode'}) { |
} elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.coursecode'}) { |
| $quotatype = 'official'; |
$quotatype = 'official'; |
| } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.textbook'}) { |
} elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.textbook'}) { |
|
Line 3769 sub process_file_upload {
|
Line 5258 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 3850 sub is_supplemental_title {
|
Line 5339 sub is_supplemental_title {
|
| sub entryline { |
sub entryline { |
| my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom, |
my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom, |
| $crstype,$pathitem,$supplementalflag,$container,$filtersref,$currgroups, |
$crstype,$pathitem,$supplementalflag,$container,$filtersref,$currgroups, |
| $ltitoolsref,$canedit,$isencrypted,$navmapref,$hostname)=@_; |
$ltitoolsref,$canedit,$isencrypted,$ishidden,$navmapref,$hostname)=@_; |
| my ($foldertitle,$renametitle,$oldtitle); |
my ($foldertitle,$renametitle,$oldtitle,$encodedtitle); |
| if (&is_supplemental_title($title)) { |
if (&is_supplemental_title($title)) { |
| ($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title); |
($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title); |
| |
$encodedtitle=$title; |
| } else { |
} else { |
| $title=&HTML::Entities::encode($title,'"<>&\''); |
$title=&HTML::Entities::encode($title,'"<>&\''); |
| |
$encodedtitle=$title; |
| $renametitle=$title; |
$renametitle=$title; |
| $foldertitle=$title; |
$foldertitle=$title; |
| } |
} |
|
Line 3873 sub entryline {
|
Line 5364 sub entryline {
|
| $renametitle=~s/"/%22/g; |
$renametitle=~s/"/%22/g; |
| $renametitle=~s/ /%20/g; |
$renametitle=~s/ /%20/g; |
| $oldtitle = $renametitle; |
$oldtitle = $renametitle; |
| $renametitle=~s/\'\;/\\\'/g; |
$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, $shownsymb); |
my ($esc_path, $path, $symb, $shownsymb, $curralias); |
| if ($env{'form.folderpath'}) { |
if ($env{'form.folderpath'}) { |
| $esc_path=&escape($env{'form.folderpath'}); |
$esc_path=&escape($env{'form.folderpath'}); |
| $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); |
$path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); |
|
Line 3946 END
|
Line 5437 END
|
| 'ct' => 'Cut', |
'ct' => 'Cut', |
| 'rn' => 'Rename', |
'rn' => 'Rename', |
| 'cp' => 'Copy', |
'cp' => 'Copy', |
| |
'da' => 'Unset alias', |
| |
'sa' => 'Set alias', |
| 'ex' => 'External Resource', |
'ex' => 'External Resource', |
| 'et' => 'External Tool', |
'et' => 'External Tool', |
| 'ed' => 'Edit', |
'ed' => 'Edit', |
|
Line 3953 END
|
Line 5446 END
|
| 'sv' => 'Save', |
'sv' => 'Save', |
| 'ul' => 'URL', |
'ul' => 'URL', |
| 'ti' => 'Title', |
'ti' => 'Title', |
| 'er' => 'Editing rights unavailable for your current role.', |
'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'}, |
|
Line 3976 END
|
Line 5469 END
|
| ($url!~/$LONCAPA::assess_page_seq_re/)) { |
($url!~/$LONCAPA::assess_page_seq_re/)) { |
| $confirm_removal = 1; |
$confirm_removal = 1; |
| } |
} |
| |
if ($url =~ /$LONCAPA::assess_re/) { |
| |
$curralias = (&LONCAPA::map::getparameter($orderidx,'parameter_0_mapalias'))[0]; |
| |
} |
| |
|
| if ($denied{'copy'}) { |
if ($denied{'copy'}) { |
| $copylink=(<<ENDCOPY) |
$copylink=(<<ENDCOPY) |
|
Line 4077 END
|
Line 5573 END
|
| my $ispage; |
my $ispage; |
| my $containerarg; |
my $containerarg; |
| my $folderurl; |
my $folderurl; |
| |
my $plainurl; |
| if ($uploaded) { |
if ($uploaded) { |
| if (($extension eq 'sequence') || ($extension eq 'page')) { |
if (($extension eq 'sequence') || ($extension eq 'page')) { |
| $url=~/\Q$coursenum\E\/([\/\w]+)\.\Q$extension\E$/; |
$url=~/\Q$coursenum\E\/([\/\w]+)\.\Q$extension\E$/; |
|
Line 4095 END
|
Line 5592 END
|
| $url='/adm/supplemental?'; |
$url='/adm/supplemental?'; |
| } |
} |
| } else { |
} else { |
| &Apache::lonnet::allowuploaded('/adm/coursedoc',$url); |
$plainurl = $url; |
| } |
} |
| } |
} |
| |
|
|
Line 4114 END
|
Line 5611 END
|
| $url=&Apache::lonnet::clutter_with_no_wrapper($url); |
$url=&Apache::lonnet::clutter_with_no_wrapper($url); |
| } else { |
} else { |
| $url=&Apache::lonnet::clutter($url); |
$url=&Apache::lonnet::clutter($url); |
| } |
} |
| if ($url=~/^\/*uploaded\//) { |
if ($url=~/^\/*uploaded\//) { |
| $url=~/\.(\w+)$/; |
$url=~/\.(\w+)$/; |
| my $embstyle=&Apache::loncommon::fileembstyle($1); |
my $embstyle=&Apache::loncommon::fileembstyle($1); |
|
Line 4125 END
|
Line 5622 END
|
| } elsif ($url!~/\.(sequence|page)$/) { |
} elsif ($url!~/\.(sequence|page)$/) { |
| $url='/adm/coursedocs/showdoc'.$url; |
$url='/adm/coursedocs/showdoc'.$url; |
| } |
} |
| } elsif ($url=~m{^(|/adm/wrapper)/ext/([^#]+)}) { |
} elsif ($url=~m{^(|/adm/wrapper)/ext/([^#]+)}) { |
| my $wrapped = $1; |
my $wrapped = $1; |
| my $exturl = $2; |
my $exturl = $2; |
| if (($wrapped eq '') && ($container ne 'page')) { |
if (($wrapped eq '') && ($container ne 'page')) { |
| $url='/adm/wrapper'.$url; |
$url='/adm/wrapper'.$url; |
| } |
} |
| if (($ENV{'SERVER_PORT'} == 443) && ($exturl !~ /^https:/)) { |
if (($ENV{'SERVER_PORT'} == 443) && ($exturl !~ /^https:/)) { |
| $nomodal = 1; |
$nomodal = 1; |
| } |
} |
| } elsif ($url=~m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) { |
} elsif ($url=~m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) { |
| $url='/adm/wrapper'.$url; |
$url='/adm/wrapper'.$url; |
| } elsif ($url eq "/public/$coursedom/$coursenum/syllabus") { |
} elsif ($url eq "/public/$coursedom/$coursenum/syllabus") { |
| if (($ENV{'SERVER_PORT'} == 443) && |
if (($ENV{'SERVER_PORT'} == 443) && |
| ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { |
($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://})) { |
|
Line 4144 END
|
Line 5641 END
|
| } |
} |
| $nomodal = 1; |
$nomodal = 1; |
| } |
} |
| } |
} |
| if (&Apache::lonnet::symbverify($symb,$url)) { |
my $checkencrypt; |
| $shownsymb = $symb; |
if (!$env{'request.role.adv'}) { |
| if ($isexternal) { |
|
| $url =~ s/\#[^#]+$//; |
|
| if ($container eq 'page') { |
|
| $url = &Apache::lonnet::clutter($url); |
|
| } |
|
| } |
|
| unless ($env{'request.role.adv'}) { |
|
| if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { |
|
| $url = ''; |
|
| } |
|
| if (&Apache::lonnet::EXT('resource.0.hiddenresource',$symb) =~ /^yes$/i) { |
|
| $url = ''; |
|
| $hiddenres = 1; |
|
| } |
|
| } |
|
| if ($url ne '') { |
|
| $url.=(($url=~/\?/)?'&':'?').'symb='.&escape($shownsymb); |
|
| } |
|
| } elsif (!$env{'request.role.adv'}) { |
|
| my $checkencrypt; |
|
| if (((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) || |
if (((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) || |
| $isencrypted || (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i)) { |
($isencrypted) || (&Apache::lonnet::EXT('resource.0.encrypturl',$symb) =~ /^yes$/i)) { |
| $checkencrypt = 1; |
$checkencrypt = 1; |
| } elsif (ref($navmapref)) { |
} elsif (ref($navmapref)) { |
| unless (ref($$navmapref)) { |
unless (ref($$navmapref)) { |
|
Line 4180 END
|
Line 5657 END
|
| } |
} |
| } |
} |
| } |
} |
| if ($checkencrypt) { |
} |
| $shownsymb = &Apache::lonenc::encrypted($symb); |
if ($checkencrypt) { |
| my $shownurl = &Apache::lonenc::encrypted($url); |
my $currenc = $env{'request.enc'}; |
| if (&Apache::lonnet::symbverify($shownsymb,$shownurl)) { |
$env{'request.enc'} = 1; |
| $url = $shownurl.(($shownurl=~/\?/)?'&':'?').'symb='.&escape($shownsymb); |
$shownsymb = &Apache::lonenc::encrypted($symb); |
| if ($env{'request.enc'} ne '') { |
my $shownurl = &Apache::lonenc::encrypted($url); |
| delete($env{'request.enc'}); |
if (&Apache::lonnet::symbverify($symb,$url)) { |
| } |
$url = $shownurl; |
| } else { |
|
| $url=''; |
|
| } |
|
| } else { |
} else { |
| $url=''; |
$url = ''; |
| |
} |
| |
$env{'request.enc'} = $currenc; |
| |
} elsif (&Apache::lonnet::symbverify($symb,$url)) { |
| |
$shownsymb = $symb; |
| |
if ($isexternal) { |
| |
$url =~ s/\#[^#]+$//; |
| |
if ($container eq 'page') { |
| |
$url = &Apache::lonnet::clutter($url); |
| |
} |
| } |
} |
| } else { |
} else { |
| $url=''; |
$url = ''; |
| |
} |
| |
unless ($env{'request.role.adv'}) { |
| |
if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { |
| |
$url = ''; |
| |
} |
| |
if (&Apache::lonnet::EXT('resource.0.hiddenresource',$symb) =~ /^yes$/i) { |
| |
$url = ''; |
| |
$hiddenres = 1; |
| |
} |
| |
} |
| |
if (($url ne '') && ($shownsymb ne '')) { |
| |
$url .= (($url=~/\?/)?'&':'?').'symb='.&escape($shownsymb); |
| } |
} |
| } |
} |
| } elsif ($supplementalflag) { |
} elsif ($supplementalflag) { |
|
Line 4224 END
|
Line 5719 END
|
| } |
} |
| $nomodal = 1; |
$nomodal = 1; |
| } |
} |
| |
} elsif (($uploaded) && ($url ne '/adm/supplemental?') && ($url ne '/adm/coursedocs?')) { |
| |
my $embstyle=&Apache::loncommon::fileembstyle($extension); |
| |
unless ($embstyle eq 'ssi') { |
| |
if (($embstyle eq 'img') |
| |
|| ($embstyle eq 'emb') |
| |
|| ($embstyle eq 'wrp')) { |
| |
$url='/adm/wrapper'.$url; |
| |
} elsif ($url !~ /\.(sequence|page)$/) { |
| |
$url='/adm/coursedocs/showdoc'.$url; |
| |
} |
| |
} |
| |
} |
| |
unless ($allowed && $env{'request.role.adv'}) { |
| |
if ($ishidden || (&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { |
| |
$hiddenres = 1; |
| |
} |
| } |
} |
| } |
} |
| my ($rand_pick_text,$rand_order_text,$hiddenfolder); |
my ($rand_pick_text,$rand_order_text,$hiddenfolder); |
|
Line 4235 END
|
Line 5746 END
|
| if (!$allowed && $supplementalflag) { |
if (!$allowed && $supplementalflag) { |
| $folderpath.=$containerarg.'&'.$foldername; |
$folderpath.=$containerarg.'&'.$foldername; |
| $url.='folderpath='.&escape($folderpath); |
$url.='folderpath='.&escape($folderpath); |
| |
if ($ishidden || (&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { |
| |
$hiddenfolder = 1; |
| |
} |
| } else { |
} else { |
| my $rpicknum = (&LONCAPA::map::getparameter($orderidx, |
my $rpicknum = (&LONCAPA::map::getparameter($orderidx, |
| 'parameter_randompick'))[0]; |
'parameter_randompick'))[0]; |
|
Line 4254 END
|
Line 5768 END
|
| my @resources = $$navmapref->retrieveResources($folderurl,$filterFunc,1,1); |
my @resources = $$navmapref->retrieveResources($folderurl,$filterFunc,1,1); |
| unless (@resources) { |
unless (@resources) { |
| $hiddenmap = 1; |
$hiddenmap = 1; |
| unless ($env{'request.role.adv'}) { |
unless ($env{'request.role.adv'}) { |
| $url = ''; |
$url = ''; |
| $hiddenfolder = 1; |
$hiddenfolder = 1; |
| } |
} |
|
Line 4273 END
|
Line 5787 END
|
| |
|
| # Append randompick number, hidden, and encrypted with ":" to foldername, |
# Append randompick number, hidden, and encrypted with ":" to foldername, |
| # so it gets transferred between levels |
# so it gets transferred between levels |
| $folderpath.=$containerarg.'&'.$foldername. |
$folderpath.=$containerarg.'&'.$foldername. |
| ':'.$rpicknum.':'.$hiddenmap.':'.$encryptmap.':'.$randorder.':'.$ispage; |
':'.$rpicknum.':'.$hiddenmap.':'.$encryptmap.':'.$randorder.':'.$ispage; |
| unless ($url eq '') { |
unless ($url eq '') { |
| $url.='folderpath='.&escape($folderpath); |
$url.='folderpath='.&escape($folderpath); |
|
Line 4309 $form_common."\n".
|
Line 5823 $form_common."\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.$disabled.' /> '.&mt('Random Order').' </label></span>'. |
'<span class="LC_nobreak"><label><input type="checkbox" name="randomorder_'.$orderidx.'" id="randomorder_'.$orderidx.'" onclick="checkForSubmit(this.form,'."'randomorder','settings'".');" '.$ro_set.$disabled.' /> '.&mt('Random Order').' </label></span>'. |
| $form_end; |
$form_end; |
| } |
} |
| } elsif ($supplementalflag && !$allowed) { |
} elsif ($supplementalflag) { |
| my $isexttool; |
my $isexttool; |
| if ($url=~m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) { |
if ($url=~m{^/adm/$coursedom/$coursenum/\d+/ext\.tool$}) { |
| $url='/adm/wrapper'.$url; |
$url='/adm/wrapper'.$url; |
|
Line 4320 $form_end;
|
Line 5834 $form_end;
|
| $url .= ($url =~ /\?/) ? '&':'?'; |
$url .= ($url =~ /\?/) ? '&':'?'; |
| $url .= 'folderpath='.&HTML::Entities::encode($esc_path,'<>&"'); |
$url .= 'folderpath='.&HTML::Entities::encode($esc_path,'<>&"'); |
| if ($title) { |
if ($title) { |
| $url .= '&title='.&HTML::Entities::encode($renametitle,'<>&"'); |
$url .= '&title='.$encodedtitle; |
| } |
} |
| if ((($isexternal) || ($isexttool)) && $orderidx) { |
if ((($isexternal) || ($isexttool)) && $orderidx) { |
| $url .= '&idx='.$orderidx; |
$url .= '&idx='.$orderidx; |
|
Line 4331 $form_end;
|
Line 5845 $form_end;
|
| } |
} |
| my ($tdalign,$tdwidth); |
my ($tdalign,$tdwidth); |
| if ($allowed) { |
if ($allowed) { |
| my $fileloc = |
my $fileloc = |
| &Apache::lonnet::declutter(&Apache::lonnet::filelocation('',$orig_url)); |
&Apache::lonnet::declutter(&Apache::lonnet::filelocation('',$orig_url)); |
| if ($isexternal) { |
if ($isexternal) { |
| ($editlink,$extresform) = |
($editlink,$extresform) = |
| &Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem, |
&Apache::lonextresedit::extedit_form(0,$residx,$orig_url,$title,$pathitem, |
| undef,undef,undef,undef,undef,undef, |
undef,undef,undef,undef,undef,undef, |
| undef,$disabled); |
undef,$disabled); |
|
Line 4351 $form_end;
|
Line 5865 $form_end;
|
| if ($supplementalflag) { |
if ($supplementalflag) { |
| $suppanchor = $anchor; |
$suppanchor = $anchor; |
| } |
} |
| my $jscall = |
my $jscall = |
| &Apache::lonhtmlcommon::jump_to_editres($cfile,$home, |
&Apache::lonhtmlcommon::jump_to_editres($cfile,$home, |
| $switchserver, |
$switchserver, |
| $forceedit, |
$forceedit, |
|
Line 4374 $form_end;
|
Line 5888 $form_end;
|
| } else { |
} else { |
| $reinit = &mt('(re-initialize course to access)'); |
$reinit = &mt('(re-initialize course to access)'); |
| } |
} |
| $line.='<td class="LC_docs_entry_commands"'.$tdalign.'><span class="LC_nobreak">'.$editlink.$renamelink; |
$line.='<td class="LC_docs_entry_commands"'.$tdalign.'><span class="LC_nobreak">'.$editlink.$renamelink.'</span>'; |
| my $link; |
if ($orig_url =~ /$LONCAPA::assess_re/) { |
| |
$line.= '<br />'; |
| |
if ($curralias ne '') { |
| |
$line.='<span class="LC_nobreak"><a href="javascript:delalias('."'$esc_path','$orderidx'".');" class="LC_docs_alias">'. |
| |
$lt{'da'}.'</a></span>'; |
| |
} else { |
| |
$line.='<span class="LC_nobreak"><a href="javascript:setalias('."'$esc_path','$orderidx'".');" class="LC_docs_alias">'. |
| |
$lt{'sa'}.'</a></span>'; |
| |
} |
| |
} |
| |
$line.='</td><td><span class="LC_nobreak">'; |
| |
my ($link,$nolink); |
| if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) { |
if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) { |
| $line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>'; |
if ($allowed && !$env{'request.role.adv'} && !$isfolder && !$ispage) { |
| |
if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { |
| |
$nolink = 1; |
| |
} |
| |
} |
| |
if ($nolink) { |
| |
$line .= '<img src="'.$icon.'" alt="" class="LC_icon" /></a>'; |
| |
} else { |
| |
$line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>'; |
| |
} |
| } elsif ($url) { |
} elsif ($url) { |
| if ($anchor ne '') { |
if ($anchor ne '') { |
| if ($supplementalflag) { |
if ($supplementalflag) { |
|
Line 4386 $form_end;
|
Line 5920 $form_end;
|
| $anchor = '#'.&HTML::Entities::encode($anchor,'"<>&'); |
$anchor = '#'.&HTML::Entities::encode($anchor,'"<>&'); |
| } |
} |
| } |
} |
| |
if (($nomodal) && ($hostname ne '')) { |
| if ((!$supplementalflag) && ($nomodal) && ($hostname ne '')) { |
|
| $link = 'http://'.$hostname.$url; |
$link = 'http://'.$hostname.$url; |
| } else { |
} else { |
| $link = $url; |
$link = $url; |
| } |
} |
| $link = &js_escape($link.(($url=~/\?/)?'&':'?').'inhibitmenu=yes'.$anchor); |
my $inhibitmenu; |
| if ($nomodal) { |
if ((($supplementalflag) && ($allowed) && ($url =~ m{^/adm/wrapper/})) || |
| |
(($allowed) && (($url =~ m{^/adm/(viewclasslist|$match_domain/$match_username/aboutme)(\?|$)}) || |
| |
($url =~ m{^/public/$match_domain/$match_courseid/syllabus(\?|$)})))) { |
| |
$inhibitmenu = 'only_body=1'; |
| |
} else { |
| |
$inhibitmenu = 'inhibitmenu=yes'; |
| |
} |
| |
$link = &js_escape($link.(($url=~/\?/)?'&':'?').$inhibitmenu.$anchor); |
| |
if ($allowed && !$env{'request.role.adv'} && !$isfolder && !$ispage && !$uploaded) { |
| |
if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { |
| |
$nolink = 1; |
| |
} |
| |
} |
| |
if ($nolink) { |
| |
$line.='<img src="'.$icon.'" alt="" class="LC_icon" />'; |
| |
} elsif ($nomodal) { |
| $line.='<a href="#" onclick="javascript:window.open('."'$link','syllabuspreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1')".'; return false;" />'. |
$line.='<a href="#" onclick="javascript:window.open('."'$link','syllabuspreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1')".'; return false;" />'. |
| '<img src="'.$icon.'" alt="" class="LC_icon" border="0" /></a>'; |
'<img src="'.$icon.'" alt="" class="LC_icon" border="0" /></a>'; |
| } else { |
} else { |
|
Line 4405 $form_end;
|
Line 5953 $form_end;
|
| } |
} |
| $line.='</span></td><td'.$tdwidth.'>'; |
$line.='</span></td><td'.$tdwidth.'>'; |
| if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) { |
if (($url=~m{/adm/(coursedocs|supplemental)}) || (!$allowed && $url)) { |
| $line.='<a href="'.$url.'">'.$title.'</a>'; |
if ($nolink) { |
| |
$line.=$title; |
| |
} else { |
| |
$line.='<a href="'.$url.'">'.$title.'</a>'; |
| |
} |
| |
if (!$allowed && $supplementalflag && $canedit && $isfolder) { |
| |
my $editicon = &Apache::loncommon::lonhttpdurl('/res/adm/pages').'/editmap.png'; |
| |
my $editurl = $url; |
| |
$editurl =~ s{^\Q/adm/supplemental?\E}{/adm/coursedocs?command=direct&forcesupplement=1&}; |
| |
$line .= ' '.'<a href="'.$editurl.'">'. |
| |
'<img src="'.$editicon.'" alt="'.&mt('Edit Content').'" title="'.&mt('Edit Content').'" />'. |
| |
'</a>'; |
| |
} |
| |
if ((($hiddenfolder) || ($hiddenres)) && (!$allowed) && ($supplementalflag)) { |
| |
$line.= ' <span class="LC_warning">('.&mt('hidden').')</span> '; |
| |
} |
| } elsif ($url) { |
} elsif ($url) { |
| if ($nomodal) { |
if ($nolink) { |
| |
$line.=$title; |
| |
} elsif ($nomodal) { |
| $line.='<a href="#" onclick="javascript:window.open('."'$link','syllabuspreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1')".'; return false;" />'. |
$line.='<a href="#" onclick="javascript:window.open('."'$link','syllabuspreview','height=400,width=500,scrollbars=1,resizable=1,menubar=0,location=1')".'; return false;" />'. |
| $title.'</a>'; |
$title.'</a>'; |
| } else { |
} else { |
|
Line 4418 $form_end;
|
Line 5983 $form_end;
|
| } else { |
} else { |
| $line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>'; |
$line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>'; |
| } |
} |
| $line.="$extresform</td>"; |
if (($allowed) && ($curralias ne '')) { |
| |
$line .= '<br /><span class="LC_docs_alias_name">('.$curralias.')</span>'; |
| |
} else { |
| |
$line .= $extresform; |
| |
} |
| |
$line .= '</td>'; |
| $rand_pick_text = ' ' if ($rand_pick_text eq ''); |
$rand_pick_text = ' ' if ($rand_pick_text eq ''); |
| $rand_order_text = ' ' if ($rand_order_text eq ''); |
$rand_order_text = ' ' if ($rand_order_text eq ''); |
| if (($allowed) && ($folder!~/^supplemental/)) { |
if ($uploaded && $url && !$isfolder && !$ispage) { |
| my %lt=&Apache::lonlocal::texthash( |
if (($plainurl ne '') && ($env{'request.role.adv'} || $allowed || !$hiddenres)) { |
| 'hd' => 'Hidden', |
&Apache::lonnet::allowuploaded('/adm/coursedoc',$plainurl); |
| 'ec' => 'URL hidden'); |
|
| my ($enctext,$hidtext); |
|
| if ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) { |
|
| $enctext = ' checked="checked"'; |
|
| if (($ishash) && (ref($filtersref->{'encrypturl'}) eq 'ARRAY')) { |
|
| push(@{$filtersref->{'encrypturl'}},$orderidx); |
|
| } |
|
| } |
} |
| |
} |
| |
if ($allowed) { |
| |
my %lt=&Apache::lonlocal::texthash( |
| |
'hd' => 'Hidden', |
| |
'ec' => 'URL hidden'); |
| |
my ($enctext,$hidtext,$formhidden,$formurlhidden); |
| if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { |
if ((&LONCAPA::map::getparameter($orderidx,'parameter_hiddenresource'))[0]=~/^yes$/i) { |
| $hidtext = ' checked="checked"'; |
$hidtext = ' checked="checked"'; |
| if (($ishash) && (ref($filtersref->{'randomorder'}) eq 'ARRAY')) { |
if (($ishash) && (ref($filtersref->{'hiddenresource'}) eq 'ARRAY')) { |
| push(@{$filtersref->{'hiddenresource'}},$orderidx); |
push(@{$filtersref->{'hiddenresource'}},$orderidx); |
| } |
} |
| } |
} |
| my $formhidden = 'edit_hiddenresource_'.$orderidx; |
$formhidden = 'edit_hiddenresource_'.$orderidx; |
| my $formurlhidden = 'edit_encrypturl_'.$orderidx; |
$line.=(<<ENDPARMS); |
| $line.=(<<ENDPARMS); |
|
| <td class="LC_docs_entry_parameter"> |
<td class="LC_docs_entry_parameter"> |
| <form action="/adm/coursedocs" method="post" name="$formhidden"> |
<form action="/adm/coursedocs" method="post" name="$formhidden"> |
| $form_param |
$form_param |
| $form_common |
$form_common |
| <label><input type="checkbox" name="hiddenresource_$orderidx" id="hiddenresource_$orderidx" onclick="checkForSubmit(this.form,'hiddenresource','settings');" $hidtext $disabled /> $lt{'hd'}</label> |
<label><input type="checkbox" name="hiddenresource_$orderidx" id="hiddenresource_$orderidx" onclick="checkForSubmit(this.form,'hiddenresource','settings');" $hidtext $disabled /> $lt{'hd'}</label> |
| $form_end |
$form_end |
| |
ENDPARMS |
| |
if ($folder =~/^supplemental/) { |
| |
$line.= "\n <td>"; |
| |
} else { |
| |
if ((&LONCAPA::map::getparameter($orderidx,'parameter_encrypturl'))[0]=~/^yes$/i) { |
| |
$enctext = ' checked="checked"'; |
| |
if (($ishash) && (ref($filtersref->{'encrypturl'}) eq 'ARRAY')) { |
| |
push(@{$filtersref->{'encrypturl'}},$orderidx); |
| |
} |
| |
} |
| |
$formurlhidden = 'edit_encrypturl_'.$orderidx; |
| |
$line.=(<<ENDPARMS); |
| <br /> |
<br /> |
| <form action="/adm/coursedocs" method="post" name="$formurlhidden"> |
<form action="/adm/coursedocs" method="post" name="$formurlhidden"> |
| $form_param |
$form_param |
|
Line 4457 $form_end;
|
Line 6037 $form_end;
|
| <td class="LC_docs_entry_parameter">$rand_pick_text<br /> |
<td class="LC_docs_entry_parameter">$rand_pick_text<br /> |
| $rand_order_text</td> |
$rand_order_text</td> |
| ENDPARMS |
ENDPARMS |
| |
} |
| } |
} |
| $line.=&Apache::loncommon::end_data_table_row(); |
$line.=&Apache::loncommon::end_data_table_row(); |
| return $line; |
return $line; |
|
Line 4571 sub new_timebased_suffix {
|
Line 6152 sub new_timebased_suffix {
|
| $locknotfreed = |
$locknotfreed = |
| '<div class="LC_error">'. |
'<div class="LC_error">'. |
| &mt('A lockfile was not released when you added content to the clipboard earlier in this session.').' '. |
&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.'); |
&mt('As a result addition of items to the clipboard will be unavailable until your next log-in.'); |
| } else { |
} else { |
| $locknotfreed .= |
$locknotfreed .= |
| &mt('This will prevent addition of items to the clipboard until your next log-in.'); |
&mt('This will prevent addition of items to the clipboard until your next log-in.'); |
| } |
} |
|
Line 4806 sub short_urls {
|
Line 6387 sub short_urls {
|
| } |
} |
| my %currtiny = &Apache::lonnet::dump('tiny',$cdom,$cnum); |
my %currtiny = &Apache::lonnet::dump('tiny',$cdom,$cnum); |
| $r->print(&Apache::loncourserespicker::create_picker($navmap,'shorturls',$formname,$crstype,undef, |
$r->print(&Apache::loncourserespicker::create_picker($navmap,'shorturls',$formname,$crstype,undef, |
| undef,undef,undef,undef,undef,\%currtiny,$readonly)); |
undef,undef,undef,undef,undef,\%currtiny,undef,$readonly)); |
| } |
} |
| $r->print(&endContentScreen()); |
$r->print(&endContentScreen()); |
| } |
} |
|
Line 4862 sub verifycontent {
|
Line 6443 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 4926 sub checkversions {
|
Line 6506 sub checkversions {
|
| } |
} |
| 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 { |
|
Line 5059 ENDHEADERS
|
Line 6639 ENDHEADERS
|
| return; |
return; |
| } |
} |
| $r->print( |
$r->print( |
| '<input type="submit" name="setversions" value="'.$lt{'save'}.'"'.$disabled.' />'. |
'<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 5102 ENDHEADERS
|
Line 6682 ENDHEADERS
|
| $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)},'',$readonly)); |
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; |
|
Line 5182 sub changewarning {
|
Line 6762 sub changewarning {
|
| if (!defined($message)) { |
if (!defined($message)) { |
| $message='Changes will become active for your current session after [_1], or the next time you log in.'; |
$message='Changes will become active for your current session after [_1], or the next time you log in.'; |
| } |
} |
| |
my $windowname = 'loncapaclient'; |
| |
if ($env{'request.lti.login'}) { |
| |
$windowname .= 'lti'; |
| |
} |
| $r->print("\n\n". |
$r->print("\n\n". |
| '<script type="text/javascript">'."\n". |
'<script type="text/javascript">'."\n". |
| '// <![CDATA['."\n". |
'// <![CDATA['."\n". |
| 'function reinit(tf) { tf.submit();'.$postexec.' }'."\n". |
'function reinit(tf) { tf.submit();'.$postexec.' }'."\n". |
| '// ]]>'."\n". |
'// ]]>'."\n". |
| '</script>'."\n". |
'</script>'."\n". |
| '<form name="reinitform" method="post" action="/adm/roles" target="loncapaclient">'. |
'<form name="reinitform" method="post" action="/adm/roles" target="'.$windowname.'">'. |
| '<input type="hidden" name="orgurl" value="'.$url. |
'<input type="hidden" name="orgurl" value="'.$url. |
| '" /><input type="hidden" name="selectrole" value="1" /><p class="LC_warning">'. |
'" /><input type="hidden" name="selectrole" value="1" /><p class="LC_warning">'. |
| &mt($message,' <input type="hidden" name="'. |
&mt($message,' <input type="hidden" name="'. |
|
Line 5241 sub startContentScreen {
|
Line 6825 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 5277 sub handler {
|
Line 6862 sub handler {
|
| my $crstype = &Apache::loncommon::course_type(); |
my $crstype = &Apache::loncommon::course_type(); |
| 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'}; |
| |
my $coursehome=$env{'course.'.$env{'request.course.id'}.'.home'}; |
| |
|
| |
# 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').'/'); |
|
Line 5286 sub handler {
|
Line 6875 sub handler {
|
| foreach my $topic ('Adding_Course_Doc','Main_Course_Documents', |
foreach my $topic ('Adding_Course_Doc','Main_Course_Documents', |
| 'Adding_External_Resource','Adding_External_Tool', |
'Adding_External_Resource','Adding_External_Tool', |
| 'Navigate_Content','Adding_Folders','Docs_Overview', |
'Navigate_Content','Adding_Folders','Docs_Overview', |
| 'Load_Map','Supplemental','Score_Upload_Form', |
'Load_Map','Supplemental','Score_Upload_Form', |
| 'Adding_Pages','Importing_LON-CAPA_Resource', |
'Adding_Pages','Importing_LON-CAPA_Resource', |
| 'Importing_IMS_Course','Uploading_From_Harddrive', |
'Importing_IMS_Course','Uploading_From_Harddrive', |
| 'Course_Roster','Web_Page','Dropbox','Simple_Problem') { |
'Course_Roster','Web_Page','Dropbox','Simple_Problem', |
| |
'Standard_Problem','Course_Resources', |
| |
'Search_LON-CAPA_Resource','Import_Stored_Links') { |
| $help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic); |
$help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic); |
| } |
} |
| # Composite help files |
# Composite help files |
|
Line 5304 sub handler {
|
Line 6895 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,$canedit,$canview,$disabled); |
my ($allowed,$canedit,$canview,$noendpage,$disabled); |
| |
# does this user have privileges to modify content. |
| |
if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { |
| # URI is /adm/supplemental when viewing supplemental docs in non-edit mode. |
# URI is /adm/supplemental when viewing supplemental docs in non-edit mode. |
| unless ($r->uri eq '/adm/supplemental') { |
unless ($r->uri eq '/adm/supplemental') { |
| # does this user have privileges to modify content. |
|
| if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { |
|
| $allowed = 1; |
$allowed = 1; |
| $canedit = 1; |
} |
| $canview = 1; |
$canedit = 1; |
| } elsif (&Apache::lonnet::allowed('cev',$env{'request.course.id'})) { |
$canview = 1; |
| |
} elsif (&Apache::lonnet::allowed('cev',$env{'request.course.id'})) { |
| |
# URI is /adm/supplemental when viewing supplemental docs in non-edit mode. |
| |
unless ($r->uri eq '/adm/supplemental') { |
| $allowed = 1; |
$allowed = 1; |
| $canview = 1; |
|
| } |
} |
| |
$canview = 1; |
| } |
} |
| unless ($canedit) { |
unless ($canedit) { |
| $disabled = ' disabled="disabled"'; |
$disabled = ' disabled="disabled"'; |
|
Line 5357 sub handler {
|
Line 6951 sub handler {
|
| &init_breadcrumbs('versions','Check/Set Resource Versions','Docs_Check_Resource_Versions'); |
&init_breadcrumbs('versions','Check/Set Resource Versions','Docs_Check_Resource_Versions'); |
| &checkversions($r,$canedit); |
&checkversions($r,$canedit); |
| } elsif ($canedit && $env{'form.dumpcourse'}) { |
} elsif ($canedit && $env{'form.dumpcourse'}) { |
| &init_breadcrumbs('dumpcourse','Copy '.&Apache::loncommon::course_type().' Content to Authoring Space'); |
&init_breadcrumbs('dumpcourse','Copy uploaded content to Authoring Space'); |
| &dumpcourse($r); |
&dumpcourse($r); |
| } elsif ($allowed && $env{'form.exportcourse'}) { |
} elsif (($canedit || $canview) && ($env{'form.copyauthored'})) { |
| |
&init_breadcrumbs('copyauthored','Copy from Course Authoring to User Authoring'); |
| |
my $readonly; |
| |
if (!$canedit) { |
| |
$readonly = 1; |
| |
} |
| |
©crsauthored($r,$coursenum,$coursedom,$coursehome,$readonly); |
| |
} 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; |
| |
} |
| |
} else { |
| |
$r->internal_redirect($redirect); |
| |
} |
| |
} |
| |
} |
| # |
# |
| # 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 |
| # Get the parameters that may be needed |
# Get the parameters that may be needed |
| # |
# |
| &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
| ['folderpath', |
['folderpath','title', |
| 'forcesupplement','forcestandard', |
'forcesupplement','forcestandard', |
| 'tools','symb','command','supppath']); |
'tools','symb','command','supppath']); |
| |
|
|
Line 5388 sub handler {
|
Line 7040 sub handler {
|
| |
|
| if ($env{'form.symb'}) { |
if ($env{'form.symb'}) { |
| my ($mapurl,$id,$resurl) = &Apache::lonnet::decode_symb($env{'form.symb'}); |
my ($mapurl,$id,$resurl) = &Apache::lonnet::decode_symb($env{'form.symb'}); |
| unless (($id =~ /^\d+$/) && (&Apache::lonnet::is_on_map($resurl))) { |
unless (($id =~ /^\d+$/) && (&Apache::lonnet::is_on_map($resurl))) { |
| delete($env{'form.symb'}); |
delete($env{'form.symb'}); |
| } |
} |
| } |
} |
|
Line 5410 sub handler {
|
Line 7062 sub handler {
|
| } |
} |
| if ($env{'form.forcesupplement'}) { $supplementalflag=1; } |
if ($env{'form.forcesupplement'}) { $supplementalflag=1; } |
| if ($env{'form.forcestandard'}) { $supplementalflag=0; } |
if ($env{'form.forcestandard'}) { $supplementalflag=0; } |
| unless ($allowed) { $supplementalflag=1; } |
unless (($supplementalflag) || |
| unless ($standard) { $supplementalflag=1; } |
($r->uri =~ m{^/adm/coursedocs/showdoc/uploaded/\Q$coursedom\E/\Q$coursenum\E/docs/})) { |
| |
unless ($allowed) { $supplementalflag=1; } |
| |
unless ($standard) { $supplementalflag=1; } |
| |
} |
| my $toolsflag=0; |
my $toolsflag=0; |
| if ($env{'form.tools'}) { $toolsflag=1; } |
if ($env{'form.tools'}) { $toolsflag=1; } |
| |
|
| if ($env{'form.folderpath'} ne '') { |
if ($env{'form.folderpath'} ne '') { |
| &validate_folderpath($supplementalflag); |
&Apache::loncommon::validate_folderpath($supplementalflag,$allowed,$coursenum,$coursedom); |
| } |
} |
| |
|
| |
my $backto_supppath; |
| if ($env{'form.supppath'} ne '') { |
if ($env{'form.supppath'} ne '') { |
| &validate_suppath(); |
if ($supplementalflag && $allowed) { |
| |
$backto_supppath = &validate_supppath($coursenum,$coursedom); |
| |
} |
| } |
} |
| |
|
| my $script=''; |
my $script=''; |
|
Line 5430 sub handler {
|
Line 7088 sub handler {
|
| my $containertag; |
my $containertag; |
| my $pathitem; |
my $pathitem; |
| my %ltitools; |
my %ltitools; |
| |
my $posslti; |
| my $hiddentop; |
my $hiddentop; |
| my $navmap; |
my $navmap; |
| my $filterFunc = sub { my $res = shift; return (!$res->randomout() && !$res->is_map()) }; |
my $filterFunc = sub { my $res = shift; return (!$res->randomout() && !$res->is_map()) }; |
|
Line 5441 sub handler {
|
Line 7100 sub handler {
|
| &Apache::loncommon::symb_to_docspath($env{'form.symb'},\$navmap); |
&Apache::loncommon::symb_to_docspath($env{'form.symb'},\$navmap); |
| &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => |
&Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => |
| $env{'form.command'}.'_'.$env{'form.symb'}}); |
$env{'form.command'}.'_'.$env{'form.symb'}}); |
| } elsif ($env{'form.supppath'} ne '') { |
} elsif (($env{'form.supppath'} ne '') && $supplementalflag && $allowed) { |
| $env{'form.folderpath'}=$env{'form.supppath'}; |
$env{'form.folderpath'}=$env{'form.supppath'}; |
| &Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => |
&Apache::lonnet::appenv({'docs.exit.'.$env{'request.course.id'} => |
| $env{'form.command'}.'_'.$env{'form.supppath'}}); |
$env{'form.command'}.'_'.$backto_supppath}); |
| } |
} |
| } elsif ($env{'form.command'} eq 'editdocs') { |
} elsif ($env{'form.command'} eq 'editdocs') { |
| $env{'form.folderpath'} = &default_folderpath($coursenum,$coursedom,\$navmap); |
$env{'form.folderpath'} = &default_folderpath($coursenum,$coursedom,\$navmap); |
|
Line 5472 sub handler {
|
Line 7131 sub handler {
|
| |
|
| if (&unescape($env{'form.folderpath'}) =~ m{^(default|supplemental)&}) { |
if (&unescape($env{'form.folderpath'}) =~ m{^(default|supplemental)&}) { |
| if ($supplementalflag) { |
if ($supplementalflag) { |
| undef($env{'form.folderpath'}) if ($1 eq 'default'); |
undef($env{'form.folderpath'}) if ($1 eq 'default'); |
| } else { |
} else { |
| undef($env{'form.folderpath'}) if ($1 eq 'supplemental'); |
undef($env{'form.folderpath'}) if ($1 eq 'supplemental'); |
| } |
} |
|
Line 5480 sub handler {
|
Line 7139 sub handler {
|
| undef($env{'form.folderpath'}); |
undef($env{'form.folderpath'}); |
| } |
} |
| if ($env{'form.folderpath'} ne '') { |
if ($env{'form.folderpath'} ne '') { |
| &validate_folderpath($supplementalflag); |
&Apache::loncommon::validate_folderpath($supplementalflag,$allowed,$coursenum,$coursedom); |
| } |
} |
| } |
} |
| |
|
| # If we are not allowed to make changes, all we can see are supplemental docs |
# Set folderpath if we are not allowed to make changes and this is supplemental content |
| if (!$allowed) { |
if ((!$allowed) && ($supplementalflag)) { |
| unless ($env{'form.folderpath'} =~ /^supplemental/) { |
unless ($env{'form.folderpath'} =~ /^supplemental/) { |
| $env{'form.folderpath'} = &supplemental_base(); |
$env{'form.folderpath'} = &supplemental_base(); |
| } |
} |
|
Line 5497 sub handler {
|
Line 7156 sub handler {
|
| $env{'form.folderpath'}; |
$env{'form.folderpath'}; |
| } |
} |
| # If allowed and user's role is not advanced check folderpath is not hidden |
# If allowed and user's role is not advanced check folderpath is not hidden |
| if (($allowed) && (!$env{'request.role.adv'}) && |
my $hidden_and_empty; |
| ($env{'form.folderpath'} ne '') && (!$supplementalflag)) { |
if (($allowed) && (!$env{'request.role.adv'}) && ($env{'form.folderpath'} ne '')) { |
| my $folderurl; |
my ($folderurl,$foldername,$hiddenfolder); |
| my @pathitems = split(/\&/,$env{'form.folderpath'}); |
my @pathitems = split(/\&/,$env{'form.folderpath'}); |
| my $folder = $pathitems[-2]; |
my $folder = $pathitems[-2]; |
| if ($folder eq '') { |
if ($folder eq '') { |
|
Line 5511 sub handler {
|
Line 7170 sub handler {
|
| } else { |
} else { |
| $folderurl .= '.sequence'; |
$folderurl .= '.sequence'; |
| } |
} |
| unless (ref($navmap)) { |
if ($supplementalflag) { |
| $navmap = Apache::lonnavmaps::navmap->new(); |
($foldername,$hiddenfolder) = ($pathitems[-1] =~ /^([^:]*)::(|1):::$/); |
| } |
$foldername = &HTML::Entities::decode(&unescape($foldername)); |
| if (ref($navmap)) { |
my ($supplemental) = &Apache::loncommon::get_supplemental($coursenum,$coursedom); |
| if (lc($navmap->get_mapparam(undef,$folderurl,"0.hiddenresource")) eq 'yes') { |
if (ref($supplemental) eq 'HASH') { |
| my @resources = $navmap->retrieveResources($folderurl,$filterFunc,1,1); |
my ($suppmap,$suppmapnum); |
| unless (@resources) { |
if ($folder eq 'supplemental') { |
| undef($env{'form.folderpath'}); |
$suppmap = 'default'; |
| |
$suppmapnum = 0; |
| |
} elsif ($folder =~ /^supplemental_(\d+)$/) { |
| |
$suppmap = $1; |
| |
$suppmapnum = $suppmap; |
| |
} |
| |
if ($hiddenfolder) { |
| |
my $hascontent; |
| |
foreach my $key (reverse(sort(keys(%{$supplemental->{'ids'}})))) { |
| |
if ($key =~ m{^\Q/uploaded/$coursedom/$coursenum/supplemental/$suppmap/\E}) { |
| |
$hascontent = 1; |
| |
} elsif (ref($supplemental->{'ids'}->{$key}) eq 'ARRAY') { |
| |
foreach my $id (@{$supplemental->{'ids'}->{$key}}) { |
| |
if ($id =~ /^$suppmapnum\:/) { |
| |
$hascontent = 1; |
| |
last; |
| |
} |
| |
} |
| |
} |
| |
last if ($hascontent); |
| |
} |
| |
unless ($hascontent) { |
| |
if ($foldername ne '') { |
| |
$hidden_and_empty = $foldername; |
| |
} else { |
| |
$hidden_and_empty = $folder; |
| |
} |
| |
} |
| } |
} |
| } |
} |
| |
} else { |
| |
unless (ref($navmap)) { |
| |
$navmap = Apache::lonnavmaps::navmap->new(); |
| |
} |
| |
($foldername,$hiddenfolder) = ($pathitems[-1] =~ /^([^:]*):|\d+:|1:(|1):|1:|1$/); |
| |
$foldername = &HTML::Entities::decode(&unescape($foldername)); |
| |
if (ref($navmap)) { |
| |
if ($hiddenfolder || |
| |
(lc($navmap->get_mapparam(undef,$folderurl,"0.hiddenresource")) eq 'yes')) { |
| |
my @resources = $navmap->retrieveResources($folderurl,$filterFunc,1,1); |
| |
unless (@resources) { |
| |
if ($foldername ne '') { |
| |
$hidden_and_empty = $foldername; |
| |
} else { |
| |
$hidden_and_empty = $folder; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if ($hidden_and_empty ne '') { |
| |
splice(@pathitems,-2); |
| |
if (@pathitems) { |
| |
$env{'form.folderpath'} = join('&',@pathitems); |
| |
} else { |
| |
undef($env{'form.folderpath'}); |
| |
} |
| } |
} |
| } |
} |
| } |
} |
| |
|
| |
|
| # If after all of this, we still don't have any paths, make them |
# If after all of this, we still don't have any paths, make them |
| unless ($env{'form.folderpath'}) { |
unless ($env{'form.folderpath'}) { |
| if ($supplementalflag) { |
if ($supplementalflag) { |
|
Line 5600 sub handler {
|
Line 7312 sub handler {
|
| my $tid = 1; |
my $tid = 1; |
| my @tabids; |
my @tabids; |
| if ($supplementalflag) { |
if ($supplementalflag) { |
| @tabids = ('002','ee2','ff2'); |
@tabids = ('002','dd2','ee2','ff2'); |
| $tid = 2; |
$tid = 2; |
| } else { |
} else { |
| @tabids = ('aa1','bb1','cc1','ff1'); |
@tabids = ('aa1','bb1','cc1','ff1'); |
|
Line 5610 sub handler {
|
Line 7322 sub handler {
|
| } |
} |
| } |
} |
| my $tabidstr = join("','",@tabids); |
my $tabidstr = join("','",@tabids); |
| %ltitools = &Apache::lonnet::get_domain_lti($coursedom,'consumer'); |
my (%domtools,%crstools); |
| my $posslti = keys(%ltitools); |
my %tooltypes = &Apache::loncommon::usable_exttools(); |
| |
if ($tooltypes{'dom'}) { |
| |
%domtools = &Apache::lonnet::get_domain_lti($coursedom,'consumer'); |
| |
} |
| |
if ($tooltypes{'crs'}) { |
| |
%crstools = &Apache::lonnet::get_course_lti($coursenum,$coursedom,'consumer'); |
| |
} |
| |
%ltitools = ( |
| |
dom => \%domtools, |
| |
crs => \%crstools, |
| |
); |
| |
$posslti = scalar(keys(%domtools)) + scalar(keys(%crstools)); |
| my $hostname = $r->hostname(); |
my $hostname = $r->hostname(); |
| $script .= &editing_js($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti, |
$script .= &editing_js($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti, |
| $canedit,$hostname,\$navmap). |
$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(\%ltitools); |
&Apache::lonextresedit::extedit_javascript(\%ltitools); |
| |
my $onload = "javascript:resize_scrollbox('contentscroll','1','1');"; |
| |
if ($hidden_and_empty ne '') { |
| |
my $alert = &mt("Additional privileges required to edit empty and hidden folder: '[_1]'", |
| |
$hidden_and_empty); |
| |
$onload .= "javascript:alert('".&js_escape($alert)."');"; |
| |
} |
| $addentries = { |
$addentries = { |
| onload => "javascript:resize_scrollbox('contentscroll','1','1');", |
onload => $onload, |
| }; |
}; |
| } |
} |
| $script .= &paste_popup_js(); |
$script .= &paste_popup_js(); |
|
Line 5635 sub handler {
|
Line 7364 sub handler {
|
| .$script."\n" |
.$script."\n" |
| .'// ]]>'."\n" |
.'// ]]>'."\n" |
| .'</script>'."\n" |
.'</script>'."\n" |
| .'<script type="text/javascript" src="/res/adm/includes/file_upload.js"></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(); |
| |
|
| if ($showdoc) { |
if ($showdoc) { |
| $r->print(&Apache::loncommon::start_page("$crstype documents",undef, |
my $args; |
| {'force_register' => $showdoc,})); |
if ($supplementalflag) { |
| |
my $title = &HTML::Entities::encode($env{'form.title'},'\'"<>&'); |
| |
my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype,undef,$title,1); |
| |
$args = {'bread_crumbs' => $brcrum, |
| |
'bread_crumbs_nomenu' => 1}; |
| |
} else { |
| |
$args = {'force_register' => $showdoc}; |
| |
} |
| |
$r->print(&Apache::loncommon::start_page("$crstype documents",undef,$args)); |
| } elsif ($toolsflag) { |
} elsif ($toolsflag) { |
| my ($breadtext,$breadtitle); |
my ($breadtext,$breadtitle); |
| $breadtext = "$crstype Editor"; |
$breadtext = "$crstype Editor"; |
|
Line 5660 sub handler {
|
Line 7398 sub handler {
|
| $breadtitle) |
$breadtitle) |
| ); |
); |
| } elsif ($r->uri eq '/adm/supplemental') { |
} elsif ($r->uri eq '/adm/supplemental') { |
| |
unless ($env{'request.role.adv'}) { |
| |
unless (&Apache::lonnet::has_unhidden_suppfiles($coursenum,$coursedom)) { |
| |
$r->internal_redirect('/adm/navmaps'); |
| |
return OK; |
| |
} |
| |
} |
| my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype); |
my $brcrum = &Apache::lonhtmlcommon::docs_breadcrumbs(undef,$crstype); |
| |
my $args = {'bread_crumbs' => $brcrum}; |
| |
unless (($env{'form.folderpath'} eq '') || |
| |
($env{'form.folder'} eq 'supplemental')) { |
| |
$args->{'bread_crumbs_nomenu'} = 1; |
| |
} |
| $r->print(&Apache::loncommon::start_page("Supplemental $crstype Content",undef, |
$r->print(&Apache::loncommon::start_page("Supplemental $crstype Content",undef, |
| {'bread_crumbs' => $brcrum,})); |
$args)); |
| } else { |
} else { |
| my ($breadtext,$breadtitle,$helpitem); |
my ($breadtext,$breadtitle,$helpitem); |
| $breadtext = "$crstype Editor"; |
$breadtext = "$crstype Editor"; |
|
Line 5690 sub handler {
|
Line 7439 sub handler {
|
| my %codebase = (); |
my %codebase = (); |
| my ($upload_result,$upload_output,$uploadphase); |
my ($upload_result,$upload_output,$uploadphase); |
| if ($canedit) { |
if ($canedit) { |
| |
undef($suppchanges); |
| if (($env{'form.uploaddoc.filename'}) && |
if (($env{'form.uploaddoc.filename'}) && |
| ($env{'form.cmd'}=~/^upload_(\w+)/)) { |
($env{'form.cmd'}=~/^upload_(\w+)/)) { |
| my $context = $1; |
my $context = $1; |
|
Line 5701 sub handler {
|
Line 7451 sub handler {
|
| if ($hadchanges) { |
if ($hadchanges) { |
| &mark_hash_old(); |
&mark_hash_old(); |
| } |
} |
| |
if ($suppchanges) { |
| |
&Apache::lonnet::update_supp_caches($coursedom,$coursenum); |
| |
undef($suppchanges); |
| |
} |
| $r->print($upload_output); |
$r->print($upload_output); |
| } elsif ($env{'form.phase'} eq 'upload_embedded') { |
} elsif ($env{'form.phase'} eq 'upload_embedded') { |
| # Process file upload - phase two - upload embedded objects |
# Process file upload - phase two - upload embedded objects |
|
Line 5713 sub handler {
|
Line 7467 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 5724 sub handler {
|
Line 7478 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 5742 sub handler {
|
Line 7496 sub handler {
|
| |
|
| if ($allowed && $toolsflag) { |
if ($allowed && $toolsflag) { |
| $r->print(&startContentScreen('tools')); |
$r->print(&startContentScreen('tools')); |
| $r->print(&generate_admin_menu($crstype,$canedit)); |
$r->print(&generate_admin_menu($crstype,$canedit,$coursenum,$coursedom)); |
| $r->print(&endContentScreen()); |
$r->print(&endContentScreen()); |
| } elsif ((!$showdoc) && (!$uploadphase)) { |
} elsif ((!$showdoc) && (!$uploadphase)) { |
| # ----------------------------------------------------------------------------- |
# ----------------------------------------------------------------------------- |
|
Line 5750 sub handler {
|
Line 7504 sub handler {
|
| 'copm' => 'All documents out of a published map into this folder', |
'copm' => 'All documents out of a published map into this folder', |
| 'upfi' => 'Upload File', |
'upfi' => 'Upload File', |
| 'upld' => 'Upload Content', |
'upld' => 'Upload Content', |
| 'srch' => 'Search', |
'srch' => 'Search Repository', |
| 'impo' => 'Import', |
'impo' => 'Import from Repository', |
| 'lnks' => 'Import from Stored Links', |
'lnks' => 'Import from Stored Links', |
| 'impm' => 'Import from Assembled Map', |
'impm' => 'Import from Assembled Map', |
| |
'imcr' => 'Import from Course Resources', |
| 'extr' => 'External Resource', |
'extr' => 'External Resource', |
| 'extt' => 'External Tool', |
'extt' => 'External Tool', |
| 'selm' => 'Select Map', |
'selm' => 'Select Map', |
|
Line 5765 sub handler {
|
Line 7520 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', |
| |
'swit' => 'Switch Server', |
| 'drbx' => 'Drop Box', |
'drbx' => 'Drop Box', |
| 'scuf' => 'External Scores (handgrade, upload, clicker)', |
'scuf' => 'External Scores (handgrade, upload, clicker)', |
| 'bull' => 'Discussion Board', |
'bull' => 'Discussion Board', |
|
Line 5778 sub handler {
|
Line 7537 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:', |
| |
'empd' => 'No resources found', |
| 'comment' => 'Comment', |
'comment' => 'Comment', |
| 'parse' => 'Upload embedded images/multimedia files if HTML file', |
'parse' => 'Upload embedded images/multimedia files if HTML file', |
| 'bb5' => 'Blackboard 5', |
'bb5' => 'Blackboard 5', |
| 'bb6' => 'Blackboard 6', |
'bb6' => 'Blackboard 6', |
| 'angel5' => 'ANGEL 5.5', |
'angel5' => 'ANGEL 5.5', |
| 'webctce4' => 'WebCT 4 Campus Edition', |
'webctce4' => 'WebCT 4 Campus Edition', |
| |
'yes' => 'Yes', |
| |
'no' => 'No', |
| 'er' => 'Editing rights unavailable for your current role.', |
'er' => 'Editing rights unavailable for your current role.', |
| ); |
); |
| # ----------------------------------------------------------------------------- |
# ----------------------------------------------------------------------------- |
| |
|
| # Calculate free quota space for a user or course. A javascript function checks |
# Calculate free quota space for a user or course. A javascript function checks |
| # file size to determine if upload should be allowed. |
# file size to determine if upload should be allowed. |
| my $quotatype = 'unofficial'; |
my $quotatype = 'unofficial'; |
| if ($crstype eq 'Community') { |
if ($crstype eq 'Community') { |
| $quotatype = 'community'; |
$quotatype = 'community'; |
| |
} elsif ($crstype eq 'Placement') { |
| |
$quotatype = 'placement'; |
| } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.coursecode'}) { |
} elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.coursecode'}) { |
| $quotatype = 'official'; |
$quotatype = 'official'; |
| } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.textbook'}) { |
} elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.textbook'}) { |
|
Line 5822 sub handler {
|
Line 7594 sub handler {
|
| my $fileupload=(<<FIUP); |
my $fileupload=(<<FIUP); |
| $quotainfo |
$quotainfo |
| $lt{'file'}:<br /> |
$lt{'file'}:<br /> |
| <input type="file" name="uploaddoc" class="LC_flUpload" size="40" $disabled /> |
|
| <input type="hidden" id="LC_free_space" value="$free_space" /> |
|
| FIUP |
FIUP |
| |
|
| my $checkbox=(<<CHBO); |
my $checkbox=(<<CHBO); |
| <!-- <label>$lt{'parse'}? |
<!-- <label>$lt{'parse'}? |
| <input type="checkbox" name="parserflag" /> |
<input type="checkbox" name="parserflag" /> |
|
Line 5845 CHBO
|
Line 7614 CHBO
|
| <fieldset id="uploadimsform" style="display: none;"> |
<fieldset id="uploadimsform" style="display: none;"> |
| <legend>$lt{'imsf'}</legend> |
<legend>$lt{'imsf'}</legend> |
| $fileupload |
$fileupload |
| |
<input type="file" name="uploaddoc" id="uploaddocims" class="LC_flUpload LC_uploaddoc" size="40" $disabled /> |
| |
<input type="hidden" id="LC_free_space_ims" value="$free_space" /> |
| <br /> |
<br /> |
| <p> |
<p> |
| $lt{'cms'}: |
$lt{'cms'}: |
|
Line 5870 IMSFORM
|
Line 7641 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 |
| |
<input type="file" name="uploaddoc" class="LC_flUpload" size="40" $disabled /> |
| |
<input type="hidden" id="LC_free_space" value="$free_space" /> |
| <br /> |
<br /> |
| $lt{'title'}:<br /> |
$lt{'title'}:<br /> |
| <input type="text" size="60" name="comment" $disabled /> |
<input type="text" size="60" name="comment" $disabled /> |
|
Line 5888 FUFORM
|
Line 7661 FUFORM
|
| |
|
| my $mapimportjs; |
my $mapimportjs; |
| if ($canedit) { |
if ($canedit) { |
| $mapimportjs = "javascript:openbrowser('mapimportform','importmap','sequence,page','');"; |
$mapimportjs = "javascript:openbrowser('mapimportform','importmap','sequence,page','');"; |
| } else { |
} else { |
| $mapimportjs = "javascript:alert('".&js_escape($lt{'er'})."');"; |
$mapimportjs = "javascript:alert('".&js_escape($lt{'er'})."');"; |
| } |
} |
|
Line 5909 FUFORM
|
Line 7682 FUFORM
|
| </form> |
</form> |
| |
|
| SEDFFORM |
SEDFFORM |
| |
my ($importcrsresform,$checkcrsres); |
| |
if ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.crsauthor'}) { |
| |
$checkcrsres = 1; |
| |
} elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.crsauthor'} ne '0') { |
| |
my %domdefs=&Apache::lonnet::get_domain_defaults($coursedom); |
| |
my $type = lc($env{'course.'.$env{'request.course.id'}.'.type'}); |
| |
unless (($type eq 'community') || ($type eq 'placement')) { |
| |
$type = 'unofficial'; |
| |
if ($env{'course.'.$env{'request.course.id'}.'internal.coursecode'} ne '') { |
| |
$type = 'official'; |
| |
} elsif ($env{'course.'.$env{'request.course.id'}.'internal.textbook'} ne '') { |
| |
$type = 'textbook'; |
| |
} else { |
| |
$type = 'unofficial'; |
| |
} |
| |
} |
| |
if ($domdefs{$type.'crsauthor'}) { |
| |
$checkcrsres = 1; |
| |
} |
| |
} |
| |
if ($checkcrsres) { |
| |
my ($numdirs,$pickfile) = |
| |
&Apache::loncommon::import_crsauthor_form('coursepath','coursefile', |
| |
"resize_scrollbox('contentscroll','1','0');", |
| |
undef,'res'); |
| |
if ($pickfile) { |
| |
$importcrsresform=(<<CRSFORM); |
| |
<a class="LC_menubuttons_link" href="javascript:toggleImportCrsres('res');"> |
| |
$lt{'imcr'}</a>$help{'Course_Resources'} |
| |
<form action="/adm/coursedocs" method="post" name="crsresimportform" onsubmit="return validImportCrsRes();"> |
| |
<fieldset id="importcrsresform" style="display: none;"> |
| |
<legend>$lt{'imcr'}</legend> |
| |
<div id="importcrsrescontent" style="display: none;"> |
| |
<input type="hidden" name="active" value="bb" /> |
| |
$pickfile |
| |
<p> |
| |
$lt{'title'}: <input type="text" name="crsrestitle" value="" $disabled /> |
| |
</p> |
| |
<input type="hidden" name="importdetail" value="" /> |
| |
<input type="submit" name="crsres" value="$lt{'impo'}" $disabled /><br /> |
| |
</div> |
| |
<div id="importcrsresempty" style="display: none;"> |
| |
<p> |
| |
$lt{'empd'} |
| |
</p> |
| |
</div> |
| |
</fieldset> |
| |
</form> |
| |
CRSFORM |
| |
} |
| |
} |
| |
|
| my $fromstoredjs; |
my $fromstoredjs; |
| if ($canedit) { |
if ($canedit) { |
| $fromstoredjs = 'open_StoredLinks_Import()'; |
$fromstoredjs = 'open_StoredLinks_Import()'; |
| } else { |
} else { |
| $fromstoredjs = "alert('".&js_escape($lt{'er'})."')"; |
$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>$help{'Search_LON-CAPA_Resource'}" }, |
| { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'" onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" }, |
{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'" onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" }, |
| { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{lnks}.'" onclick="javascript:'.$fromstoredjs.';" />' => '<a class="LC_menubuttons_link" href="javascript:'.$fromstoredjs.';">'.$lt{'lnks'}.'</a>' }, |
{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{lnks}.'" onclick="javascript:'.$fromstoredjs.';" />' => '<a class="LC_menubuttons_link" href="javascript:'.$fromstoredjs.';">'.$lt{'lnks'}.'</a>'.$help{'Import_Stored_Links'} }, |
| { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/sequence.png" alt="'.$lt{impm}.'" onclick="javascript:toggleMap(\'map\');" />' => $importpubform } |
{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/sequence.png" alt="'.$lt{impm}.'" onclick="javascript:toggleMap(\'map\');" />' => $importpubform }, |
| ); |
); |
| |
if ($importcrsresform) { |
| |
push(@importpubforma,{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/impcrsau.png" alt="'.$lt{imcr}.'" onclick="javascript:toggleImportCrsres(\'res\');" />' => $importcrsresform}); |
| |
} |
| $importpubform = &create_form_ul(&create_list_elements(@importpubforma)); |
$importpubform = &create_form_ul(&create_list_elements(@importpubforma)); |
| my $extresourcesform = |
my $extresourcesform = |
| &Apache::lonextresedit::extedit_form(0,0,undef,undef,$pathitem, |
&Apache::lonextresedit::extedit_form(0,0,undef,undef,$pathitem, |
|
Line 5952 SEDFFORM
|
Line 7779 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 5974 HIDDENFORM
|
Line 7806 HIDDENFORM
|
| } |
} |
| |
|
| # |
# |
| |
|
| my $savefolderpath; |
|
| my $hostname = $r->hostname(); |
my $hostname = $r->hostname(); |
| |
my $savefolderpath; |
| |
|
| if ($allowed) { |
if ($allowed) { |
| my $folder=$env{'form.folder'}; |
my $folder=$env{'form.folder'}; |
|
Line 5989 HIDDENFORM
|
Line 7820 HIDDENFORM
|
| } |
} |
| my $postexec=''; |
my $postexec=''; |
| if ($folder eq 'default') { |
if ($folder eq 'default') { |
| |
my $windowname = 'loncapaclient'; |
| |
if ($env{'request.lti.login'}) { |
| |
$windowname .= 'lti'; |
| |
} |
| $r->print('<script type="text/javascript">'."\n" |
$r->print('<script type="text/javascript">'."\n" |
| .'// <![CDATA['."\n" |
.'// <![CDATA['."\n" |
| .'this.window.name="loncapaclient";'."\n" |
.'this.window.name="'.$windowname.'";'."\n" |
| .'// ]]>'."\n" |
.'// ]]>'."\n" |
| .'</script>'."\n" |
.'</script>'."\n" |
| ); |
); |
|
Line 6004 HIDDENFORM
|
Line 7839 HIDDENFORM
|
| |
|
| my $newnavform=(<<NNFORM); |
my $newnavform=(<<NNFORM); |
| <form action="/adm/coursedocs" method="post" name="newnav"> |
<form action="/adm/coursedocs" method="post" name="newnav"> |
| <input type="hidden" name="active" value="ee" /> |
<input type="hidden" name="active" value="ff" /> |
| $pathitem |
$pathitem |
| <input type="hidden" name="importdetail" |
<input type="hidden" name="importdetail" |
| value="$lt{'navc'}=/adm/navmaps" /> |
value="$lt{'navc'}=/adm/navmaps" /> |
|
Line 6014 HIDDENFORM
|
Line 7849 HIDDENFORM
|
| NNFORM |
NNFORM |
| my $newsmppageform=(<<NSPFORM); |
my $newsmppageform=(<<NSPFORM); |
| <form action="/adm/coursedocs" method="post" name="newsmppg"> |
<form action="/adm/coursedocs" method="post" name="newsmppg"> |
| <input type="hidden" name="active" value="ee" /> |
<input type="hidden" name="active" value="ff" /> |
| $pathitem |
$pathitem |
| <input type="hidden" name="importdetail" value="" /> |
<input type="hidden" name="importdetail" value="" /> |
| <a class="LC_menubuttons_link" href="javascript:makesmppage();"> $lt{'sipa'}</a> |
<a class="LC_menubuttons_link" href="javascript:makesmppage();"> $lt{'sipa'}</a> |
|
Line 6024 NSPFORM
|
Line 7859 NSPFORM
|
| |
|
| my $newsmpproblemform=(<<NSPROBFORM); |
my $newsmpproblemform=(<<NSPROBFORM); |
| <form action="/adm/coursedocs" method="post" name="newsmpproblem"> |
<form action="/adm/coursedocs" method="post" name="newsmpproblem"> |
| <input type="hidden" name="active" value="cc" /> |
<input type="hidden" name="active" value="dd" /> |
| $pathitem |
$pathitem |
| <input type="hidden" name="importdetail" value="" /> |
<input type="hidden" name="importdetail" value="" /> |
| <a class="LC_menubuttons_link" href="javascript:makesmpproblem();">$lt{'sipr'}</a> |
<a class="LC_menubuttons_link" href="javascript:makesmpproblem();">$lt{'sipr'}</a> |
|
Line 6035 NSPROBFORM
|
Line 7870 NSPROBFORM
|
| |
|
| my $newdropboxform=(<<NDBFORM); |
my $newdropboxform=(<<NDBFORM); |
| <form action="/adm/coursedocs" method="post" name="newdropbox"> |
<form action="/adm/coursedocs" method="post" name="newdropbox"> |
| <input type="hidden" name="active" value="cc" /> |
<input type="hidden" name="active" value="dd" /> |
| $pathitem |
$pathitem |
| <input type="hidden" name="importdetail" value="" /> |
<input type="hidden" name="importdetail" value="" /> |
| <a class="LC_menubuttons_link" href="javascript:makedropbox();">$lt{'drbx'}</a> |
<a class="LC_menubuttons_link" href="javascript:makedropbox();">$lt{'drbx'}</a> |
|
Line 6045 NDBFORM
|
Line 7880 NDBFORM
|
| |
|
| my $newexuploadform=(<<NEXUFORM); |
my $newexuploadform=(<<NEXUFORM); |
| <form action="/adm/coursedocs" method="post" name="newexamupload"> |
<form action="/adm/coursedocs" method="post" name="newexamupload"> |
| <input type="hidden" name="active" value="cc" /> |
<input type="hidden" name="active" value="dd" /> |
| $pathitem |
$pathitem |
| <input type="hidden" name="importdetail" value="" /> |
<input type="hidden" name="importdetail" value="" /> |
| <a class="LC_menubuttons_link" href="javascript:makeexamupload();">$lt{'scuf'}</a> |
<a class="LC_menubuttons_link" href="javascript:makeexamupload();">$lt{'scuf'}</a> |
|
Line 6055 NEXUFORM
|
Line 7890 NEXUFORM
|
| |
|
| my $newbulform=(<<NBFORM); |
my $newbulform=(<<NBFORM); |
| <form action="/adm/coursedocs" method="post" name="newbul"> |
<form action="/adm/coursedocs" method="post" name="newbul"> |
| <input type="hidden" name="active" value="dd" /> |
<input type="hidden" name="active" value="ee" /> |
| $pathitem |
$pathitem |
| <input type="hidden" name="importdetail" value="" /> |
<input type="hidden" name="importdetail" value="" /> |
| <a class="LC_menubuttons_link" href="javascript:makebulboard();" >$lt{'bull'}</a> |
<a class="LC_menubuttons_link" href="javascript:makebulboard();" >$lt{'bull'}</a> |
|
Line 6065 NBFORM
|
Line 7900 NBFORM
|
| |
|
| my $newaboutmeform=(<<NAMFORM); |
my $newaboutmeform=(<<NAMFORM); |
| <form action="/adm/coursedocs" method="post" name="newaboutme"> |
<form action="/adm/coursedocs" method="post" name="newaboutme"> |
| <input type="hidden" name="active" value="dd" /> |
<input type="hidden" name="active" value="ee" /> |
| $pathitem |
$pathitem |
| <input type="hidden" name="importdetail" |
<input type="hidden" name="importdetail" |
| value="$plainname=/adm/$udom/$uname/aboutme" /> |
value="$plainname=/adm/$udom/$uname/aboutme" /> |
|
Line 6076 NAMFORM
|
Line 7911 NAMFORM
|
| |
|
| my $newaboutsomeoneform=(<<NASOFORM); |
my $newaboutsomeoneform=(<<NASOFORM); |
| <form action="/adm/coursedocs" method="post" name="newaboutsomeone"> |
<form action="/adm/coursedocs" method="post" name="newaboutsomeone"> |
| <input type="hidden" name="active" value="dd" /> |
<input type="hidden" name="active" value="ee" /> |
| $pathitem |
$pathitem |
| <input type="hidden" name="importdetail" value="" /> |
<input type="hidden" name="importdetail" value="" /> |
| <a class="LC_menubuttons_link" href="javascript:makeabout();">$lt{'abou'}</a> |
<a class="LC_menubuttons_link" href="javascript:makeabout();">$lt{'abou'}</a> |
|
Line 6085 NASOFORM
|
Line 7920 NASOFORM
|
| |
|
| my $newrosterform=(<<NROSTFORM); |
my $newrosterform=(<<NROSTFORM); |
| <form action="/adm/coursedocs" method="post" name="newroster"> |
<form action="/adm/coursedocs" method="post" name="newroster"> |
| <input type="hidden" name="active" value="dd" /> |
<input type="hidden" name="active" value="ee" /> |
| $pathitem |
$pathitem |
| <input type="hidden" name="importdetail" |
<input type="hidden" name="importdetail" |
| value="$lt{'rost'}=/adm/viewclasslist" /> |
value="$lt{'rost'}=/adm/viewclasslist" /> |
|
Line 6106 NROSTFORM
|
Line 7941 NROSTFORM
|
| } |
} |
| my $newwebpageform =(<<NWEBFORM); |
my $newwebpageform =(<<NWEBFORM); |
| <form action="/adm/coursedocs" method="post" name="newwebpage"> |
<form action="/adm/coursedocs" method="post" name="newwebpage"> |
| <input type="hidden" name="active" value="ee" /> |
<input type="hidden" name="active" value="ff" /> |
| $pathitem |
$pathitem |
| <input type="hidden" name="importdetail" value="$newwebpage" /> |
<input type="hidden" name="importdetail" value="$newwebpage" /> |
| <a class="LC_menubuttons_link" href="javascript:makewebpage();">$lt{'webp'}</a> |
<a class="LC_menubuttons_link" href="javascript:makewebpage();">$lt{'webp'}</a> |
| $help{'Web_Page'} |
$help{'Web_Page'} |
| </form> |
</form> |
| NWEBFORM |
NWEBFORM |
| |
my $showpath = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); |
| |
my @ids=&Apache::lonnet::current_machine_ids(); |
| |
my $machines_str = "'".join("','",@ids)."'"; |
| |
my (%is_home,%toppath,$rolehomes); |
| |
if ($env{'user.author'}) { |
| |
if (grep(/^\Q$env{'user.home'}\E$/,@ids)) { |
| |
$is_home{'author'} = 1; |
| |
} |
| |
$rolehomes = '<input type="hidden" id="rolehome_author" name="rolehome_author" value="'.$env{'user.home'}.'" />'."\n"; |
| |
} |
| |
my %roleshash = &Apache::lonnet::get_my_roles($env{'user.name'},$env{'user.domain'},'userroles', |
| |
['active'],['ca','aa']); |
| |
my %by_roletype; |
| |
if (keys(%roleshash)) { |
| |
foreach my $entry (keys(%roleshash)) { |
| |
my ($auname,$audom,$roletype) = split(/:/,$entry); |
| |
my $key = $entry; |
| |
$key =~ s/:/___/g; |
| |
my $author = $auname.'___'.$audom; |
| |
$by_roletype{$roletype}{$author} = 1; |
| |
my $rolehome = &Apache::lonnet::homeserver($auname,$audom); |
| |
$toppath{$author} = "/priv/$audom/$auname"; |
| |
if (grep(/^\Q$rolehome\E$/,@ids)) { |
| |
$is_home{$author} = 1; |
| |
} |
| |
$rolehomes .= '<input type="hidden" id="rolehome_coauthor_'.$roletype.'_'.$audom.'/'.$auname.'" '. |
| |
'name="rolehome_coauthor" value="'.$roletype.'='.$audom.'/'.$auname.'='.$rolehome.'" />'."\n"; |
| |
} |
| |
} |
| |
my $crshome = $env{'course.'.$env{'request.course.id'}.'.home'}; |
| |
if (grep(/^\Q$crshome\E$/,@ids)) { |
| |
$is_home{'course'} = 1; |
| |
} |
| |
$rolehomes .= '<input type="hidden" id="rolehome_course" name="rolehome_course" value="'.$crshome.'" />'."\n"; |
| |
my $pickdir = $lt{'loca'}. |
| |
'<select name="authorrole" onchange="populateDirSelects(this.form,'."'authorrole','authorpath'".',1,1,0);">'."\n". |
| |
'<option value="" selected="selected">'.&mt('Select').'</option>'."\n"; |
| |
if ($env{'user.author'}) { |
| |
$pickdir .= '<option value="author">'.&Apache::lonnet::plaintext('au').'</option>'."\n"; |
| |
} |
| |
if (keys(%by_roletype)) { |
| |
foreach my $possrole ('ca','aa') { |
| |
if (ref($by_roletype{$possrole}) eq 'HASH') { |
| |
my $roletitle = &Apache::lonnet::plaintext($possrole); |
| |
foreach my $author (sort { lc($a) cmp lc($b) } (keys(%{$by_roletype{$possrole}}))) { |
| |
my ($none,$where,$auname,$audom) = split(/\//,$toppath{$author}); |
| |
$pickdir .= '<option value="'.$author.'___'.$possrole.'">'. |
| |
$roletitle." ($audom/$auname)</option>\n"; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if ($checkcrsres) { |
| |
$pickdir .= '<option value="course">'.&mt('Course Resource').'</option>'."\n"; |
| |
} |
| |
$pickdir .= '</select><br />'."\n". |
| |
$lt{'dire'}. |
| |
'<select name="authorpath" onchange="toggleCrsResTitle();">'. |
| |
'<option value=""></option>'. |
| |
'</select><br />'."\n"; |
| |
my %seltemplate_menus; |
| |
my @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; |
| |
if (($env{'user.author'}) || ($checkcrsres)) { |
| |
$crsresform=(<<RESFORM); |
| |
<a class="LC_menubuttons_link" href="javascript:toggleCrsRes('res');"> |
| |
$lt{'stpr'}</a>$help{'Standard_Problem'} |
| |
<form action="/adm/coursedocs" method="post" name="courseresform"> |
| |
<fieldset id="crsresform" style="display:none;"> |
| |
<legend>$lt{'stpr'}</legend> |
| |
<input type="hidden" name="active" value="bb" /> |
| |
<p> |
| |
$pickdir |
| |
</p> |
| |
<div id="newstdproblem" style="display:none;"> |
| |
<p> |
| |
<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> |
| |
</div> |
| |
$lt{'fnam'} |
| |
<input type="text" size="20" name="newresourcename" autocomplete="off" $disabled /> |
| |
<div id="newresource" style="display:none"> |
| |
<p> |
| |
$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 /> |
| |
</p> |
| |
</div> |
| |
<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> |
| |
</p> |
| |
<div id="newrestemplate" style="display:none"> |
| |
$templates |
| |
$templatepreview |
| |
</div> |
| |
<span class="LC_nobreak"> |
| |
<input type="hidden" name="folderpath" value="$showpath" /> |
| |
<input type="submit" name="newcrs" value="$lt{'crpr'}" $disabled /> |
| |
</span> |
| |
<div id="stdprobswitch" style="display:none;"> |
| |
$rolehomes |
| |
<input type="button" name="switchfornewprob" value="$lt{'swit'}" onclick="switchForProb();" /> |
| |
</div> |
| |
</fieldset> |
| |
</form> |
| |
|
| |
RESFORM |
| |
} |
| |
|
| my $specialdocumentsform; |
my $specialdocumentsform; |
| my @specialdocumentsforma; |
my @specialdocumentsforma; |
|
Line 6160 NSYLFORM
|
Line 8153 NSYLFORM
|
| |
|
| my $newgroupfileform=(<<NGFFORM); |
my $newgroupfileform=(<<NGFFORM); |
| <form action="/adm/coursedocs" method="post" name="newgroupfiles"> |
<form action="/adm/coursedocs" method="post" name="newgroupfiles"> |
| <input type="hidden" name="active" value="dd" /> |
<input type="hidden" name="active" value="ee" /> |
| $pathitem |
$pathitem |
| <input type="hidden" name="importdetail" |
<input type="hidden" name="importdetail" |
| value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" /> |
value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" /> |
|
Line 6183 NGFFORM
|
Line 8176 NGFFORM
|
| } |
} |
| $specialdocumentsform = &create_form_ul(&create_list_elements(@specialdocumentsforma)); |
$specialdocumentsform = &create_form_ul(&create_list_elements(@specialdocumentsforma)); |
| |
|
| |
my @external = ( |
| my @importdoc = ( |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="toggleExternal(\'ext\');" />'=>$extresourcesform} |
| {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="toggleUpload(\'ext\');" />'=>$extresourcesform} |
|
| ); |
|
| if (keys(%ltitools)) { |
|
| push(@importdoc, |
|
| {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/exttool.png" alt="'.$lt{extt}.'" onclick="toggleUpload(\'tool\');" />'=>$exttoolform}, |
|
| ); |
); |
| |
if ($posslti) { |
| |
push(@external, |
| |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/exttool.png" alt="'.$lt{extt}.'" onclick="toggleExternal(\'tool\');" />'=>$exttoolform}, |
| |
); |
| } |
} |
| |
my $externalform = &create_form_ul(&create_list_elements(@external)); |
| |
|
| |
my @importdoc = (); |
| unless ($container eq 'page') { |
unless ($container eq 'page') { |
| push(@importdoc, |
push(@importdoc, |
| {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:toggleUpload(\'ims\');" />'=>$imspform} |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:toggleUpload(\'ims\');" />'=>$imspform} |
|
Line 6205 NGFFORM
|
Line 8200 NGFFORM
|
| @gradingforma=( |
@gradingforma=( |
| {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{sipr}.'" onclick="javascript:makesmpproblem();" />'=>$newsmpproblemform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{sipr}.'" onclick="javascript:makesmpproblem();" />'=>$newsmpproblemform}, |
| {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/dropbox.png" alt="'.$lt{drbx}.'" onclick="javascript:makedropbox();" />'=>$newdropboxform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/dropbox.png" alt="'.$lt{drbx}.'" onclick="javascript:makedropbox();" />'=>$newdropboxform}, |
| {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/scoreupfrm.png" alt="'.$lt{scuf}.'" onclick="javascript:makeexamupload();" />'=>$newexuploadform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/scoreupfrm.png" alt="'.$lt{scuf}.'" onclick="javascript:makeexamupload();" />'=>$newexuploadform} |
| |
|
| ); |
); |
| |
if ($crsresform) { |
| |
push(@gradingforma, |
| |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{stpr}.'" onclick="javascript:toggleCrsRes(\'res\');" />'=>$crsresform} |
| |
); |
| |
} |
| $gradingform = &create_form_ul(&create_list_elements(@gradingforma)); |
$gradingform = &create_form_ul(&create_list_elements(@gradingforma)); |
| |
|
| @communityforma=( |
@communityforma=( |
|
Line 6221 NGFFORM
|
Line 8220 NGFFORM
|
| |
|
| my %orderhash = ( |
my %orderhash = ( |
| 'aa' => ['Upload',$fileuploadform], |
'aa' => ['Upload',$fileuploadform], |
| 'bb' => ['Import',$importpubform], |
'bb' => ['External',$externalform], |
| 'cc' => ['Grading',$gradingform], |
'cc' => ['Import',$importpubform], |
| 'ee' => ['Other',$specialdocumentsform], |
'dd' => ['Assessment',$gradingform], |
| |
'ff' => ['Other',$specialdocumentsform], |
| ); |
); |
| unless ($container eq 'page') { |
unless ($container eq 'page') { |
| $orderhash{'00'} = ['Newfolder',$newfolderform]; |
$orderhash{'00'} = ['Newfolder',$newfolderform]; |
| $orderhash{'dd'} = ['Collaboration',$communityform]; |
$orderhash{'ee'} = ['Collaboration',$communityform]; |
| } |
} |
| |
|
| $hadchanges=0; |
$hadchanges=0; |
|
Line 6240 unless ($container eq 'page') {
|
Line 8240 unless ($container eq 'page') {
|
| $r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
| } |
} |
| if ($hadchanges) { |
if ($hadchanges) { |
| unless (&is_hash_old()) { |
unless (&is_hash_old()) { |
| &mark_hash_old(); |
&mark_hash_old(); |
| } |
} |
| } |
} |
| |
|
| &changewarning($r,''); |
&changewarning($r,''); |
| } |
} |
|
Line 6255 unless ($container eq 'page') {
|
Line 8255 unless ($container eq 'page') {
|
| unless ($supplementalflag) { |
unless ($supplementalflag) { |
| $folder='supplemental'; |
$folder='supplemental'; |
| } |
} |
| if ($folder =~ /^supplemental$/ && |
if (($folder eq 'supplemental') && |
| (($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) { |
(($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) { |
| $env{'form.folderpath'} = &supplemental_base(); |
$env{'form.folderpath'} = &supplemental_base(); |
| } elsif ($allowed) { |
} elsif ($allowed) { |
|
Line 6273 unless ($container eq 'page') {
|
Line 8273 unless ($container eq 'page') {
|
| <form action="/adm/coursedocs" method="post" name="supuploaddocument" enctype="multipart/form-data"> |
<form action="/adm/coursedocs" method="post" name="supuploaddocument" enctype="multipart/form-data"> |
| <fieldset id="uploadsuppdocform" style="display: none;"> |
<fieldset id="uploadsuppdocform" style="display: none;"> |
| <legend>$lt{'upfi'}</legend> |
<legend>$lt{'upfi'}</legend> |
| <input type="hidden" name="active" value="ee" /> |
<input type="hidden" name="active" value="ee" /> |
| $fileupload |
$fileupload |
| |
<input type="file" name="uploaddoc" id="uploaddocsupp" class="LC_flUpload LC_uploaddoc" size="40" $disabled /> |
| |
<input type="hidden" id="LC_free_space_supp" value="$free_space" /> |
| <br /> |
<br /> |
| <br /> |
<br /> |
| <span class="LC_nobreak"> |
<span class="LC_nobreak"> |
|
Line 6287 unless ($container eq 'page') {
|
Line 8289 unless ($container eq 'page') {
|
| $pathitem |
$pathitem |
| <input type="hidden" name="cmd" value="upload_supplemental" /> |
<input type="hidden" name="cmd" value="upload_supplemental" /> |
| <input type='submit' value="$lt{'upld'}" /> |
<input type='submit' value="$lt{'upld'}" /> |
| |
</fieldset> |
| </form> |
</form> |
| SUPDOCFORM |
SUPDOCFORM |
| |
|
|
Line 6303 SNFFORM
|
Line 8306 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,$disabled); |
undef,undef,undef,undef,undef,undef, |
| |
$disabled); |
| |
|
| my $supexttoolform = |
my $supexttoolform = |
| &Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem, |
&Apache::lonextresedit::extedit_form(1,0,undef,undef,$pathitem, |
| $help{'Adding_External_Tool'}, |
$help{'Adding_External_Tool'}, |
|
Line 6361 my @specialdocs = (
|
Line 8366 my @specialdocs = (
|
| {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/webpage.png" alt="'.$lt{webp}.'" onclick="javascript:makewebpage('."'supp'".');" />'=>$supwebpageform}, |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/webpage.png" alt="'.$lt{webp}.'" onclick="javascript:makewebpage('."'supp'".');" />'=>$supwebpageform}, |
| |
|
| ); |
); |
| my @supimportdoc = ( |
my @supexternal = ( |
| {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:toggleUpload(\'suppext\')" />' |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:toggleExternal(\'suppext\')" />' |
| =>$supextform}); |
=>$supextform}); |
| if (keys(%ltitools)) { |
if ($posslti) { |
| push(@supimportdoc, |
push(@supexternal, |
| {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/exttool.png" alt="'.$lt{extt}.'" onclick="javascript:toggleUpload(\'supptool\')" />' |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/exttool.png" alt="'.$lt{extt}.'" onclick="javascript:toggleExternal(\'supptool\')" />' |
| =>$supexttoolform}); |
=>$supexttoolform}); |
| } |
} |
| push(@supimportdoc, |
my @supimportdoc = ( |
| {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'suppdoc\');" />' |
{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/pdfupload.png" alt="'.$lt{upl}.'" onclick="javascript:toggleUpload(\'suppdoc\');" />' |
| =>$supupdocform}, |
=>$supupdocform}, |
| ); |
); |
| |
|
| $supupdocform = &create_form_ul(&create_list_elements(@supimportdoc)); |
$supupdocform = &create_form_ul(&create_list_elements(@supimportdoc)); |
| my %suporderhash = ( |
my %suporderhash = ( |
| '00' => ['Supnewfolder', $supnewfolderform], |
'00' => ['Supnewfolder', $supnewfolderform], |
| 'ee' => ['Upload',$supupdocform], |
'dd' => ['Upload',$supupdocform], |
| |
'ee' => ['External',&create_form_ul(&create_list_elements(@supexternal))], |
| 'ff' => ['Other',&create_form_ul(&create_list_elements(@specialdocs))] |
'ff' => ['Other',&create_form_ul(&create_list_elements(@specialdocs))] |
| ); |
); |
| if ($supplementalflag) { |
if ($supplementalflag) { |
| my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, |
$suppchanges = 0; |
| $supplementalflag,\%suporderhash,$iconpath,$pathitem, |
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, |
| \%ltitools,$canedit,$hostname); |
$supplementalflag,\%suporderhash,$iconpath,$pathitem, |
| if ($error) { |
\%ltitools,$canedit,$hostname); |
| $r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
if ($error) { |
| } else { |
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
| if ($suppchanges) { |
} |
| my %servers = &Apache::lonnet::internet_dom_servers($coursedom); |
if ($suppchanges) { |
| my @ids=&Apache::lonnet::current_machine_ids(); |
&Apache::lonnet::update_supp_caches($coursedom,$coursenum); |
| foreach my $server (keys(%servers)) { |
undef($suppchanges); |
| next if (grep(/^\Q$server\E$/,@ids)); |
} |
| my $hashid=$coursenum.':'.$coursedom; |
|
| my $cachekey = &escape('suppcount').':'.&escape($hashid); |
|
| &Apache::lonnet::remote_devalidate_cache($server,[$cachekey]); |
|
| } |
|
| &Apache::lonnet::get_numsuppfiles($coursenum,$coursedom,1); |
|
| undef($suppchanges); |
|
| } |
|
| } |
|
| } |
} |
| } elsif ($supplementalflag) { |
} elsif ($supplementalflag) { |
| my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, |
my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype, |
| $supplementalflag,'',$iconpath,$pathitem,'',$hostname); |
$supplementalflag,'',$iconpath,$pathitem,'',$canedit, |
| |
$hostname); |
| if ($error) { |
if ($error) { |
| $r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
$r->print('<p><span class="LC_error">'.$error.'</span></p>'); |
| } |
} |
|
Line 6430 my %suporderhash = (
|
Line 8429 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; |
| } |
} |
| |
|
|
Line 6508 sub decompression_phase_one {
|
Line 8509 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 6565 sub remove_archive {
|
Line 8566 sub remove_archive {
|
| if ($url eq $env{'form.archiveurl'}) { |
if ($url eq $env{'form.archiveurl'}) { |
| if (&handle_edit_cmd($docuname,$docudom)) { |
if (&handle_edit_cmd($docuname,$docudom)) { |
| ($errtext,$fatal) = &storemap($docuname,$docudom,$map,1); |
($errtext,$fatal) = &storemap($docuname,$docudom,$map,1); |
| |
if ($suppchanges) { |
| |
&Apache::lonnet::update_supp_caches($docudom,$docuname); |
| |
undef($suppchanges); |
| |
} |
| if ($fatal) { |
if ($fatal) { |
| if ($container eq 'page') { |
if ($container eq 'page') { |
| $delwarning = &mt('An error occurred updating the contents of the current page.'); |
$delwarning = &mt('An error occurred updating the contents of the current page.'); |
|
Line 6596 sub remove_archive {
|
Line 8601 sub remove_archive {
|
| } |
} |
| |
|
| sub generate_admin_menu { |
sub generate_admin_menu { |
| my ($crstype,$canedit) = @_; |
my ($crstype,$canedit,$coursenum,$coursedom) = @_; |
| my $lc_crstype = lc($crstype); |
my $lc_crstype = lc($crstype); |
| my ($home,$other,%outhash)=&authorhosts(); |
my ($home,$other,%outhash)=&authorhosts(); |
| my %lt= ( # do not translate here |
my %lt= ( # do not translate here |
|
Line 6604 sub generate_admin_menu {
|
Line 8609 sub generate_admin_menu {
|
| 'cv' => 'Check/Set Resource Versions', |
'cv' => 'Check/Set Resource Versions', |
| 'ls' => 'List Resource Identifiers', |
'ls' => 'List Resource Identifiers', |
| 'ct' => 'Display/Set Shortened URLs for Deep-linking', |
'ct' => 'Display/Set Shortened URLs for Deep-linking', |
| |
'ca' => "Enter $crstype Authoring Space", |
| 'imse' => 'Export contents to IMS Archive', |
'imse' => 'Export contents to IMS Archive', |
| 'dcd' => "Copy $crstype Content to Authoring Space", |
'dcd' => 'Copy uploaded content to Authoring Space', |
| |
'cpc' => 'Copy from Course Authoring to User Authoring', |
| ); |
); |
| my ($candump,$dumpurl); |
my ($candump,$dumpurl,$exportcrsurl); |
| if ($home + $other > 0) { |
if ($home + $other > 0) { |
| $candump = 'F'; |
$candump = 'F'; |
| if ($home) { |
if ($home) { |
| $dumpurl = "javascript:injectData(document.courseverify,'dummy','dumpcourse','$lt{'dcd'}')"; |
$dumpurl = "javascript:injectData(document.courseverify,'dummy','dumpcourse','$lt{'dcd'}')"; |
| |
$exportcrsurl = "javascript:injectData(document.courseverify,'dummy','copyauthored','$lt{'cpc'}')"; |
| } else { |
} else { |
| my @hosts; |
my @hosts; |
| foreach my $aurole (keys(%outhash)) { |
foreach my $aurole (keys(%outhash)) { |
|
Line 6625 sub generate_admin_menu {
|
Line 8633 sub generate_admin_menu {
|
| &HTML::Entities::encode($env{'request.role'},'"<>&').'&origurl='. |
&HTML::Entities::encode($env{'request.role'},'"<>&').'&origurl='. |
| &HTML::Entities::encode('/adm/coursedocs?dumpcourse=1','"<>&'); |
&HTML::Entities::encode('/adm/coursedocs?dumpcourse=1','"<>&'); |
| $dumpurl = "javascript:dump_needs_switchserver('$switchto')"; |
$dumpurl = "javascript:dump_needs_switchserver('$switchto')"; |
| |
$exportcrsurl = $dumpurl; |
| } else { |
} else { |
| $dumpurl = "javascript:choose_switchserver_window()"; |
$dumpurl = "javascript:choose_switchserver_window()"; |
| |
$exportcrsurl = $dumpurl; |
| } |
} |
| } |
} |
| } |
} |
|
Line 6664 sub generate_admin_menu {
|
Line 8674 sub generate_admin_menu {
|
| ] |
] |
| }); |
}); |
| if ($canedit) { |
if ($canedit) { |
| |
my ($crsauname,$crsaudom,$crshome); |
| |
if (($coursenum ne '') && ($coursedom ne '')) { |
| |
my $crsauthorurl = "/priv/$coursedom/$coursenum/"; |
| |
($crsauname,$crsaudom,$crshome) = &Apache::lonnet::constructaccess($crsauthorurl); |
| |
if (($crsauname eq $coursenum) && ($crsaudom eq $coursedom)) { |
| |
my @ids=&Apache::lonnet::current_machine_ids(); |
| |
my $linkurl; |
| |
if (grep(/^\Q$crshome\E$/,@ids)) { |
| |
$linkurl = $crsauthorurl; |
| |
} else { |
| |
my $jscall = &Apache::lonhtmlcommon::jump_to_editres($crsauthorurl,$crshome,1); |
| |
if ($jscall) { |
| |
$linkurl = 'javascript:'.$jscall; |
| |
} |
| |
} |
| |
if ((ref($menu[0]) eq 'HASH') && (ref($menu[0]->{'items'}) eq 'ARRAY') && ($linkurl)) { |
| |
push(@{$menu[0]->{items}}, |
| |
{ linktext => $lt{'ca'}, |
| |
url => $linkurl, |
| |
permission => 'F', |
| |
help => 'Docs_Course_Authorspace', |
| |
icon => 'impcrsau.png', |
| |
linktitle => $lt{'ca'}, |
| |
}); |
| |
} |
| |
} |
| |
} |
| push(@menu, |
push(@menu, |
| { categorytitle=>'Export', |
{ categorytitle=>'Export', |
| items =>[ |
items =>[ |
|
Line 6683 sub generate_admin_menu {
|
Line 8720 sub generate_admin_menu {
|
| }, |
}, |
| ] |
] |
| }); |
}); |
| |
if (($crsauname eq $coursenum) && ($crsaudom eq $coursedom)) { |
| |
if ((ref($menu[1]) eq 'HASH') && (ref($menu[1]->{'items'}) eq 'ARRAY')) { |
| |
push(@{$menu[1]->{items}}, |
| |
{ linktext => $lt{'cpc'}, |
| |
url => $exportcrsurl, |
| |
permission => 'F', |
| |
help => 'Docs_Export_Course_Author', |
| |
icon => 'res.png', |
| |
linktitle => $lt{'cpc'}, |
| |
}); |
| |
} |
| |
} |
| } |
} |
| 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". |
|
Line 6792 END
|
Line 8841 END
|
| |
|
| sub editing_js { |
sub editing_js { |
| my ($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti, |
my ($udom,$uname,$supplementalflag,$coursedom,$coursenum,$posslti, |
| $canedit,$hostname,$navmapref) = @_; |
$londocroot,$canedit,$hostname,$navmapref) = @_; |
| my %js_lt = &Apache::lonlocal::texthash( |
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', |
|
Line 6804 sub editing_js {
|
Line 8853 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', |
|
Line 6822 sub editing_js {
|
Line 8872 sub editing_js {
|
| p_ctr2b => '?', |
p_ctr2b => '?', |
| p_ctr3a => 'Cut those', |
p_ctr3a => 'Cut those', |
| p_ctr3b => 'items?', |
p_ctr3b => 'items?', |
| |
setal => 'Enter a (unique) alias', |
| |
delal => 'Are you sure you want to eliminate the alias?', |
| rpck => 'Enter number to pick (e.g., 3)', |
rpck => 'Enter number to pick (e.g., 3)', |
| imsfile => 'You must choose an IMS package for import', |
imsfile => 'You must choose an IMS package for import', |
| imscms => 'You must select which Course Management System was the source of the IMS package', |
imscms => 'You must select which Course Management System was the source of the IMS package', |
|
Line 6832 sub editing_js {
|
Line 8884 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.', |
edri => 'Editing rights unavailable for your current role.', |
| |
sele => 'Select', |
| |
swit => 'Switch server required', |
| ); |
); |
| |
|
| &js_escape(\%js_lt); |
&js_escape(\%js_lt); |
| my $crstype = &Apache::loncommon::course_type(); |
my $crstype = &Apache::loncommon::course_type(); |
| 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'},'<>&"'); |
|
Line 6845 sub editing_js {
|
Line 8901 sub editing_js {
|
| my $backtourl; |
my $backtourl; |
| my $toplevelmain = &escape(&default_folderpath($coursenum,$coursedom,$navmapref)); |
my $toplevelmain = &escape(&default_folderpath($coursenum,$coursedom,$navmapref)); |
| my $toplevelsupp = &supplemental_base(); |
my $toplevelsupp = &supplemental_base(); |
| |
my $showfile_js = &Apache::loncommon::show_crsfiles_js(); |
| |
my @ids=&Apache::lonnet::current_machine_ids(); |
| |
my $machines_str = "'".join("','",@ids)."'"; |
| if ($env{'docs.exit.'.$env{'request.course.id'}} =~ /^direct_(.+)$/) { |
if ($env{'docs.exit.'.$env{'request.course.id'}} =~ /^direct_(.+)$/) { |
| my $caller = $1; |
my $caller = $1; |
| if ($caller =~ /^supplemental/) { |
if ($caller =~ /^supplemental/) { |
|
Line 6894 sub editing_js {
|
Line 8952 sub editing_js {
|
| if ($anchor ne '') { |
if ($anchor ne '') { |
| $backtourl .= '#'.&HTML::Entities::encode($anchor,'<>&"'); |
$backtourl .= '#'.&HTML::Entities::encode($anchor,'<>&"'); |
| } |
} |
| $backtourl = &Apache::loncommon::escape_single($backtourl); |
$backtourl = &Apache::loncommon::escape_single($backtourl); |
| } else { |
} else { |
| $backtourl = '/adm/navmaps'; |
$backtourl = '/adm/navmaps'; |
| } |
} |
|
Line 6902 sub editing_js {
|
Line 8960 sub editing_js {
|
| } elsif ($env{'docs.exit.'.$env{'request.course.id'}} eq '/adm/menu') { |
} elsif ($env{'docs.exit.'.$env{'request.course.id'}} eq '/adm/menu') { |
| $backtourl = '/adm/menu'; |
$backtourl = '/adm/menu'; |
| } elsif ($supplementalflag) { |
} elsif ($supplementalflag) { |
| $backtourl = '/adm/supplemental'; |
if (($env{'request.role.adv'}) || |
| |
(&Apache::lonnet::has_unhidden_suppfiles($coursenum,$coursedom))) { |
| |
$backtourl = '/adm/supplemental'; |
| |
} else { |
| |
$backtourl = '/adm/navmaps'; |
| |
} |
| } else { |
} else { |
| $backtourl = '/adm/navmaps'; |
$backtourl = '/adm/navmaps'; |
| } |
} |
| |
|
| my $fieldsets = "'ext','doc'"; |
my $fieldsets = "'doc'"; |
| if ($posslti) { |
|
| $fieldsets .= ",'tool'"; |
|
| } |
|
| unless ($main_container_page) { |
unless ($main_container_page) { |
| $fieldsets .=",'ims'"; |
$fieldsets .=",'ims'"; |
| } |
} |
| |
my $extfieldsets = "'ext'"; |
| |
if ($posslti) { |
| |
$extfieldsets .= ",'tool'"; |
| |
} |
| if ($supplementalflag) { |
if ($supplementalflag) { |
| $fieldsets = "'suppext','suppdoc'"; |
$fieldsets = "'suppdoc'"; |
| |
$extfieldsets = "'suppext'"; |
| if ($posslti) { |
if ($posslti) { |
| $fieldsets .= ",'supptool'"; |
$extfieldsets .= ",'supptool'"; |
| } |
} |
| } |
} |
| |
|
|
Line 6967 function makewebpage(type) {
|
Line 9032 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 = encodeURIComponent(title)+'='+webpage; |
formname.importdetail.value = encodeURIComponent(title)+'='+webpage; |
| formname.submit(); |
formname.submit(); |
| } |
} |
|
Line 7034 function changename(folderpath,index,old
|
Line 9099 function changename(folderpath,index,old
|
| } |
} |
| } |
} |
| |
|
| |
function setalias(folderpath,index) { |
| |
var alias = prompt('$js_lt{"setal"}'); |
| |
if ((alias != null) && (alias != '')) { |
| |
this.document.forms.aliasform.alias.value=alias; |
| |
this.document.forms.aliasform.cmd.value='setalias_'+index; |
| |
this.document.forms.aliasform.folderpath.value=folderpath; |
| |
this.document.forms.aliasform.submit(); |
| |
} |
| |
} |
| |
|
| |
function delalias(folderpath,index) { |
| |
if (confirm('$js_lt{"delal"}')) { |
| |
this.document.forms.aliasform.cmd.value='delalias_'+index; |
| |
this.document.forms.aliasform.folderpath.value=folderpath; |
| |
this.document.forms.aliasform.submit(); |
| |
} |
| |
} |
| |
|
| ENDNEWSCRIPT |
ENDNEWSCRIPT |
| } else { |
} else { |
| $jsmakefunctions = <<ENDNEWSCRIPT; |
$jsmakefunctions = <<ENDNEWSCRIPT; |
|
Line 7078 function changename() {
|
Line 9161 function changename() {
|
| alert("$js_lt{'edri'}"); |
alert("$js_lt{'edri'}"); |
| } |
} |
| |
|
| |
function setalias() { |
| |
alert("$js_lt{'edri'}"); |
| |
} |
| |
|
| |
function delalias() { |
| |
alert("$js_lt{'edri'}"); |
| |
} |
| |
|
| function makenew() { |
function makenew() { |
| alert("$js_lt{'edri'}"); |
alert("$js_lt{'edri'}"); |
| } |
} |
|
Line 7115 function toggleUpload(caller) {
|
Line 9206 function toggleUpload(caller) {
|
| } |
} |
| } |
} |
| document.getElementById('upload'+blocks[i]+'form').style.display=disp; |
document.getElementById('upload'+blocks[i]+'form').style.display=disp; |
| |
} |
| |
resize_scrollbox('contentscroll','1','1'); |
| |
return; |
| |
} |
| |
|
| |
function toggleExternal(caller) { |
| |
var blocks = Array($extfieldsets); |
| |
for (var i=0; i<blocks.length; i++) { |
| |
var disp = 'none'; |
| |
if (caller == blocks[i]) { |
| |
var curr = document.getElementById('external'+caller+'form').style.display; |
| |
if (curr == 'none') { |
| |
disp='block'; |
| |
} |
| |
} |
| |
document.getElementById('external'+blocks[i]+'form').style.display=disp; |
| if ((caller == 'tool') || (caller == 'supptool')) { |
if ((caller == 'tool') || (caller == 'supptool')) { |
| if (disp == 'block') { |
if (disp == 'block') { |
| if (document.getElementById('LC_exttoolid')) { |
if (document.getElementById('LC_exttoolid')) { |
|
Line 7143 function toggleMap(caller) {
|
Line 9250 function toggleMap(caller) {
|
| } |
} |
| } |
} |
| document.getElementById('importmapform').style.display=disp; |
document.getElementById('importmapform').style.display=disp; |
| |
if (disp == 'block') { |
| |
if (document.getElementById('importcrsresform')) { |
| |
if (document.getElementById('importcrsresform').style.display == 'block') { |
| |
document.getElementById('importcrsresform').style.display = 'none'; |
| |
} |
| |
} |
| |
} |
| resize_scrollbox('contentscroll','1','1'); |
resize_scrollbox('contentscroll','1','1'); |
| } |
} |
| return; |
return; |
| } |
} |
| |
|
| |
function toggleCrsRes(caller) { |
| |
var disp = 'none'; |
| |
if (document.getElementById('crsresform')) { |
| |
if (caller == 'res') { |
| |
var form = document.getElementById('crsresform'); |
| |
var curr = form.style.display; |
| |
if (curr == 'none') { |
| |
disp='block'; |
| |
document.courseresform.authorrole.selectedIndex = 0; |
| |
document.courseresform.authorpath.selectedIndex = 0; |
| |
document.courseresform.newresourceadd.selectedIndex = 0; |
| |
populateDirSelects(form,'authorrole','authorpath',1,0,0); |
| |
toggleNewInCourse(document.courseresform); |
| |
if (document.getElementById('newresource')) { |
| |
document.getElementById('newresource').style.display = 'none'; |
| |
} |
| |
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')) { |
| |
var selloc = document.courseresform.authorrole.options[document.courseresform.authorrole.selectedIndex].value; |
| |
if (selloc == 'course') { |
| |
document.getElementById('newresource').style.display = 'inline'; |
| |
document.courseresform.newresourceadd[0].checked = true; |
| |
toggleNewInCourse(document.courseresform); |
| |
} else { |
| |
document.getElementById('newresource').style.display = 'none'; |
| |
} |
| |
} |
| |
if (document.getElementById('newstdproblem')) { |
| |
if (document.courseresform.authorpath.options[document.courseresform.authorpath.selectedIndex].value == 'switch') { |
| |
document.getElementById('newstdproblem').style.display = 'none'; |
| |
if (document.getElementById('stdprobswitch')) { |
| |
document.getElementById('stdprobswitch').style.display = 'block'; |
| |
} |
| |
} else { |
| |
document.getElementById('newstdproblem').style.display = 'block'; |
| |
if (document.getElementById('stdprobswitch')) { |
| |
document.getElementById('stdprobswitch').style.display = 'none'; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
|
| |
function toggleNewInCourse(form) { |
| |
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) { |
| |
var disp = 'none'; |
| |
if (document.getElementById('importcrsresform')) { |
| |
if (caller == 'res') { |
| |
var curr = document.getElementById('importcrsresform').style.display; |
| |
if (curr == 'none') { |
| |
disp='block'; |
| |
populateCrsSelects(document.crsresimportform,'coursepath','coursefile',1,'',1,0,1,1,0); |
| |
if ((document.getElementById('importcrsrescontent')) && |
| |
(document.getElementById('importcrsresempty'))) { |
| |
var selelem = document.crsresimportform.elements['coursepath']; |
| |
var numdirs = 0; |
| |
if (selelem.options.length) { |
| |
numdirs = selelem.options.length - 1; |
| |
} |
| |
if (numdirs) { |
| |
document.getElementById('importcrsrescontent').style.display='block'; |
| |
document.getElementById('importcrsresempty').style.display='none'; |
| |
} else { |
| |
document.getElementById('importcrsrescontent').style.display='none'; |
| |
document.getElementById('importcrsresempty').style.display='block'; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
document.getElementById('importcrsresform').style.display=disp; |
| |
if (disp == 'block') { |
| |
if (document.getElementById('importmapform')) { |
| |
if (document.getElementById('importmapform').style.display == 'block') { |
| |
document.getElementById('importmapform').style.display = 'none'; |
| |
} |
| |
} |
| |
} |
| |
resize_scrollbox('contentscroll','1','0'); |
| |
} |
| |
return; |
| |
} |
| |
|
| |
$showfile_js |
| |
|
| |
function populateDirSelects(form,locsel,dirsel,setdir,recurse,nonemptydir) { |
| |
var location = form.elements[locsel].options[form.elements[locsel].selectedIndex].value; |
| |
if ((setdir) && (dirsel != null) && (dirsel != 'undefined') && (dirsel != '')) { |
| |
var selelem = form.elements[dirsel]; |
| |
var i, numfiles = selelem.options.length -1; |
| |
if (numfiles >=0) { |
| |
for (i = numfiles; i >= 0; i--) { |
| |
selelem.remove(i); |
| |
} |
| |
} |
| |
if ((location == '') || (location == null) || (location == 'undefined')) { |
| |
if (selelem.options.length == 0) { |
| |
selelem.options[selelem.options.length] = new Option('',''); |
| |
selelem.selectedIndex = 0; |
| |
} |
| |
if (document.getElementById('newstdproblem')) { |
| |
document.getElementById('newstdproblem').style.display = 'none'; |
| |
} |
| |
return; |
| |
} |
| |
var machineIds = new Array($machines_str); |
| |
var athome = 0; |
| |
var role = location; |
| |
if ((location == 'author') || (location == 'course')) { |
| |
if (document.getElementById('rolehome_'+location)) { |
| |
var currhome = document.getElementById('rolehome_'+location).value; |
| |
if ((currhome != '') && (currhome != null) && (currhome != 'undefined')) { |
| |
if (machineIds.includes(currhome)) { |
| |
athome = 1; |
| |
} |
| |
} |
| |
} |
| |
} else { |
| |
const roleinfo = location.split('___'); |
| |
role = encodeURIComponent(roleinfo[0]+'./'+roleinfo[1]); |
| |
if (document.getElementById('rolehome_coauthor_'+roleinfo[1]+'_'+roleinfo[0])) { |
| |
var currhome = document.getElementById('rolehome_coauthor_'+roleinfo[1]+'_'+roleinfo[0]).value; |
| |
if ((currhome != '') && (currhome != null) && (currhome != 'undefined')) { |
| |
if (machineIds.includes(currhome)) { |
| |
athome = 1; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
var templateradio = document.courseresform.elements['newresusetemp']; |
| |
if (athome) { |
| |
if (document.getElementById('stdprobswitch')) { |
| |
document.getElementById('stdprobswitch').style.display = 'none'; |
| |
} |
| |
if (document.getElementById('newstdproblem')) { |
| |
document.getElementById('newstdproblem').style.display = 'none'; |
| |
} |
| |
var canedit = '$canedit'; |
| |
if (canedit) { |
| |
if (templateradio.length > 1) { |
| |
for (var i=0; i<templateradio.length; i++) { |
| |
templateradio[i].disabled = false; |
| |
} |
| |
} |
| |
document.courseresform.newresourcename.disabled = false; |
| |
document.courseresform.newcrs.disabled = false; |
| |
} |
| |
var http = new XMLHttpRequest(); |
| |
var url = "/adm/courseauthor"; |
| |
var params = "role="+role+"&rec="+recurse+"&nonempty="+nonemptydir+"&addtop=1"; |
| |
http.open("POST", url, true); |
| |
http.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); |
| |
http.onreadystatechange = function() { |
| |
if (http.readyState == 4 && http.status == 200) { |
| |
var data = JSON.parse(http.responseText); |
| |
if (Array.isArray(data.dirs)) { |
| |
var len = data.dirs.length; |
| |
if (len) { |
| |
if (len > 1) { |
| |
selelem.options[selelem.options.length] = new Option('$js_lt{sele}',''); |
| |
} |
| |
} |
| |
if (len) { |
| |
var j; |
| |
for (j = 0; j < len; j++) { |
| |
selelem.options[selelem.options.length] = new Option(data.dirs[j],data.dirs[j]); |
| |
} |
| |
selelem.selectedIndex = 0; |
| |
if (len == 1) { |
| |
toggleCrsResTitle(); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
http.send(params); |
| |
} else { |
| |
selelem.options[selelem.options.length] = new Option('$js_lt{swit}','switch'); |
| |
selelem.selectedIndex = 0; |
| |
if (document.getElementById('stdprobswitch')) { |
| |
document.getElementById('stdprobswitch').style.display = 'block'; |
| |
} |
| |
if (document.getElementById('newstdproblem')) { |
| |
document.getElementById('newstdproblem').style.display = 'none'; |
| |
} |
| |
if (templateradio.length > 1) { |
| |
for (var i=0; i<templateradio.length; i++) { |
| |
templateradio[i].disabled = true; |
| |
} |
| |
} |
| |
document.courseresform.newresourcename.disabled = true; |
| |
document.courseresform.newcrs.disabled = true; |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| |
function switchForProb() { |
| |
if (document.courseresform.authorpath.options[document.courseresform.authorpath.selectedIndex].value == 'switch') { |
| |
var url = '/adm/switchserver?otherserver='; |
| |
var newhostid = ''; |
| |
var role = ''; |
| |
var selloc = document.courseresform.authorrole.options[document.courseresform.authorrole.selectedIndex].value; |
| |
if (selloc == 'author') { |
| |
newhostid = document.courseresform.rolehome_author.value; |
| |
role = "au./&js_escape($env{'user.domain'})/"; |
| |
} else if (selloc == 'course') { |
| |
newhostid = document.courseresform.rolehome_course.value; |
| |
role = "&js_escape($env{'request.role'})"; |
| |
} else { |
| |
var items = new Array(); |
| |
items = selloc.split('___'); |
| |
var len = document.courseresform.rolehome_coauthor.length; |
| |
if (null == len) { |
| |
var currval = document.courseresform.rolehome_coauthor.value; |
| |
if (null != currval) { |
| |
var info = new Array(); |
| |
info = currval.split('='); |
| |
newhostid = info[2]; |
| |
role = info[0]+'./'+info[1]; |
| |
} |
| |
} else { |
| |
for (var i=0; i<len; i++) { |
| |
var currval = document.courseresform.rolehome_coauthor[i].value; |
| |
if (null != currval) { |
| |
var info = new Array(); |
| |
info = currval.split('='); |
| |
if ((info[1] == items[1]+'/'+items[0]) && (info[0] == items[2])) { |
| |
newhostid = info[2]; |
| |
role = info[0]+'./'+info[1]; |
| |
break; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if (newhostid != '') { |
| |
url += newhostid; |
| |
if (role != '') { |
| |
url += '&role='+role; |
| |
} |
| |
document.location.href = url; |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| function makeims(imsform) { |
function makeims(imsform) { |
| if ((imsform.uploaddoc.value == '') || (!imsform.uploaddoc.value)) { |
if ((imsform.uploaddoc.value == '') || (!imsform.uploaddoc.value)) { |
| alert("$js_lt{'imsfile'}"); |
alert("$js_lt{'imsfile'}"); |
|
Line 7454 for (i = 0; i < currentLis.length; i++)
|
Line 9939 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 7496 function showPage(current, pageId, nav,
|
Line 9981 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 = ''; |
| |
toggleExternal(); |
| toggleUpload(); |
toggleUpload(); |
| toggleMap(); |
toggleMap(); |
| |
toggleCrsRes(); |
| |
toggleImportCrsres(); |
| resize_scrollbox('contentscroll','1','0'); |
resize_scrollbox('contentscroll','1','0'); |
| return; |
return; |
| } else { |
} else { |
|
Line 7511 function showPage(current, pageId, nav,
|
Line 9999 function showPage(current, pageId, nav,
|
| currentData = document.getElementById(pageId); |
currentData = document.getElementById(pageId); |
| currentData.style.display = 'block'; |
currentData.style.display = 'block'; |
| activeTab = pageId; |
activeTab = pageId; |
| |
toggleExternal(); |
| toggleUpload(); |
toggleUpload(); |
| toggleMap(); |
toggleMap(); |
| |
toggleCrsRes(); |
| |
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 7876 function setBoxes(value) {
|
Line 10367 function setBoxes(value) {
|
| return; |
return; |
| } |
} |
| |
|
| |
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=encodeURIComponent(title)+'='+encodeURIComponent(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 |
ENDSCRIPT |
| } |
} |
| |
|
|
Line 7911 sub dump_switchserver_js {
|
Line 10429 sub dump_switchserver_js {
|
| ); |
); |
| my %html_js_lt = &Apache::lonlocal::texthash( |
my %html_js_lt = &Apache::lonlocal::texthash( |
| swit => 'Switch server?', |
swit => 'Switch server?', |
| duco => 'Copying Content to Authoring Space', |
duco => 'Copying uploaded 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', |
| ); |
); |
|
Line 8006 sub makesimpleeditform {
|
Line 10524 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"; |
| |
&Apache::loncommon::crsauthor_rights($rightsfile,$path,$docroot,$coursenum,$coursedom); |
| |
my $targetrights = $docroot."/res/$coursedom/$coursenum/$rightsfile"; |
| |
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); |
| |
} |
| |
} |
| |
my $source = $docroot.$redirect; |
| |
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,$context) = @_; |
| |
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"; |
| |
} |
| |
} |
| |
if ((!-e $dest) && ($context ne 'upload')) { |
| |
my $template = $env{'form.template'}; |
| |
my $copyfrom; |
| |
if ($template ne '') { |
| |
my %templates; |
| |
my @files = &Apache::lonhomework::get_template_list('problem'); |
| |
foreach my $poss (@files) { |
| |
if (ref($poss) eq 'ARRAY') { |
| |
if ($template eq $poss->[0]) { |
| |
$templates{$template} = 1; |
| |
last; |
| |
} |
| |
} |
| |
} |
| |
if ($templates{$template}) { |
| |
$copyfrom = $template; |
| |
} |
| |
} |
| |
if ($filename =~ /\.problem$/) { |
| |
unless ($copyfrom) { |
| |
$copyfrom = $Apache::lonnet::perlvar{'lonIncludes'}.'/templates/blank.problem'; |
| |
} |
| |
&File::Copy::copy($copyfrom,$dest); |
| |
} |
| |
} |
| |
return $redirect; |
| |
} |
| |
|
| |
sub cleandir { |
| |
my ($dir) = @_; |
| |
$dir =~ s/^\s+//; |
| |
$dir =~ s/\s+$//; |
| |
$dir =~ s/\.+//g; |
| |
$dir =~ s/[\#\?&%\":]//g; |
| |
return $dir; |
| |
} |
| |
|
| 1; |
1; |
| __END__ |
__END__ |
| |
|
|
Line 8105 check on this
|
Line 10829 check on this
|
| |
|
| Verify Content |
Verify Content |
| |
|
| =item devalidateversioncache() |
=item devalidateversioncache() |
| |
|
| =item checkversions() |
=item checkversions() |
| |
|
![[BACK]](/icons/back.gif){kind=icon}
Return to londocs.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / interface