--- loncom/interface/lonnavmaps.pm 2005/11/16 21:09:33 1.348
+++ loncom/interface/lonnavmaps.pm 2005/11/22 18:58:37 1.349.2.1
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Navigate Maps Handler
#
-# $Id: lonnavmaps.pm,v 1.348 2005/11/16 21:09:33 albertel Exp $
+# $Id: lonnavmaps.pm,v 1.349.2.1 2005/11/22 18:58:37 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1065,7 +1065,6 @@ sub render_resource {
# it will be quoted with ' in the href.
my ($left,$right) = split(/\?/, $link);
- $left =~ s/'/\\'/g;
$link = $left.'?'.$right;
my $src = $resource->src();
@@ -1085,7 +1084,7 @@ sub render_resource {
# links to open and close the folder
- my $linkopen = "";
+ my $linkopen = "";
my $linkclose = "";
@@ -1118,7 +1117,7 @@ sub render_resource {
$icon = "";
- $linkopen = "{'url'} . '?' .
$params->{'queryString'} . '&filter=';
$linkopen .= ($nowOpen xor $it->{CONDITION}) ?
addToFilter($filter, $mapId) :
@@ -1128,7 +1127,7 @@ sub render_resource {
&Apache::lonnet::escape($params->{'here'}) .
'&jump=' .
&Apache::lonnet::escape($resource->symb()) .
- "&folderManip=1'>";
+ "&folderManip=1\">";
} else {
# Don't allow users to manipulate folder
@@ -1192,7 +1191,7 @@ sub render_resource {
$target=' target="loncapaclient" ';
}
if (!$params->{'resource_nolink'} && !$resource->is_sequence() && !$resource->is_empty_sequence) {
- $result .= " $curMarkerBegin$title$partLabel$curMarkerEnd $nonLinkedText";
+ $result .= " $curMarkerBegin$title$partLabel$curMarkerEnd $nonLinkedText";
} else {
$result .= " $curMarkerBegin$title$partLabel$curMarkerEnd $nonLinkedText";
}
@@ -1209,7 +1208,7 @@ sub render_communication_status {
if ($env{'environment.remotenavmap'} eq 'on') {
$target=' target="loncapaclient" ';
}
- my $linkopen = "";
+ my $linkopen = "";
my $linkclose = "";
my $location=&Apache::loncommon::lonhttpdurl("/adm/lonMisc");
if ($resource->hasDiscussion()) {
@@ -1263,7 +1262,7 @@ sub render_quick_status {
if ($env{'environment.remotenavmap'} eq 'on') {
$target=' target="loncapaclient" ';
}
- my $linkopen = "";
+ my $linkopen = "";
my $linkclose = "";
if ($resource->is_problem() &&
@@ -2231,9 +2230,9 @@ sub generate_email_discuss_status {
if ((!$emailstatus{$msgid}) || ($emailstatus{$msgid} eq 'new')) {
my $plain=
&Apache::lonnet::unescape(&Apache::lonnet::unescape($msgid));
- if ($plain=~/(Error|Feedback) \[([^\]]+)\]/) {
- my ($what,$url)=($1,$2);
- if ($what eq 'Error') {
+ if ($plain=~/ \[([^\]]+)\]\:/) {
+ my $url=$1;
+ if ($plain=~/\:Error \[/) {
$error{$url}.=','.$msgid;
} else {
$feedback{$url}.=','.$msgid;