--- loncom/interface/lonfeedback.pm	2005/11/10 11:31:04	1.173
+++ loncom/interface/lonfeedback.pm	2005/11/18 13:35:30	1.175
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.173 2005/11/10 11:31:04 www Exp $
+# $Id: lonfeedback.pm,v 1.175 2005/11/18 13:35:30 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -39,6 +39,7 @@ use Apache::lonnet;
 use Apache::lonhtmlcommon();
 use Apache::lonnavmaps;
 use Apache::lonenc();
+use Apache::lonrss();
 use HTML::LCParser();
 use Apache::lonspeller();
 use Cwd;
@@ -1196,11 +1197,7 @@ sub get_post_contents {
     if ($type eq 'allversions' || $type eq 'export') {
         $start = 0;
         if ($$contrib{$idx.':history'}) {
-            if ($$contrib{$idx.':history'} =~ m/:/) {
-                @postversions = split/:/,$$contrib{$idx.':history'};
-            } else {
-                @postversions = ("$$contrib{$idx.':history'}");
-            }
+	    @postversions = split(/:/,$$contrib{$idx.':history'});
         }
         &get_post_versions($messages,$$contrib{$idx.':message'},1);
         &get_post_versions($subjects,$$contrib{$idx.':subject'},1);
@@ -1304,7 +1301,7 @@ sub replicate_attachments {
 sub mail_screen {
   my ($r,$feedurl,$options) = @_;
   if (exists($env{'form.origpage'})) {
-      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['subject','comment','currnewattach','addnewattach','deloldattach','delnewattach','timestamp','idx','anondiscuss','discuss']);
+      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['subject','comment','currnewattach','addnewattach','deloldattach','delnewattach','timestamp','idx','anondiscuss','discuss','blog']);
   }
   my $bodytag=&Apache::loncommon::bodytag('Resource Feedback and Discussion',
                                           '','onLoad="window.focus();setposttype();"');
@@ -1488,6 +1485,11 @@ $htmlheader
              rec=1;
           } 
         }
+        if (typeof(document.mailform.elements.blog)!="undefined") {
+          if (document.mailform.elements.blog.checked) {
+             rec=1;
+          } 
+        }
 
         if (rec) {
             if (typeof(document.mailform.onsubmit)=='function') {
@@ -2144,7 +2146,7 @@ ENDFAILREDIR
 }
 
 sub redirect_back {
-  my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status,$previous,$sort,$rolefilter,$statusfilter,$sectionpick,$numpicks) = @_;
+  my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$blog,$status,$previous,$sort,$rolefilter,$statusfilter,$sectionpick,$numpicks) = @_;
   my $sorttag = '';
   my $roletag = '';
   my $statustag = '';
@@ -2226,6 +2228,7 @@ $html
 <img align="right" src="$logo" />
 $typestyle
 <b>Sent $sendsomething message(s), and $sendposts post(s).</b>
+$blog
 <font color="red">$status</font>
 <form name="reldt" action="$feedurl" target="loncapaclient">
 $prevtag
@@ -2311,6 +2314,8 @@ sub screen_header {
 		' <i>('.&mt('name only visible to course faculty').')</i></label> '.
 		'<a href="/adm/preferences?action=changescreenname">'.&mt('Change Screenname').'</a>';
         }
