--- loncom/interface/londocs.pm 2014/11/25 04:32:13 1.588 +++ loncom/interface/londocs.pm 2015/09/12 15:47:57 1.597 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.588 2014/11/25 04:32:13 raeburn Exp $ +# $Id: londocs.pm,v 1.597 2015/09/12 15:47:57 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -977,7 +977,7 @@ sub docs_change_log { sub update_paste_buffer { my ($coursenum,$coursedom,$folder) = @_; - my (@possibles,%removals,%cuts); + my (@possibles,%removals,%cuts,$output); if ($env{'form.multiremove'}) { $env{'form.multiremove'} =~ s/,$//; map { $removals{$_} = 1; } split(/,/,$env{'form.multiremove'}); @@ -1022,33 +1022,41 @@ sub update_paste_buffer { foreach my $suffix (@currpaste) { my $cid = $env{'docs.markedcopy_crs_'.$suffix}; my $url = $env{'docs.markedcopy_url_'.$suffix}; + my $mapidx = $env{'docs.markedcopy_map_'.$suffix}; if (($cid =~ /^$match_domain(?:_)$match_courseid$/) && ($url ne '')) { - $pasteurls{$cid.'_'.$url} = 1; + $pasteurls{$cid.'_'.$url.'_'.$mapidx} = 1; } } } # Mark items for copying (skip any items already in user's paste buffer) my %addtoenv; - + + my @pathitems = split(/\&/,$env{'form.folderpath'}); + my @folderconf = split(/\:/,$pathitems[-1]); + my $ispage = $folderconf[4]; + foreach my $item (@possibles) { my ($orderidx,$cmd) = split(/:/,$item); next if ($orderidx =~ /\D/); next unless (($cmd eq 'cut') || ($cmd eq 'copy') || ($cmd eq 'remove')); + my $mapidx = $folder.':'.$orderidx.':'.$ispage; my ($title,$url)=split(':',$LONCAPA::map::resources[$orderidx]); my %denied = &action_restrictions($coursenum,$coursedom, &LONCAPA::map::qtescape($url), $env{'form.folderpath'},\%curr_groups); next if ($denied{'copy'}); $url=~s{http(:|:)//https(:|:)//}{https$2//}; - next if (exists($pasteurls{$coursedom.'_'.$coursenum.'_'.$url})); + next if (exists($pasteurls{$coursedom.'_'.$coursenum.'_'.$mapidx})); my ($suffix,$errortxt,$locknotfreed) = &new_timebased_suffix($env{'user.domain'},$env{'user.name'},'paste'); - push(@newpaste,$suffix); - if ($locknotfreed) { - return $locknotfreed; - last; + if ($suffix ne '') { + push(@newpaste,$suffix); + } else { + if ($locknotfreed) { + return $locknotfreed; + } } if (&is_supplemental_title($title)) { &Apache::lonnet::appenv({'docs.markedcopy_supplemental_'.$suffix => $title}); @@ -1059,7 +1067,7 @@ sub update_paste_buffer { $addtoenv{'docs.markedcopy_url_'.$suffix} = $url, $addtoenv{'docs.markedcopy_cmd_'.$suffix} = $cmd, $addtoenv{'docs.markedcopy_crs_'.$suffix} = $env{'request.course.id'}; - + $addtoenv{'docs.markedcopy_map_'.$suffix} = $mapidx; if ($url =~ m{^/uploaded/$match_domain/$match_courseid/(default|supplemental)_?(\d*)\.(page|sequence)$}) { my $prefix = $1; my $subdir =$2; @@ -1082,13 +1090,17 @@ sub update_paste_buffer { } } } + if ($locknotfreed) { + $output = $locknotfreed; + last; + } } if (@newpaste) { $addtoenv{'docs.markedcopies'} = join(',',(@currpaste,@newpaste)); } &Apache::lonnet::appenv(\%addtoenv); delete($env{'form.markcopy'}); - return; + return $output; } sub recurse_uploaded_maps { @@ -1133,6 +1145,7 @@ sub print_paste_buffer { next if ($suffix =~ /\D/); my $cid = $env{'docs.markedcopy_crs_'.$suffix}; my $url = $env{'docs.markedcopy_url_'.$suffix}; + my $mapidx = $env{'docs.markedcopy_map_'.$suffix}; if (($cid =~ /^$match_domain\_$match_courseid$/) && ($url ne '')) { $clipboardcount ++; @@ -1158,9 +1171,7 @@ sub print_paste_buffer { if (($srcdom ne $coursedom) || ($srcnum ne $coursenum)) { $othercourse = 1; if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) { - if ($canpaste) { - $othercrs = '
'.&mt('(from another course)'); - } + $othercrs = '
'.&mt('(from another course)'); } else { $canpaste = 0; $nopaste = &mt('Paste from another course unavailable.'); @@ -1174,10 +1185,21 @@ sub print_paste_buffer { } $is_uploaded_map = 1; } + } elsif (($url =~ m{^/res/lib/templates/\w+\.problem$}) || + ($url =~ m{^/adm/($match_domain)/($match_username)/\d+/(bulletinboard|smppg)$})) { + if ($cid ne $env{'request.course.id'}) { + my ($srcdom,$srcnum) = split(/_/,$cid); + if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) { + $othercrs = '
'.&mt('(from another course)'); + } else { + $canpaste = 0; + $nopaste = &mt('Paste from another course unavailable.'); + } + } } - } - if ($canpaste) { - push(@pasteable,$suffix); + if ($canpaste) { + push(@pasteable,$suffix); + } } my $buffer; if ($is_external) { @@ -1191,10 +1213,14 @@ sub print_paste_buffer { $icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); $icon .= '/navmap.folder.closed.gif'; } + my $title = $env{'docs.markedcopy_title_'.$suffix}; + if ($title eq '') { + ($title) = ($url =~ m{/([^/]+)$}); + } $buffer = ''. ': '. &Apache::loncommon::parse_supplemental_title( - &LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix})); + &LONCAPA::map::qtescape($title)); } $pasteitems .= '
'; my ($options,$onclick); @@ -1343,29 +1369,34 @@ sub supp_pasteable { } sub paste_popup_js { - my %lt = &Apache::lonlocal::texthash( + my %html_js_lt = &Apache::lonlocal::texthash( show => 'Show Options', hide => 'Hide Options', + ); + my %js_lt = &Apache::lonlocal::texthash( none => 'No items selected from clipboard.', ); + &html_escape(\%html_js_lt); + &js_escape(\%html_js_lt); + &js_escape(\%js_lt); return <<"END"; function showPasteOptions(suffix) { document.getElementById('pasteoptions_'+suffix).style.display='block'; - document.getElementById('pasteoptionstext_'+suffix).innerHTML = '    $lt{'hide'}'; + document.getElementById('pasteoptionstext_'+suffix).innerHTML = '    $html_js_lt{'hide'}'; return; } function hidePasteOptions(suffix) { document.getElementById('pasteoptions_'+suffix).style.display='none'; - document.getElementById('pasteoptionstext_'+suffix).innerHTML ='    $lt{'show'}'; + document.getElementById('pasteoptionstext_'+suffix).innerHTML ='    $html_js_lt{'show'}'; return; } function showOptions(caller,suffix) { if (document.getElementById('pasteoptionstext_'+suffix)) { if (caller.checked) { - document.getElementById('pasteoptionstext_'+suffix).innerHTML ='    $lt{'show'}'; + document.getElementById('pasteoptionstext_'+suffix).innerHTML ='    $html_js_lt{'show'}'; } else { document.getElementById('pasteoptionstext_'+suffix).innerHTML =''; } @@ -1394,7 +1425,7 @@ function validateClipboard() { if (numchk > 0) { return true; } else { - alert("$lt{'none'}"); + alert("$js_lt{'none'}"); return false; } } @@ -1454,10 +1485,12 @@ sub do_paste_from_buffer { } my (%msgs,%before,%after,@dopaste,%is_map,%notinsupp,%notincrs,%duplicate, - %prefixchg,%srcdom,%srcnum,%marktomove,$save_err,$lockerrors,$allresult); + %prefixchg,%srcdom,%srcnum,%srcmapidx,%marktomove,$save_err,$lockerrors,$allresult); foreach my $suffix (@topaste) { my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix}); + my $cid=&LONCAPA::map::qtescape($env{'docs.markedcopy_crs_'.$suffix}); + my $mapidx=&LONCAPA::map::qtescape($env{'docs.markedcopy_map_'.$suffix}); # Supplemental content may only include certain types of content # Early out if pasted content is not supported in Supplemental area if ($folder =~ /^supplemental/) { @@ -1479,8 +1512,21 @@ sub do_paste_from_buffer { } $srcdom{$suffix} = $srcd; $srcnum{$suffix} = $srcn; + } elsif (($url =~ m{^/res/lib/templates/\w+\.problem$}) || + ($url =~ m{^/adm/$match_domain/$match_username/\d+/(bulletinboard|smppg)$})) { + my ($srcd,$srcn) = split(/_/,$cid); +# When paste buffer was populated using an active role in a different course +# check for mdc privilege in the course from which the resource was pasted + if (($srcd ne $coursedom) || ($srcn ne $coursenum)) { + unless ($env{"user.priv.cm./$srcd/$srcn"} =~ /\Q:mdc&F\E/) { + $notincrs{$suffix} = 1; + next; + } + } + $srcdom{$suffix} = $srcd; + $srcnum{$suffix} = $srcn; } - + $srcmapidx{$suffix} = $mapidx; push(@dopaste,$suffix); if ($url=~/\.(page|sequence)$/) { $is_map{$suffix} = 1; @@ -1490,7 +1536,7 @@ sub do_paste_from_buffer { my $oldprefix = $1; # When pasting content from Main Content to Supplemental Content and vice versa # 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'))) { $prefixchg{$suffix} = 'docstosupp'; } elsif (($folder =~ /^default/) && ($oldprefix =~ /^supplemental/)) { @@ -1572,12 +1618,13 @@ sub do_paste_from_buffer { # Maps need to be copied first my (%removefrommap,%removeparam,%addedmaps,%rewrites,%retitles,%copies, %dbcopies,%zombies,%params,%docmoves,%mapmoves,%mapchanges,%newsubdir, - %newurls,%tomove); + %newurls,%tomove,%resdatacopy); if (ref($marktomove{$suffix}) eq 'ARRAY') { map { $tomove{$_} = 1; } @{$marktomove{$suffix}}; } my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url_'.$suffix}); my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix}); + my $cid=&LONCAPA::map::qtescape($env{'docs.markedcopy_crs_'.$suffix}); my $oldurl = $url; if ($is_map{$suffix}) { # If pasting a map, check if map contains other maps @@ -1613,7 +1660,7 @@ sub do_paste_from_buffer { \%retitles,\%copies,\%dbcopies, \%zombies,\%params,\%mapmoves, \%mapchanges,\%tomove,\%newsubdir, - \%newurls)) { + \%newurls,\%resdatacopy)) { $mapmoves{$url} = 1; } $url = $newurl; @@ -1622,10 +1669,10 @@ sub do_paste_from_buffer { $coursenum,$srcdom{$suffix},$srcnum{$suffix}, $allmaps,\%rewrites,\%retitles,\%copies,\%dbcopies, \%zombies,\%params,\%mapmoves,\%mapchanges, - \%tomove,\%newsubdir,\%newurls); + \%tomove,\%newsubdir,\%newurls,\%resdatacopy); } } elsif ($url=~m {^/res/}) { -# published map can only exists once, so remove from paste buffer when done +# published map can only exist once, so remove from paste buffer when done push(@toclear,$suffix); # if pasting published map (main content area only) check map not already in course if ($folder =~ /^default/) { @@ -1638,13 +1685,21 @@ sub do_paste_from_buffer { } if ($url=~ m{/(bulletinboard|smppg)$}) { my $prefix = $1; + my $fromothercrs; #need to copy the db contents to a new one, unless this is a move. my %info = ( src => $url, cdom => $coursedom, cnum => $coursenum, - ); - unless ($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') { + ); + if (($srcdom{$suffix} =~ /^$match_domain$/) && ($srcnum{$suffix} =~ /^$match_courseid$/)) { + unless (($srcdom{$suffix} eq $coursedom) && ($srcnum{$suffix} eq $coursenum)) { + $fromothercrs = 1; + $info{'cdom'} = $srcdom{$suffix}; + $info{'cnum'} = $srcnum{$suffix}; + } + } + unless (($env{'form.docs.markedcopy_options_'.$suffix} eq 'move') && (!$fromothercrs)) { my (%lockerr,$msg); my ($newurl,$result,$errtext) = &dbcopy(\%info,$coursedom,$coursenum,\%lockerr); @@ -1720,6 +1775,12 @@ sub do_paste_from_buffer { } } } + } elsif ($url =~ m{^/res/lib/templates/(\w+)\.problem$}) { + my $template = $1; + if ($newidx) { + ©_templated_files($url,$srcdom{$suffix},$srcnum{$suffix},$srcmapidx{$suffix}, + $coursedom,$coursenum,$template,$newidx,"$folder.$container"); + } } $LONCAPA::map::resources[$newidx]=$title.':'.&LONCAPA::map::qtunescape($url). ':'.$ext.':normal:res'; @@ -1733,7 +1794,8 @@ sub do_paste_from_buffer { } } -# Apply any changes to maps, or copy dependencies for uploaded HTML pages +# Apply any changes to maps, or copy dependencies for uploaded HTML pages, or update +# resourcedata for simpleproblems copied from another course unless ($allresult eq 'fail') { my %updated = ( rewrites => \%rewrites, @@ -1741,6 +1803,7 @@ sub do_paste_from_buffer { removefrommap => \%removefrommap, removeparam => \%removeparam, dbcopies => \%dbcopies, + resdatacopy => \%resdatacopy, retitles => \%retitles, ); my %info = ( @@ -1905,8 +1968,8 @@ sub get_newmap_url { sub dbcopy { my ($dbref,$coursedom,$coursenum,$lockerrorsref) = @_; my ($url,$result,$errtext); - $url = $dbref->{'src'}; if (ref($dbref) eq 'HASH') { + $url = $dbref->{'src'}; if ($url =~ m{/(smppg|bulletinboard)$}) { my $prefix = $1; if (($dbref->{'cdom'} =~ /^$match_domain$/) && @@ -1944,7 +2007,7 @@ sub dbcopy { my $photo = $contents{'uploaded.photourl'}; my ($subdir,$fname) = ($photo =~ m{^/uploaded/$match_domain/$match_courseid/+(bulletin|simplepage)/(?:|\d+/)([^/]+)$}); - my $newphoto; + my $newphoto; if ($fname ne '') { my $content = &Apache::lonnet::getfile($photo); unless ($content eq '-1') { @@ -1997,6 +2060,95 @@ sub dbcopy { return ($url,$result,$errtext); } +sub copy_templated_files { + my ($srcurl,$srcdom,$srcnum,$srcmapinfo,$coursedom,$coursenum,$template,$newidx,$newmapname) = @_; + my ($srcfolder,$srcid,$srcwaspage) = split(/:/,$srcmapinfo); + my $srccontainer = 'sequence'; + if ($srcwaspage) { + $srccontainer = 'page'; + } + my $srcsymb = "uploaded/$srcdom/$srcnum/$srcfolder.$srccontainer". + '___'.$srcid.'___'.&Apache::lonnet::declutter($srcurl); + my $srcprefix = $srcdom.'_'.$srcnum.'.'.$srcsymb; + my %srcparms=&Apache::lonnet::dump('resourcedata',$srcdom,$srcnum,$srcprefix); + my $newsymb = "uploaded/$coursedom/$coursenum/$newmapname".'___'.$newidx.'___lib/templates/'. + $template.'.problem'; + my $newprefix = $coursedom.'_'.$coursenum.'.'.$newsymb; + if ($template eq 'simpleproblem') { + $srcprefix .= '.0.'; + my $weightprefix = $newprefix; + $newprefix .= '.0.'; + my @simpleprobqtypes = qw(radio option string essay numerical); + my $qtype=$srcparms{$srcprefix.'questiontype'}; + if (grep(/^\Q$qtype\E$/,@simpleprobqtypes)) { + my %newdata; + foreach my $type (@simpleprobqtypes) { + if ($type eq $qtype) { + $newdata{"$weightprefix.$type.weight"}=1; + } else { + $newdata{"$weightprefix.$type.weight"}=0; + } + } + $newdata{$newprefix.'hiddenparts'} = '!'.$qtype; + $newdata{$newprefix.'questiontext'} = $srcparms{$srcprefix.'questiontext'}; + $newdata{$newprefix.'hinttext'} = $srcparms{$srcprefix.'hinttext'}; + if ($qtype eq 'numerical') { + $newdata{$newprefix.'numericalscript'} = $srcparms{$srcprefix.'numericalscript'}; + $newdata{$newprefix.'numericalanswer'} = $srcparms{$srcprefix.'numericalanswer'}; + $newdata{$newprefix.'numericaltolerance'} = $srcparms{$srcprefix.'numericaltolerance'}; + $newdata{$newprefix.'numericalsigfigs'} = $srcparms{$srcprefix.'numericalsigfigs'}; + } elsif (($qtype eq 'option') || ($qtype eq 'radio')) { + my $maxfoils=$srcparms{$srcprefix.'maxfoils'}; + unless (defined($maxfoils)) { $maxfoils=10; } + unless ($maxfoils=~/^\d+$/) { $maxfoils=10; } + if ($maxfoils<=0) { $maxfoils=10; } + my $randomize=$srcparms{$srcprefix.'randomize'}; + unless (defined($randomize)) { $randomize='yes'; } + unless ($randomize eq 'no') { $randomize='yes'; } + $newdata{$newprefix.'maxfoils'} = $maxfoils; + $newdata{$newprefix.'randomize'} = $randomize; + if ($qtype eq 'option') { + $newdata{$newprefix.'options'} = $srcparms{$srcprefix.'options'}; + } + for (my $i=1; $i<=10; $i++) { + $newdata{$newprefix.'value'.$i} = $srcparms{$srcprefix.'value'.$i}; + $newdata{$newprefix.'position'.$i} = $srcparms{$srcprefix.'position'.$i}; + $newdata{$newprefix.'text'.$i} = $srcparms{$srcprefix.'text'.$i}; + } + + } elsif (($qtype eq 'option') || ($qtype eq 'radio')) { + my $maxfoils=$srcparms{$srcprefix.'maxfoils'}; + unless (defined($maxfoils)) { $maxfoils=10; } + unless ($maxfoils=~/^\d+$/) { $maxfoils=10; } + if ($maxfoils<=0) { $maxfoils=10; } + my $randomize=$srcparms{$srcprefix.'randomize'}; + unless (defined($randomize)) { $randomize='yes'; } + unless ($randomize eq 'no') { $randomize='yes'; } + $newdata{$newprefix.'maxfoils'} = $maxfoils; + $newdata{$newprefix.'randomize'} = $randomize; + if ($qtype eq 'option') { + $newdata{$newprefix.'options'} = $srcparms{$srcprefix.'options'}; + } + for (my $i=1; $i<=10; $i++) { + $newdata{$newprefix.'value'.$i} = $srcparms{$srcprefix.'value'.$i}; + $newdata{$newprefix.'position'.$i} = $srcparms{$srcprefix.'position'.$i}; + $newdata{$newprefix.'text'.$i} = $srcparms{$srcprefix.'text'.$i}; + } + } elsif ($qtype eq 'string') { + $newdata{$newprefix.'stringanswer'} = $srcparms{$srcprefix.'stringanswer'}; + $newdata{$newprefix.'stringtype'} = $srcparms{$srcprefix.'stringtype'}; + } + if (keys(%newdata)) { + my $putres = &Apache::lonnet::cput('resourcedata',\%newdata,$coursedom, + $coursenum); + if ($putres eq 'ok') { + &Apache::lonnet::devalidatecourseresdata($coursenum,$coursedom); + } + } + } + } +} + sub uniqueness_check { my ($newurl) = @_; my $unique = 1; @@ -2062,7 +2214,7 @@ sub contained_map_check { sub url_paste_fixups { my ($oldurl,$folder,$prefixchg,$cdom,$cnum,$fromcdom,$fromcnum,$allmaps, $rewrites,$retitles,$copies,$dbcopies,$zombies,$params,$mapmoves, - $mapchanges,$tomove,$newsubdir,$newurls) = @_; + $mapchanges,$tomove,$newsubdir,$newurls,$resdatacopy) = @_; my $checktitle; if (($prefixchg) && ($oldurl =~ m{^/uploaded/$match_domain/$match_courseid/supplemental})) { @@ -2111,7 +2263,7 @@ sub url_paste_fixups { $srcdom,$srcnum,$allmaps,$rewrites, $retitles,$copies,$dbcopies,$zombies, $params,$mapmoves,$mapchanges,$tomove, - $newsubdir,$newurls); + $newsubdir,$newurls,$resdatacopy); next; } else { ($newurl,my $error) = @@ -2135,7 +2287,7 @@ sub url_paste_fixups { $cnum,$srcdom,$srcnum,$allmaps, $rewrites,$retitles,$copies,$dbcopies, $zombies,$params,$mapmoves,$mapchanges, - $tomove,$newsubdir,$newurls)) { + $tomove,$newsubdir,$newurls,$resdatacopy)) { $mapmoves->{$ressrc} = 1; } $changed = 1; @@ -2164,6 +2316,12 @@ sub url_paste_fixups { $dbcopies->{$oldurl}{$id}{'cnum'} = $fromcnum; $changed = 1; } + } elsif ($ressrc eq '/res/lib/templates/simpleproblem.problem') { + if (($fromcdom ne $cdom) || ($fromcnum ne $cnum)) { + $resdatacopy->{$oldurl}{$id}{'src'} = $ressrc; + $resdatacopy->{$oldurl}{$id}{'cdom'} = $fromcdom; + $resdatacopy->{$oldurl}{$id}{'cnum'} = $fromcnum; + } } elsif ($ressrc =~ m{^/public/($match_domain)/($match_courseid)/(.+)$}) { next if ($skip); my $srcdom = $1; @@ -2195,7 +2353,7 @@ sub apply_fixups { $oldurl,$url,$caller) = @_; my (%rewrites,%zombies,%removefrommap,%removeparam,%dbcopies,%retitles, %params,%newsubdir,%before,%after,%copies,%docmoves,%mapmoves,@msgs, - %lockerrors,$lockmsg); + %resdatacopy,%lockerrors,$lockmsg); if (ref($updated) eq 'HASH') { if (ref($updated->{'rewrites'}) eq 'HASH') { %rewrites = %{$updated->{'rewrites'}}; @@ -2215,6 +2373,9 @@ sub apply_fixups { if (ref($updated->{'retitles'}) eq 'HASH') { %retitles = %{$updated->{'retitles'}}; } + if (ref($updated->{'resdatacopy'}) eq 'HASH') { + %resdatacopy = %{$updated->{'resdatacopy'}}; + } } if (ref($info) eq 'HASH') { if (ref($info->{'newsubdir'}) eq 'HASH') { @@ -2365,6 +2526,35 @@ sub apply_fixups { } } } + if (ref($resdatacopy{$key}) eq 'HASH') { + if ($newsubdir{$key}) { + + } + foreach my $idx (keys(%{$resdatacopy{$key}})) { + if (ref($resdatacopy{$key}{$idx}) eq 'HASH') { + my $srcurl = $resdatacopy{$key}{$idx}{'src'}; + if ($srcurl =~ m{^/res/lib/templates/(\w+)\.problem$}) { + my $template = $1; + if (($resdatacopy{$key}{$idx}{'cdom'} =~ /^$match_domain$/) && + ($resdatacopy{$key}{$idx}{'cnum'} =~ /^$match_courseid$/)) { + my $srcdom = $resdatacopy{$key}{$idx}{'cdom'}; + my $srcnum = $resdatacopy{$key}{$idx}{'cnum'}; + my ($newmapname) = ($key =~ m{/([^/]+)$}); + my ($srcfolder,$srccontainer) = split(/\./,$newmapname); + my $srcmapinfo = $srcfolder.':'.$idx; + if ($srccontainer eq 'page') { + $srcmapinfo .= ':1'; + } + if ($newsubdir{$key}) { + $newmapname =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir{$key}/; + } + ©_templated_files($srcurl,$srcdom,$srcnum,$srcmapinfo,$cdom, + $cnum,$template,$idx,$newmapname); + } + } + } + } + } if (ref($params{$key}) eq 'HASH') { %currparam = %{$params{$key}}; } @@ -2796,7 +2986,7 @@ sub editor { # Rename, cut, copy or remove a single resource if (&handle_edit_cmd()) { my $contentchg; - if ($env{'form.cmd'} =~ m{^(del|cut)_}) { + if ($env{'form.cmd'} =~ m{^(remove|cut)_}) { $contentchg = 1; } ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,$contentchg); @@ -3786,9 +3976,11 @@ sub action_restrictions { if ($url=~ m{^/res/.+\.(page|sequence)$}) { # no copy for published maps $denied{'copy'} = 1; - } elsif ($url=~m{^/res/lib/templates/}) { - $denied{'copy'} = 1; - $denied{'cut'} = 1; + } elsif ($url=~m{^/res/lib/templates/([^/]+)\.problem$}) { + unless ($1 eq 'simpleproblem') { + $denied{'copy'} = 1; + } + $denied{'cut'} = 1; } elsif ($url eq "/uploaded/$cdom/$cnum/group_allfolders.sequence") { if ($folderpath =~ /^default&[^\&]+$/) { if ((ref($currgroups) eq 'HASH') && (keys(%{$currgroups}) > 0)) { @@ -3877,9 +4069,19 @@ sub new_timebased_suffix { '
'. &mt('There was a problem removing a lockfile.').' '; if ($type eq 'paste') { - &mt('This will prevent use of the paste buffer until th next log-in.'); + if ($freedlock eq 'nolock') { + $locknotfreed = + '
'. + &mt('A lockfile was not released when you added content to the clipboard earlier in this session.').' '. + + &mt('As a result addition of items to the clipboard will be unavailable until your next log-in.'); + } else { + $locknotfreed .= + &mt('This will prevent addition of items to the clipboard until your next log-in.'); + } } elsif ($type eq 'map') { - &mt('This will prevent creation of additional folders or composite pages in this course.'); + $locknotfreed .= + &mt('This will prevent creation of additional folders or composite pages in this course.'); } elsif ($type eq 'smppg') { $locknotfreed .= &mt('This will prevent creation of additional simple pages in this course.'); @@ -4744,7 +4946,9 @@ sub handler { .'// '."\n" - .''."\n"; + .''."\n" + .''."\n"; # Breadcrumbs &Apache::lonhtmlcommon::clear_breadcrumbs(); @@ -4874,9 +5078,30 @@ sub handler { 'webctce4' => 'WebCT 4 Campus Edition', ); # ----------------------------------------------------------------------------- + + # Calculate free quota space for a user or course. A javascript function checks + # file size to determine if upload should be allowed. + my $quotatype = 'unofficial'; + if ($crstype eq 'Community') { + $quotatype = 'community'; + } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.coursecode'}) { + $quotatype = 'official'; + } elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.textbook'}) { + $quotatype = 'textbook'; + } + my $disk_quota = &Apache::loncommon::get_user_quota($coursenum,$coursedom, + 'course',$quotatype); # expressed in MB + my $current_disk_usage = 0; + foreach my $subdir ('docs','supplemental') { + $current_disk_usage += &Apache::lonnet::diskusage($coursedom,$coursenum, + "userfiles/$subdir",1); # expressed in kB + } + my $free_space = 1024 * ((1024 * $disk_quota) - $current_disk_usage); + my $fileupload=(< - + + FIUP my $checkbox=(<