--- loncom/interface/lonbulletin.pm	2003/07/10 10:53:18	1.11
+++ loncom/interface/lonbulletin.pm	2004/04/30 23:13:52	1.20
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Bulletin Board Handler
 #
-# $Id: lonbulletin.pm,v 1.11 2003/07/10 10:53:18 www Exp $
+# $Id: lonbulletin.pm,v 1.20 2004/04/30 23:13:52 albertel 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,14 +66,14 @@ 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');
 
 # ------------------------------------------------------------ Get Query String
     &Apache::loncommon::get_unprocessed_cgi
-                         ($ENV{'QUERY_STRING'},['forcestudent','register']);
+                ($ENV{'QUERY_STRING'},['forcestudent','forceedit','register']);
 # ----------------------------------------------------- Force menu registration
     my $addentries='';
     if ($ENV{'form.register'}) {
@@ -83,7 +83,10 @@ ENDDOCUMENT
     }
 # --------------------------------------------------------------- Force Student
     my $forcestudent='';
-    if ($ENV{'form.forcestudent'}) { $forcestudent='student'; };
+    if ($ENV{'form.forcestudent'}) { $forcestudent='student'; }
+
+    my $forceedit='';
+    if ($ENV{'form.forceedit'}) { $forceedit='edit'; }
 
     my %syllabus=&Apache::lonnet::dump('bulletinpage_'.$marker,$dom,$crs);
        
@@ -93,21 +96,33 @@ 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'});
+
+    my $privileged=$allowed;
+    if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) {
+ 	$forcestudent='student';
+    }
 
        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"><font size="+1">Show Student View</font></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">'.&mt('Show Student View').'</font></a>'.
  &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
-      }
+      }  elsif ($privileged) {
+	  $r->print('<a href="'.$r->uri.'?forceedit=edit"><font size="+1">'
+		    .&mt('Edit').'</font></a>');
+      } 
+
       if (($ENV{'form.uploaddoc.filename'}) &&
           ($ENV{'form.storeupl'}) && ($allowed)) {
  	  if ($ENV{'form.uploaddoc.filename'}=~/\.(gif|jpg|png|jpeg)$/i) {
-             $syllabus{'uploaded.photourl'}=
-                 &Apache::lonnet::userfileupload('uploaddoc',1);
+	      if ($syllabus{'uploaded.photourl'}) {
+		  &Apache::lonnet::removeuploadedurl($syllabus{'uploaded.photourl'});
+	      }
+	      $syllabus{'uploaded.photourl'}=
+		  &Apache::lonnet::userfileupload('uploaddoc',1,'bulletin');
  	  }
           $syllabus{'uploaded.lastmodified'}=time;
           &Apache::lonnet::put('bulletinpage_'.$marker,\%syllabus,$dom,$crs);
@@ -126,16 +141,18 @@ ENDDOCUMENT
 # ---------------------------------------------------------------- Get syllabus
     if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
        if ($syllabus{'uploaded.photourl'}) {
-	   $r->print('<img src="'.
-             &Apache::lonnet::tokenwrapper($syllabus{'uploaded.photourl'}).
-             '" align="right" />');
+	   &Apache::lonnet::allowuploaded('/adm/syllabus',
+					  $syllabus{'uploaded.photourl'});
+	   $r->print('<img src="'.$syllabus{'uploaded.photourl'}.
+	       '" align="right" />');
        }
        if ($allowed) {
            $r->print(
 	 '<form method="post" enctype="multipart/form-data">'.
-         '<h3>Upload a Photo</h3>'.
+ 	 '<input type="hidden" name="forceedit" value="edit" />'.
+         '<h3>'.&mt('Upload a Photo').'</h3>'.
          '<input type="file" name="uploaddoc" size="50">'.
-         '<input type="submit" name="storeupl" value="Upload">'.
+         '<input type="submit" name="storeupl" value="'.&mt('Upload').'">'.
 	 '</form><form method="post">');
        }
        foreach (sort keys %syllabusfields) {
@@ -154,15 +171,15 @@ ENDDOCUMENT
                  if ($allowed) {
                 $r->print('<br /><textarea cols="80" rows="10" name="'.$_.'">'.
 			   $syllabus{$_}.
-           '</textarea><input type="submit" name="storesyl" value="Store" />');
+           '</textarea><input type="submit" name="storesyl" value="'.&mt('Store').'" />');
 	        }
 	    } else {
 		$r->print('<h1>'.$message.'</h1>');
                 if ($allowed) {
                  $r->print(
-                '<br />Topic<br /><textarea cols="80" rows="2" name="'.$_.'">'.
+                '<br />'.&mt('Topic').'<br /><textarea cols="80" rows="2" name="'.$_.'">'.
 			   $syllabus{$_}.
-           '</textarea><input type="submit" name="storesyl" value="Store" />');
+           '</textarea><input type="submit" name="storesyl" value="'.&mt('Store').'" />');
                 }
             }
 	  }
@@ -172,10 +189,11 @@ ENDDOCUMENT
        }
        $r->print('</p>');
     } else {
-       $r->print('<p>No page information provided.</p>');
+       $r->print('<p>'.&mt('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;
 }