--- loncom/interface/londocs.pm 2021/12/31 13:38:15 1.484.2.93.2.1 +++ loncom/interface/londocs.pm 2023/01/18 22:34:42 1.484.2.93.2.4 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.484.2.93.2.1 2021/12/31 13:38:15 raeburn Exp $ +# $Id: londocs.pm,v 1.484.2.93.2.4 2023/01/18 22:34:42 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1446,7 +1446,7 @@ sub print_paste_buffer { } $pasteitems .= ''; if ($nopaste) { - $pasteitems .= $nopaste; + $pasteitems .= ' '.$nopaste.''; } else { if ($othercrs) { $pasteitems .= $othercrs; @@ -2716,6 +2716,15 @@ sub apply_fixups { $storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir{$key}/; } my $mapcontent = &Apache::lonnet::getfile($key); + if (($mapcontent eq '-1') && ($before{'map'} eq 'supplemental') && + ($after{'map'} eq 'default') && + ($key =~ m{^/uploaded/$match_domain/$match_courseid/supplemental_\d+\.sequence$})) { + $mapcontent = ''."\n". + ''."\n". + ''."\n". + ''."\n". + ''; + } if ($mapcontent eq '-1') { if (ref($errors) eq 'HASH') { $errors->{$key} = 1; @@ -3868,7 +3877,7 @@ sub entryline { my $line=&Apache::loncommon::start_data_table_row(); my ($form_start,$form_end,$form_common,$form_param); # Edit commands - my ($esc_path, $path, $symb); + my ($esc_path, $path, $symb, $shownsymb); if ($env{'form.folderpath'}) { $esc_path=&escape($env{'form.folderpath'}); $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"'); @@ -4137,7 +4146,7 @@ END } } if (&Apache::lonnet::symbverify($symb,$url)) { - my $shownsymb = $symb; + $shownsymb = $symb; if ($isexternal) { $url =~ s/\#[^#]+$//; if ($container eq 'page') { @@ -4172,7 +4181,7 @@ END } } if ($checkencrypt) { - my $shownsymb = &Apache::lonenc::encrypted($symb); + $shownsymb = &Apache::lonenc::encrypted($symb); my $shownurl = &Apache::lonenc::encrypted($url); if (&Apache::lonnet::symbverify($shownsymb,$shownurl)) { $url = $shownurl.(($shownurl=~/\?/)?'&':'?').'symb='.&escape($shownsymb); @@ -4346,7 +4355,7 @@ $form_end; &Apache::lonhtmlcommon::jump_to_editres($cfile,$home, $switchserver, $forceedit, - undef,$symb, + undef,$symb,$shownsymb, &escape($env{'form.folderpath'}), $renametitle,$hostname, '','',1,$suppanchor); @@ -5279,7 +5288,7 @@ sub handler { 'Navigate_Content','Adding_Folders','Docs_Overview', 'Load_Map','Supplemental','Score_Upload_Form', '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') { $help{$topic}=&Apache::loncommon::help_open_topic('Docs_'.$topic); }