--- loncom/interface/lonnavmaps.pm	2006/12/24 22:13:19	1.395
+++ loncom/interface/lonnavmaps.pm	2007/01/11 21:09:39	1.397
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Navigate Maps Handler
 #
-# $Id: lonnavmaps.pm,v 1.395 2006/12/24 22:13:19 raeburn Exp $
+# $Id: lonnavmaps.pm,v 1.397 2007/01/11 21:09:39 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,7 +38,6 @@ use Apache::lonnet;
 use POSIX qw (floor strftime);
 use Data::Dumper; # for debugging, not always 
 use Time::HiRes qw( gettimeofday tv_interval );
-use lib '/home/httpd/lib/perl/';
 use LONCAPA;
 
 # symbolic constants
@@ -1802,6 +1801,7 @@ See iterator documentation below.
 use strict;
 use GDBM_File;
 use Apache::lonnet;
+use LONCAPA;
 
 sub new {
     # magic invocation to create a class instance
@@ -1916,6 +1916,10 @@ sub generate_email_discuss_status {
 	if ((!$emailstatus{$msgid}) || ($emailstatus{$msgid} eq 'new')) {
             my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid,
                 $symb,$error) = &Apache::lonmsg::unpackmsgid($msgid);
+            &Apache::lonenc::check_decrypt(\$symb); 
+            if (($fromcid ne '') && ($fromcid ne $cid)) {
+                next;
+            }
             if (defined($symb)) {
                 if (defined($error) && $error == 1) {
                     $error{$symb}.=','.$msgid;
@@ -2053,7 +2057,7 @@ sub discussion_info {
 
     my $ressymb = $self->wrap_symb($symb);
     # keys used to store bulletinboard postings use 'unwrapped' symb. 
-    my $discsymb = $self->unwrap_symb($ressymb);
+    my $discsymb = &escape($self->unwrap_symb($ressymb));
     my $version = $self->{DISCUSSION_DATA}{'version:'.$discsymb};
     if (!$version) { return; }