--- loncom/interface/londocs.pm 2006/12/05 02:55:52 1.264 +++ loncom/interface/londocs.pm 2007/01/05 18:45:40 1.267 @@ -1,7 +1,7 @@ # The LearningOnline Network # Documents # -# $Id: londocs.pm,v 1.264 2006/12/05 02:55:52 albertel Exp $ +# $Id: londocs.pm,v 1.267 2007/01/05 18:45:40 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -913,7 +913,7 @@ sub group_import { while (@_) { my $name = shift; my $url = shift; - if (($url =~ m#^/uploaded/$coursedom/$coursenum/(default_\d+\.)(page|sequence)$#) && ($caller eq 'londocs')) { + if (($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/(default_\d+\.)(page|sequence)$}) && ($caller eq 'londocs')) { my $errtext = ''; my $fatal = 0; my $newmapstr = ''."\n". @@ -988,7 +988,8 @@ sub breadcrumbs { {'href'=>$url.$cpinfo, 'title'=>$name, 'text'=>''. - $name.'' + $name.'', + 'no_mt'=>1, }); $plain.=$name.' > '; } @@ -1617,7 +1618,7 @@ sub process_secondary_uploads { $destination .= $newidx; my ($url,$filename); $url=&Apache::lonnet::userfileupload($formname.$num,1,$destination); - ($filename) = ($url =~ m-^/uploaded/$coursedom/$coursenum/$destination/(.+)$-); + ($filename) = ($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E/\Q$destination\E/(.+)$}); return $filename; } @@ -1703,13 +1704,19 @@ sub entryline { } } } + if ($url=~/^\/res\/lib\/templates\//) { $nocopy=1; } my $copylink=' '; + my $cutlink=' '; if ($env{'form.pagepath'}) { unless ($nocopy) { $copylink=(< $lt{'cp'} ENDCOPY + $cutlink=(< +$lt{'ct'} +ENDCUT } $line.=(< @@ -1731,8 +1738,7 @@ ENDCOPY $lt{'rm'} - -$lt{'ct'} +$cutlink $lt{'rn'} $copylink @@ -1743,6 +1749,10 @@ END $lt{'cp'} ENDCOPY + $cutlink=(< +$lt{'ct'} +ENDCUT } $line.=(< @@ -1763,8 +1773,7 @@ ENDCOPY $lt{'rm'} - -$lt{'ct'} +$cutlink $lt{'rn'} $copylink