+        $discussoptions.='<br /><label><input type="checkbox" name="blog" /> '.
+	    &mt('Add to my course blog').'</label>';
     }
     if ($msgoptions) { $msgoptions='<h2><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/feedback.gif').'" />'.&mt('Sending Messages').'</h2>'.$msgoptions; }
     if ($discussoptions) { 
@@ -2740,6 +2745,7 @@ END
 <input type="hidden" name="numoldver" value="$env{'form.numoldver'}" />
 <input type="hidden" name="origpage" value="$env{'form.origpage'}" />
 <input type="hidden" name="anondiscuss" value="$env{'form.anondiscuss'}" />
+<input type="hidden" name="blog" value="$env{'form.blog'}" />
 <input type="hidden" name="discuss" value="$env{'form.discuss'}" />
 END
     foreach (@{$currnewattach}) {
@@ -2804,6 +2810,7 @@ this.form.submit();" />
 <input type="hidden" name="timestamp" value="$now" />
 <input type="hidden" name="subject" />
 <input type="hidden" name="comment" />
+<input type="hidden" name="blog" value = "0" />
 <input type="hidden" name="anondiscuss" value = "0" />
 <input type="hidden" name="discuss" value = "0" />
 <input type="hidden" name="numoldver" value="$numoldver" />
@@ -3009,7 +3016,7 @@ sub handler {
 			  \%readinghash,$env{'user.domain'},$env{'user.name'});
       }
       &redirect_back($r,$feedurl,&mt('Marked postings read/unread').'<br />',
-		     '0','0','',$env{'form.previous'},'','','',);
+		     '0','0','','',$env{'form.previous'},'','','',);
       return OK;
   }
   if ($env{'form.allversions'}) {
@@ -3061,14 +3068,14 @@ END
       $discinfo{$symb.'_userpick'} = join('&',@posters);
       &Apache::lonnet::put('nohist_'.$env{'request.course.id'}.'_discuss',
 			   \%discinfo,$env{'user.domain'},$env{'user.name'});
-      &redirect_back($r,$feedurl,&mt('Changed sort/filter').'<br />','0','0',
+      &redirect_back($r,$feedurl,&mt('Changed sort/filter').'<br />','0','0','',
 		     '',$env{'form.previous'},$env{'form.sortposts'},'','','',
 		     $numpicks);
       return OK;
   }
   if ($env{'form.applysort'}) {
       my ($symb,$feedurl)=&get_feedurl_and_clean_symb($env{'form.applysort'});
-      &redirect_back($r,$feedurl,&mt('Changed sort/filter').'<br />','0','0',
+      &redirect_back($r,$feedurl,&mt('Changed sort/filter').'<br />','0','0','',
 		     '',$env{'form.previous'},$env{'form.sortposts'},
 		     $env{'form.rolefilter'},$env{'form.statusfilter'},
 		     $env{'form.sectionpick'});
@@ -3172,7 +3179,7 @@ ENDREDIR
       my $previous=$env{'form.previous'};
       if ($env{'form.markondisp'}) { $previous=undef; }
       &redirect_back($r,$feedurl,&mt('Changed display status').'<br />',
-		     '0','0','',$previous);
+		     '0','0','','',$previous);
       return OK;
   } elsif (($env{'form.hide'}) || ($env{'form.unhide'})) {
 # ----------------------------------------------------------------- Hide/unhide
@@ -3212,7 +3219,7 @@ ENDREDIR
 			   $env{'course.'.$env{'request.course.id'}.'.num'});
 
       &redirect_back($r,$feedurl,&mt('Changed discussion status').'<br />',
-		     '0','0','',$env{'form.previous'});
+		     '0','0','','',$env{'form.previous'});
       return OK;
   } elsif ($env{'form.cmd'}=~/^(threadedoff|threadedon)$/) {
       my ($symb,$feedurl)=&get_feedurl_and_clean_symb($env{'form.symb'});
@@ -3224,7 +3231,7 @@ ENDREDIR
 	  &Apache::lonnet::delenv('environment\.threadeddiscussion');
       }
       &redirect_back($r,$feedurl,&mt('Changed discussion view mode').'<br />',
-		     '0','0','',$env{'form.previous'});
+		     '0','0','','',$env{'form.previous'});
       return OK;
   } elsif ($env{'form.deldisc'}) {
 # --------------------------------------------------------------- Hide for good
@@ -3238,7 +3245,7 @@ ENDREDIR
 			   $env{'course.'.$env{'request.course.id'}.'.domain'},
 			   $env{'course.'.$env{'request.course.id'}.'.num'});
       &redirect_back($r,$feedurl,&mt('Changed discussion status').'<br />',
-		     '0','0','',$env{'form.previous'});
+		     '0','0','','',$env{'form.previous'});
       return OK;
   } elsif ($env{'form.preview'}) {
 # -------------------------------------------------------- User wants a preview
@@ -3248,7 +3255,7 @@ ENDREDIR
 # -------------------------------------------------------- Work on attachments
       &Apache::loncommon::content_type($r,'text/html');
       $r->send_http_header;
-      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['subject','comment','addnewattach','delnewattach','timestamp','numoldver','idx','anondiscuss','discuss']);
+      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['subject','comment','addnewattach','delnewattach','timestamp','numoldver','idx','anondiscuss','discuss','blog']);
       my (@currnewattach,@currdelold,@keepold);
       &process_attachments(\@currnewattach,\@currdelold,\@keepold);
       if (exists($env{'form.addnewattach.filename'})) {
@@ -3416,9 +3423,21 @@ ENDREDIR
 				  $subject);
 	  $numpost++;
       }
+
+# Add to blog?
+
+      my $blog='';
+      if ($env{'form.blog'}) {
+	  my $subject = &clear_out_html($env{'form.subject'});
+	  $status.=&Apache::lonrss::addentry($env{'user.name'},
+				    $env{'user.domain'},
+				    'CourseBlog_'.$env{'request.course.id'},
+				    $subject,$message,$feedurl,'public');
+	  $blog='<br />'.&mt('Added to my course blog').'<br />';
+      }
 	  
 # Receipt screen and redirect back to where came from
-      &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$status,$env{'form.previous'});
+      &redirect_back($r,$feedurl,$typestyle,$numsent,$numpost,$blog,$status,$env{'form.previous'});
   }
   return OK;
 }