--- loncom/interface/londocs.pm 2014/08/25 00:55:27 1.583 +++ loncom/interface/londocs.pm 2014/10/24 00:20:09 1.587 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.583 2014/08/25 00:55:27 raeburn Exp $ +# $Id: londocs.pm,v 1.587 2014/10/24 00:20:09 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2810,7 +2810,7 @@ sub editor { my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]); $name=&LONCAPA::map::qtescape($name); $url=&LONCAPA::map::qtescape($url); - next unless ($name && $url); + next unless $url; my %denied = &action_restrictions($coursenum,$coursedom,$url, $env{'form.folderpath'},\%curr_groups); @@ -3358,6 +3358,7 @@ sub entryline { $renametitle=~s/\\/\\\\/g; $renametitle=~s/\"\;/\\\"/g; + $renametitle=~s/"/%22/g; $renametitle=~s/ /%20/g; $oldtitle = $renametitle; $renametitle=~s/\'/\\\'/g; @@ -3825,6 +3826,7 @@ sub new_timebased_suffix { if ($type eq 'paste') { $prefix = $type; $namespace = 'courseeditor'; + $idtype = 'addcode'; } elsif ($type eq 'map') { $prefix = 'docs'; if ($area eq 'supplemental') { @@ -3836,9 +3838,8 @@ sub new_timebased_suffix { $prefix = $type; $namespace = 'templated'; } - $idtype = 'concat'; my ($suffix,$freedlock,$error) = - &Apache::lonnet::get_timebased_id($prefix,'num',$namespace,$dom,$num); + &Apache::lonnet::get_timebased_id($prefix,'num',$namespace,$dom,$num,$idtype); if (!$suffix) { if ($type eq 'paste') { $errtext = &mt('Failed to acquire a unique timestamp-based suffix when adding to the paste buffer.'); @@ -5467,7 +5468,6 @@ sub decompression_info { unshift(@hiddens,$pathitem); foreach my $item (@hiddens) { if ($env{'form.'.$item}) { - my $value = $env{'form.'.$item}; $hiddenelem .= ''."\n"; } @@ -5536,7 +5536,7 @@ sub remove_archive { $archiveidx = $position-1; } $env{'form.cmd'} = 'remove_'.$archiveidx; - my ($title,$url,@rrest) = + my ($title,$url,@rrest) = split(/:/,$LONCAPA::map::resources[$LONCAPA::map::order[$archiveidx]]); if ($url eq $env{'form.archiveurl'}) { if (&handle_edit_cmd($docuname,$docudom)) {