--- loncom/interface/lonfeedback.pm	2004/09/13 12:49:42	1.125
+++ loncom/interface/lonfeedback.pm	2004/10/04 21:35:52	1.128
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.125 2004/09/13 12:49:42 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.128 2004/10/04 21:35:52 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,6 +36,7 @@ use Apache::loncommon();
 use Apache::lontexconvert();
 use Apache::lonlocal; # must not have ()
 use Apache::lonhtmlcommon();
+use Apache::lonnavmaps;
 use HTML::LCParser();
 use Apache::lonspeller();
 use Cwd;
@@ -165,13 +166,10 @@ sub list_discussion {
     }
 
 # Get discussion display default settings for user
-    my %userenv = &Apache::lonnet::get('environment',['discdisplay','discmarkread'],$ENV{'user.domain'},$ENV{'user.name'});
-    my $discdisplay=$userenv{'discdisplay'};
-    if ($discdisplay eq 'unread') {
+    if ($ENV{'environment.discdisplay'} eq 'unread') {
         $showonlyunread = 1;
     }
-    my $discmarkread=$userenv{'discmarkread'};
-    if ($discmarkread eq 'ondisp') {
+    if ($ENV{'environment.discmarkread'} eq 'ondisp') {
         $markondisp = 1;
     }
 
@@ -1054,12 +1052,14 @@ sub get_post_contents {
            return $discussion;
        } 
     }
-    $$screenname=&Apache::loncommon::screenname(
-                                        $$contrib{$idx.':sendername'},
-                                        $$contrib{$idx.':senderdomain'});
-    $$plainname=&Apache::loncommon::nickname(
-                                        $$contrib{$idx.':sendername'},
-                                        $$contrib{$idx.':senderdomain'});
+#    $$screenname=&Apache::loncommon::screenname(
+#                                        $$contrib{$idx.':sendername'},
+#                                        $$contrib{$idx.':senderdomain'});
+#    $$plainname=&Apache::loncommon::nickname(
+#                                        $$contrib{$idx.':sendername'},
+#                                        $$contrib{$idx.':senderdomain'});
+    ($$screenname,$$plainname)=($$contrib{$idx.':screenname'},
+				$$contrib{$idx.':plainname'});
     my $sender=&Apache::loncommon::aboutmewrapper(
                                  $$plainname,
                                  $$contrib{$idx.':sendername'},
@@ -2717,6 +2717,24 @@ sub construct_attachmenturl {
     }
     return $newattachmenturl; 
 }
+
+sub has_discussion {
+    my $resourcesref = shift;
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    my @allres=$navmap->retrieveResources();
+    foreach my $resource (@allres) {
+        if ($resource->hasDiscussion()) {
+            my $ressymb;
+            if ($resource->symb() =~ m-(___adm/\w+/\w+)/(\d+)/bulletinboard$-) {
+                $ressymb = 'bulletin___'.$2.$1.'/'.$2.'/bulletinboard';
+            } else {
+                $ressymb = $resource->symb();
+            }
+            push @{$resourcesref}, $ressymb;
+        }
+    }
+    return;
+} 
   
 sub handler {
   my $r = shift;
@@ -2729,7 +2747,7 @@ sub handler {
 # --------------------------- Get query string for limited number of parameters
 
   &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-         ['hide','unhide','deldisc','postdata','preview','replydisc','editdisc','threadedon','threadedoff','onlyunread','allposts','onlyunmark','previous','markread','markonread','markondisp','toggoff','toggon','modifydisp','changes','navmaps','navurl','sortfilter','sortposts','applysort','rolefilter','statusfilter','sectionpick','posterlist','userpick','attach','origpage','currnewattach','deloldattach','keepold','allversions','export']);
+         ['hide','unhide','deldisc','postdata','preview','replydisc','editdisc','threadedon','threadedoff','onlyunread','allposts','onlyunmark','previous','markread','markonread','markondisp','toggoff','toggon','modifydisp','changes','navtime','navmaps','navurl','sortfilter','sortposts','applysort','rolefilter','statusfilter','sectionpick','posterlist','userpick','attach','origpage','currnewattach','deloldattach','keepold','allversions','export']);
   if ($ENV{'form.discsymb'}) {
       my $symb = $ENV{'form.discsymb'};
       my $readkey = $symb.'_read';
@@ -2876,13 +2894,17 @@ END
       }
       &print_sortfilter_options($r,$symb,$previous,$feedurl);
       return OK;
-  } elsif ($ENV{'form.navmaps'}) {
+  } elsif ($ENV{'form.navtime'}) {
       my %discinfo = ();
       my @resources = ();
-      if ($ENV{'form.navmaps'} =~ /:/) {
-          @resources = split/:/,$ENV{'form.navmaps'};
+      if (defined($ENV{'form.navmaps'})) {
+          if ($ENV{'form.navmaps'} =~ /:/) {
+              @resources = split/:/,$ENV{'form.navmaps'};
+          } else {
+              @resources = ("$ENV{'form.navmaps'}");
+          }
       } else {
-          @resources = ("$ENV{'form.navmaps'}");
+          &has_discussion(\@resources);
       }
       my $numitems = @resources;
       my $feedurl = '/adm/navmaps';
@@ -2891,7 +2913,8 @@ END
       }
       my %lt = &Apache::lonlocal::texthash(
           'mnpa' => 'Marked "New" posts as read in a total of',
-          'robb' => 'resources/bulletin boards.'
+          'robb' => 'resources/bulletin boards.',
+          'twnp' => 'There are currently no resources or bulletin boards with unread discussion postings.'
       );       
       foreach (@resources) {
 # backward compatibility (bulletin boards used to be 'wrapped')
@@ -2902,9 +2925,14 @@ END
               }
           }
           my $lastkey = $ressymb.'_lastread';
-          $discinfo{$lastkey} = time;
+          $discinfo{$lastkey} = $ENV{'form.navtime'};
+      }
+      my $textline = "<b>$lt{'mnpa'} $numitems $lt{'robb'}</b>";
+      if ($numitems > 0) {
+          &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
+      } else {
+          $textline = "<b>$lt{'twnp'}</b>";
       }
-      &Apache::lonnet::put('nohist_'.$ENV{'request.course.id'}.'_discuss',\%discinfo,$ENV{'user.domain'},$ENV{'user.name'});
       &Apache::loncommon::content_type($r,'text/html');
       $r->send_http_header;
       $r->print (<<ENDREDIR);
@@ -2916,7 +2944,7 @@ END
 </head>
 <body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { this.document.reldt.submit(); self.close(); }'>
 <img align="right" src="/adm/lonIcons/lonlogos.gif" />
-<b>$lt{'mnpa'} $numitems $lt{'robb'}</b>
+$textline
 <form name="reldt" action="$feedurl" target="loncapaclient">
 </form>
 <br /><a href="$feedurl">Continue</a>