'.&mt('(from another course)'); - } - } else { - $canpaste = 0; - $nopaste = &mt('Paste from another course unavailable.'); - } - } - if ($rem =~ m{^(default|supplemental)_?(\d*)\.(?:page|sequence)$}) { - my $prefix = $1; - $parent = $2; - if ($folder !~ /^\Q$prefix\E/) { - $areachange = 1; - } - $is_uploaded_map = 1; + if ($canpaste) { + if ($env{'docs.markedcopy_url'} =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)$}) { + my $srcdom = $1; + my $srcnum = $2; + my $rem = $3; + 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).'); } + } else { + $canpaste = 0; + $nopaste = &mt('Paste from another course unavailable.') } } - if ($canpaste) { - push(@pasteable,$suffix); - } - my $buffer; - if ($is_external) { - $buffer = &mt('External Resource').': '. - &LONCAPA::map::qtescape($env{'docs.markedcopy_title_'.$suffix}).' ('. - &LONCAPA::map::qtescape($url).')'; - } else { - my $icon = &Apache::loncommon::icon($extension); - if ($extension eq 'sequence' && - $url =~ m{/default_\d+\.sequence$}x) { - $icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL')); - $icon .= '/navmap.folder.closed.gif'; - } - $buffer = '
';
- my ($options,$onclick);
- if (($canpaste) && (!$areachange) && (!$othercourse) &&
- ($env{'docs.markedcopy_cmd_'.$suffix} eq 'cut')) {
- if (($is_uploaded_map) ||
- ($url =~ /(bulletinboard|smppg)$/) ||
- ($url =~ m{^/uploaded/$coursedom/$coursenum/(?:docs|supplemental)/(.+)$})) {
- $options = &paste_options($suffix,$is_uploaded_map,$parent);
- $onclick= 'onclick="showOptions(this,'."'$suffix'".');" ';
- }
- }
- $pasteitems .= '';
- if ($nopaste) {
- $pasteitems .= $nopaste;
- } else {
- if ($othercrs) {
- $pasteitems .= $othercrs;
- }
- if ($options) {
- $pasteitems .= $options;
+ if ($rem =~ m{^(default|supplemental)_?(\d*)\.(?:page|sequence)$}) {
+ my $prefix = $1;
+ $parent = $2;
+ if ($folder !~ /^\Q$prefix\E/) {
+ $areachange = 1;
}
+ $is_uploaded_map = 1;
}
- $pasteitems .= '
';
}
}
- if ($pasteitems eq '') {
- &Apache::lonnet::delenv('docs.markedcopies');
- }
- my ($pasteform,$form_start,$buttons,$form_end);
- if ($pasteitems) {
- $pasteitems .= '';
- $form_start = '';
+
+ $r->print('');
}
sub recurse_print {
- my ($outputref,$dir,$deps,$display) = @_;
- $$outputref .= $display->{$dir}."\n";
+ my ($r,$dir,$deps,$display) = @_;
+ $r->print($display->{$dir}."\n");
if (ref($deps->{$dir}) eq 'ARRAY') {
foreach my $subdir (@{$deps->{$dir}}) {
- &recurse_print($outputref,$subdir,$deps,$display);
+ &recurse_print($r,$subdir,$deps,$display);
}
}
}
@@ -1328,484 +904,303 @@ sub supp_pasteable {
sub paste_popup_js {
my %lt = &Apache::lonlocal::texthash(
- show => 'Show Options',
- hide => 'Hide Options',
- none => 'No items selected from clipboard.',
+ show => 'Show Paste Options',
+ hide => 'Hide Paste Options',
);
return <<"END";
-function showPasteOptions(suffix) {
- document.getElementById('pasteoptions_'+suffix).style.display='block';
- document.getElementById('pasteoptionstext_'+suffix).innerHTML = ' $lt{'hide'}';
+function showPasteOptions() {
+ document.getElementById('pasteoptions').style.display='block';
+ document.getElementById('pasteoptions').style.textAlign='left';
+ document.getElementById('pasteoptions').style.textFace='normal';
+ document.getElementById('pasteoptionstext').innerHTML ='$lt{'hide'}'; return; } -function hidePasteOptions(suffix) { - document.getElementById('pasteoptions_'+suffix).style.display='none'; - document.getElementById('pasteoptionstext_'+suffix).innerHTML =' $lt{'show'}'; - return; -} - -function showOptions(caller,suffix) { - if (document.getElementById('pasteoptionstext_'+suffix)) { - if (caller.checked) { - document.getElementById('pasteoptionstext_'+suffix).innerHTML =' $lt{'show'}'; - } else { - document.getElementById('pasteoptionstext_'+suffix).innerHTML =''; - } - if (document.getElementById('pasteoptions_'+suffix)) { - document.getElementById('pasteoptions_'+suffix).style.display='none'; - } - } +function hidePasteOptions() { + document.getElementById('pasteoptions').style.display='none'; + document.getElementById('pasteoptionstext').innerHTML ='$lt{'show'}'; return; } -function validateClipboard() { - var numchk = 0; - if (document.pasteform.pasting.length > 1) { - for (var i=0; i
'.$error; @@ -1910,12 +1305,12 @@ 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') { $env{'form.'.$suffix.'.photourl'} = $content; - $newphoto = + $newphoto = &Apache::lonnet::finishuserfileupload($coursenum,$coursedom,$suffix.'.photourl',"$subdir/$suffix/$fname"); delete($env{'form.'.$suffix.'.photourl'}); } @@ -1932,18 +1327,16 @@ sub dbcopy { } } if (($freedlock ne 'ok') && (ref($lockerrorsref) eq 'HASH')) { - $lockerrorsref->{$prefix} = + $lockerrorsref->{$prefix} = '
'.
&mt('There was a problem removing a lockfile.');
if ($prefix eq 'smppg') {
- $lockerrorsref->{$prefix} .=
- ' '.&mt('This will prevent creation of additional simple pages in this course.');
+ $lockerrorsref->{$prefix} .=
+ &mt('This will prevent creation of additional simple pages in this course.');
} else {
- $lockerrorsref->{$prefix} .= ' '.&mt('This will prevent creation of additional discussion boards in this course.');
+ $lockerrorsref->{$prefix} .= &mt('This will prevent creation of additional bulletin boards in this course.');
}
- $lockerrorsref->{$prefix} .= ' '.&mt('Please contact the [_1]helpdesk[_2] for assistance.',
- '','').
- '
';
+ $lockerrorsref->{$prefix} .= &mt('Please contact the domain coordinator for your LON-CAPA domain.').'';
}
}
} elsif ($url =~ m{/syllabus$}) {
@@ -2060,7 +1453,7 @@ sub url_paste_fixups {
}
next if ($token->[2]->{'type'} eq 'external');
if ($token->[2]->{'type'} eq 'zombie') {
- next if ($skip);
+ next if ($skip);
$zombies->{$oldurl}{$id} = $ressrc;
$changed = 1;
} elsif ($ressrc =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)$}) {
@@ -2351,8 +1744,7 @@ sub apply_fixups {
if (defined($LONCAPA::map::resources[$idx])) {
my $changed;
my ($title,$src,$ext,$type)=split(/\:/,$LONCAPA::map::resources[$idx]);
- if ((exists($toremove{$idx})) &&
- ($toremove{$idx} eq &LONCAPA::map::qtescape($src))) {
+ if ((exists($toremove{$idx})) && ($toremove{$idx} eq $src)) {
splice(@LONCAPA::map::order,$i,1);
if (ref($currparam{$idx}) eq 'ARRAY') {
foreach my $name (@{$currparam{$idx}}) {
@@ -2391,7 +1783,7 @@ sub apply_fixups {
$changed = 1;
}
if ($changed) {
- $LONCAPA::map::resources[$idx] = join(':',($title,&LONCAPA::map::qtunescape($src),$ext,$type));
+ $LONCAPA::map::resources[$idx] = join(':',($title,$src,$ext,$type));
}
}
}
@@ -2497,109 +1889,34 @@ my %parameter_type = ( 'randompick'
my $valid_parameters_re = join('|',keys(%parameter_type));
# set parameters
sub update_parameter {
- if ($env{'form.changeparms'} eq 'all') {
- my (@allidx,@allmapidx,%allchecked,%currchecked);
- %allchecked = (
- 'hiddenresource' => {},
- 'encrypturl' => {},
- 'randompick' => {},
- 'randomorder' => {},
- );
- foreach my $which (keys(%allchecked)) {
- $env{'form.all'.$which} =~ s/,$//;
- if ($which eq 'randompick') {
- foreach my $item (split(/,/,$env{'form.all'.$which})) {
- my ($res,$value) = split(/:/,$item);
- if ($value =~ /^\d+$/) {
- $allchecked{$which}{$res} = $value;
- }
- }
- } else {
- if ($env{'form.all'.$which}) {
- map { $allchecked{$which}{$_} = 1; } split(/,/,$env{'form.all'.$which});
- }
- }
- }
- my $haschanges = 0;
- foreach my $res (@LONCAPA::map::order) {
- my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
- $name=&LONCAPA::map::qtescape($name);
- $url=&LONCAPA::map::qtescape($url);
- next unless ($name && $url);
- my $is_map;
- if ($url =~ m{/uploaded/.+\.(page|sequence)$}) {
- $is_map = 1;
- }
- foreach my $which (keys(%allchecked)) {
- if (($which eq 'randompick' || $which eq 'randomorder')) {
- next if (!$is_map);
- }
- my $oldvalue = 0;
- my $newvalue = 0;
- if ($allchecked{$which}{$res}) {
- $newvalue = $allchecked{$which}{$res};
- }
- my $current = (&LONCAPA::map::getparameter($res,'parameter_'.$which))[0];
- if ($which eq 'randompick') {
- if ($current =~ /^(\d+)$/) {
- $oldvalue = $1;
- }
- } else {
- if ($current =~ /^yes$/i) {
- $oldvalue = 1;
- }
- }
- if ($oldvalue ne $newvalue) {
- $haschanges = 1;
- if ($newvalue) {
- my $storeval = 'yes';
- if ($which eq 'randompick') {
- $storeval = $newvalue;
- }
- &LONCAPA::map::storeparameter($res,'parameter_'.$which,
- $storeval,
- $parameter_type{$which});
- &remember_parms($res,$which,'set',$storeval);
- } elsif ($oldvalue) {
- &LONCAPA::map::delparameter($res,'parameter_'.$which);
- &remember_parms($res,$which,'del');
- }
- }
- }
- }
- return $haschanges;
- } else {
- return 0 if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/);
- my $which = $env{'form.changeparms'};
- my $idx = $env{'form.setparms'};
- if ($env{'form.'.$which.'_'.$idx}) {
- my $value = ($which eq 'randompick') ? $env{'form.rpicknum_'.$idx}
- : 'yes';
- &LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $value,
- $parameter_type{$which});
- &remember_parms($idx,$which,'set',$value);
- } else {
- &LONCAPA::map::delparameter($idx,'parameter_'.$which);
+ return 0 if ($env{'form.changeparms'} !~ /^($valid_parameters_re)$/);
- &remember_parms($idx,$which,'del');
- }
- return 1;
+ my $which = $env{'form.changeparms'};
+ my $idx = $env{'form.setparms'};
+ if ($env{'form.'.$which.'_'.$idx}) {
+ my $value = ($which eq 'randompick') ? $env{'form.'.$which.'_'.$idx}
+ : 'yes';
+ &LONCAPA::map::storeparameter($idx, 'parameter_'.$which, $value,
+ $parameter_type{$which});
+ &remember_parms($idx,$which,'set',$value);
+ } else {
+ &LONCAPA::map::delparameter($idx,'parameter_'.$which);
+
+ &remember_parms($idx,$which,'del');
}
+ return 1;
}
sub handle_edit_cmd {
my ($coursenum,$coursedom) =@_;
- if ($env{'form.cmd'} eq '') {
- return 0;
- }
my ($cmd,$idx)=split('_',$env{'form.cmd'});
my $ratstr = $LONCAPA::map::resources[$LONCAPA::map::order[$idx]];
my ($title, $url, @rrest) = split(':', $ratstr);
- if ($cmd eq 'remove') {
+ if ($cmd eq 'del') {
if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) &&
($url!~/$LONCAPA::assess_page_seq_re/)) {
&Apache::lonnet::removeuploadedurl($url);
@@ -2621,6 +1938,7 @@ sub handle_edit_cmd {
@LONCAPA::map::order[$idx+1,$idx] = @LONCAPA::map::order[$idx,$idx+1];
} elsif ($cmd eq 'rename') {
+
my $comment = &LONCAPA::map::qtunescape($env{'form.title'});
if ($comment=~/\S/) {
$LONCAPA::map::resources[$LONCAPA::map::order[$idx]]=
@@ -2629,7 +1947,6 @@ sub handle_edit_cmd {
# Devalidate title cache
my $renamed_url=&LONCAPA::map::qtescape($url);
&Apache::lonnet::devalidate_title_cache($renamed_url);
-
} else {
return 0;
}
@@ -2654,7 +1971,7 @@ sub editor {
my $jumpto;
unless ($supplementalflag) {
- $jumpto = "uploaded/$coursedom/$coursenum/$folder.$container";
+ $jumpto = "'uploaded/$coursedom/$coursenum/$folder.$container'";
}
unless ($allowed) {
@@ -2698,33 +2015,27 @@ sub editor {
my ($paste_res,$save_error,$pastemsgarray,$lockerror) =
&do_paste_from_buffer($coursenum,$coursedom,$folder,$container,
\%paste_errors);
- if (ref($pastemsgarray) eq 'ARRAY') {
- if (@{$pastemsgarray} > 0) {
- $r->print(''.
- join('
',@{$pastemsgarray}).
+ if (ref($pastemsgarray) eq 'ARRAY') {
+ if (@{$pastemsgarray} > 0) {
+
+ $r->print('
'.
+ join('
',@{$pastemsgarray}).
+ '
'. + $lockerror. '
'); } - } - if ($lockerror) { - $r->print(''. - $lockerror. - '
'); - } - if ($save_error ne '') { - return $save_error; - } - if ($paste_res) { - my %errortext = &Apache::lonlocal::texthash ( - fail => 'Storage of folder contents failed', - failread => 'Reading folder contents failed', - failstore => 'Storage of folder contents failed', - ); - if ($errortext{$paste_res}) { - $r->print(''.$errortext{$paste_res}.'
'); + if ($save_error ne '') { + return $save_error; } + if ($paste_res ne 'ok') { + $r->print(''.$paste_res.'
'); } if (keys(%paste_errors) > 0) { - $r->print(''."\n". + $r->print('
'."\n". &mt('The following files are either dependencies of a web page or references within a folder and/or composite page which could not be copied during the paste operation:')."\n". '
- '."\n");
foreach my $key (sort(keys(%paste_errors))) {
@@ -2732,81 +2043,18 @@ sub editor {
}
$r->print('
'.$output.'
'); - } - } + } $r->print($upload_output); -# 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'} =~ /^(del|cut)_/) { $contentchg = 1; } ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,$contentchg); return $errtext if ($fatal); } - -# Cut, copy and/or remove multiple resources - if ($env{'form.multichange'}) { - my %allchecked = ( - cut => {}, - remove => {}, - ); - my $needsupdate; - foreach my $which (keys(%allchecked)) { - $env{'form.multi'.$which} =~ s/,$//; - if ($env{'form.multi'.$which}) { - map { $allchecked{$which}{$_} = 1; } split(/,/,$env{'form.multi'.$which}); - if (ref($allchecked{$which}) eq 'HASH') { - $needsupdate += scalar(keys(%{$allchecked{$which}})); - } - } - } - if ($needsupdate) { - my $haschanges = 0; - my %curr_groups = &Apache::longroup::coursegroups(); - my $total = scalar(@LONCAPA::map::order) - 1; - for (my $i=$total; $i>=0; $i--) { - my $res = $LONCAPA::map::order[$i]; - my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]); - $name=&LONCAPA::map::qtescape($name); - $url=&LONCAPA::map::qtescape($url); - next unless ($name && $url); - my %denied = - &action_restrictions($coursenum,$coursedom,$url, - $env{'form.folderpath'},\%curr_groups); - foreach my $which (keys(%allchecked)) { - next if ($denied{$which}); - next unless ($allchecked{$which}{$res}); - if ($which eq 'remove') { - if (($url=~m|/+uploaded/\Q$coursedom\E/\Q$coursenum\E/|) && - ($url!~/$LONCAPA::assess_page_seq_re/)) { - &Apache::lonnet::removeuploadedurl($url); - } else { - &LONCAPA::map::makezombie($res); - } - splice(@LONCAPA::map::order,$i,1); - $haschanges ++; - } elsif ($which eq 'cut') { - &LONCAPA::map::makezombie($res); - splice(@LONCAPA::map::order,$i,1); - $haschanges ++; - } - } - } - if ($haschanges) { - ($errtext,$fatal) = - &storemap($coursenum,$coursedom,$folder.'.'.$container,1); - return $errtext if ($fatal); - } - } - } - # Group import/search if ($env{'form.importdetail'}) { my @imports; @@ -2919,17 +2167,8 @@ sub editor { $r->print(''); } - my ($to_show,$output,@allidx,@allmapidx,%filters,%lists,%curr_groups); - %filters = ( - canremove => [], - cancut => [], - cancopy => [], - hiddenresource => [], - encrypturl => [], - randomorder => [], - randompick => [], - ); - %curr_groups = &Apache::longroup::coursegroups(); + my ($to_show,$output); + &Apache::loncommon::start_data_table_count(); #setup a row counter foreach my $res (@LONCAPA::map::order) { my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]); @@ -2937,24 +2176,16 @@ sub editor { $url=&LONCAPA::map::qtescape($url); unless ($name) { $name=(split(/\//,$url))[-1]; } unless ($name) { $idx++; next; } - push(@allidx,$res); - if ($url =~ m{/uploaded/.+\.(page|sequence)$}) { - push(@allmapidx,$res); - } $output .= &entryline($idx,$name,$url,$folder,$allowed,$res, $coursenum,$coursedom,$crstype, - $pathitem,$supplementalflag,$container, - \%filters,\%curr_groups); + $pathitem,$supplementalflag,$container); $idx++; $shown++; } &Apache::loncommon::end_data_table_count(); - my $need_save; if (($allowed) || ($supplementalflag && $folder eq 'supplemental')) { - my $toolslink; - if ($allowed || &Apache::lonnet::allowed('mdc',$env{'request.course.id'})) { - $toolslink = ''
+ my $toolslink = '
'; - } if ($shown) { if ($allowed) { $to_show = &Apache::loncommon::start_scrollbox('900px','880px','400px','contentscroll') .&Apache::loncommon::start_data_table(undef,'contentlist') .&Apache::loncommon::start_data_table_header_row() .' | '.&mt('Move').' | ' - .''.&mt('Actions').' | ' - .''.&mt('Document').' | '; + .''.&mt('Actions').' | ' + .''.&mt('Document').' | '; if ($folder !~ /^supplemental/) { $to_show .= ''.&mt('Settings').' | '; } - $to_show .= &Apache::loncommon::end_data_table_header_row(); - if ($folder !~ /^supplemental/) { - $lists{'canhide'} = join(',',@allidx); - $lists{'canrandomlyorder'} = join(',',@allmapidx); - my @possfilters = ('canremove','cancut','cancopy','hiddenresource','encrypturl', - 'randomorder','randompick'); - foreach my $item (@possfilters) { - if (ref($filters{$item}) eq 'ARRAY') { - if (@{$filters{$item}} > 0) { - $lists{$item} = join(',',@{$filters{$item}}); - } - } - } - if (@allidx > 0) { - my $path; - if ($env{'form.folderpath'}) { - $path = - &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); - } - if (@allidx > 1) { - $to_show .= - &Apache::loncommon::continue_data_table_row(). - ''. - ' | '. - &multiple_check_form('actions',\%lists). - ' | '. - ''. - ' | '. - ' | '. - &multiple_check_form('settings',\%lists). - ' | '. - &Apache::loncommon::end_data_table_row(); - $need_save = 1; - } - } - } - $to_show .= $output.' ' + $to_show .= &Apache::loncommon::end_data_table_header_row() + .$output.' ' .&Apache::loncommon::end_data_table() .'||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
'=>$fileuploadform}
+ {'