--- loncom/interface/lonbulletin.pm	2003/03/10 14:20:07	1.9
+++ loncom/interface/lonbulletin.pm	2003/11/24 16:00:45	1.18
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Bulletin Board Handler
 #
-# $Id: lonbulletin.pm,v 1.9 2003/03/10 14:20:07 www Exp $
+# $Id: lonbulletin.pm,v 1.18 2003/11/24 16:00:45 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -33,12 +33,12 @@ use Apache::Constants qw(:common);
 use Apache::loncommon;
 use Apache::lonnet;
 use Apache::lontexconvert;
-use Apache::lonxml;
 use Apache::lonfeedback;
+use Apache::lonlocal;
 
 sub handler {
     my $r = shift;
-    $r->content_type('text/html');
+    &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
 
@@ -66,7 +66,7 @@ ENDDOCUMENT
     my $crs = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
 
 # --------------------------------------------------------- The syllabus fields
-    my %syllabusfields=(
+    my %syllabusfields=&Apache::lonlocal::texthash(
        'aaa_title'         => 'Topic',
        'bbb_content'       => 'Task',
        'ccc_webreferences' => 'Web References');
@@ -93,14 +93,14 @@ ENDDOCUMENT
             ("Bulletin Board/Discussion",$forcestudent,$addentries,'',$dom,
              $ENV{'form.register'}));
 
-    my $allowed=&Apache::lonnet::allowed('srm',$ENV{'request.course.id'});
+    my $allowed=&Apache::lonnet::allowed('mdc',$ENV{'request.course.id'});
 
        if ($forcestudent) { $allowed=0; }
  
        if ($allowed) {
           $r->print(
 	  '<p>'.
-&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'<br /><a href="'.$r->uri.'?forcestudent=1">Show Public View</a>'.
+&Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'<br /><a href="'.$r->uri.'?forcestudent=1"><font size="+1">Show Student View</font></a>'.
  &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
       }
       if (($ENV{'form.uploaddoc.filename'}) &&
@@ -143,7 +143,7 @@ ENDDOCUMENT
               my $message=$syllabus{$_};
               $message=~s/\n/\<br \/\>/g;
               $message
-             =~s/(http\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
+        =~s/(https*\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
 	      $message=&Apache::lontexconvert::msgtexconverted($message);
             unless ($_ eq 'aaa_title') {
 		if (($_ ne 'bbb_content') || ($allowed)) {
@@ -174,8 +174,9 @@ ENDDOCUMENT
     } else {
        $r->print('<p>No page information provided.</p>');
     }
-    $r->print(&Apache::lonxml::xmlend(1,'bulletin___'.$marker.'___'.
-             'adm/wrapper'.$r->uri).'</body></html>');
+    $r->print(&Apache::lonfeedback::list_discussion
+	      ('board','OPEN','bulletin___'.$marker.'___'.
+	       $r->uri).'</body></html>');
     return OK;
 }