--- loncom/interface/lonmsgdisplay.pm	2007/04/22 13:41:22	1.70
+++ loncom/interface/lonmsgdisplay.pm	2007/05/02 01:33:49	1.72
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.70 2007/04/22 13:41:22 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.72 2007/05/02 01:33:49 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1229,14 +1229,16 @@ will be forwarded to the recipient(s) yo
 '<p><label><input type="checkbox" name="rsspost" /> '.
 		  &mt('Include in course RSS newsfeed').'</label></p>';
     }
-    if (&Apache::lonnet::allowed('dff',$env{'request.course.id'}) ||
-        &Apache::lonnet::allowed('dff',$env{'request.course.id'}.
-                                 '/'.$env{'request.course.sec'})) {
-
-        $dispcrit.='<p><label>'.
-                   '<input type="checkbox" name="courserecord" value="1" /> '.
-                   &mt("Include in course's 'User records' for recipient(s)").
-                   '</label></p>';
+    if ($broadcast ne 'group') {
+        if (&Apache::lonnet::allowed('dff',$env{'request.course.id'}) ||
+            &Apache::lonnet::allowed('dff',$env{'request.course.id'}.
+                                     '/'.$env{'request.course.sec'})) {
+
+            $dispcrit.='<p><label>'.
+                       '<input type="checkbox" name="courserecord" value="1" /> '.
+                       &mt("Include in course's 'User records' for recipient(s)").
+                       '</label></p>';
+        }
     }
 
     my %message;
@@ -1271,7 +1273,7 @@ will be forwarded to the recipient(s) yo
 	if ($content{'baseurl'}) {
 	    $disbase='<input type="hidden" name="baseurl" value="'.&escape($content{'baseurl'}).'" />';
 	    if ($env{'user.adv'}) {
-		$disbase.='<label><input type="checkbox" name="storebasecomment" />'.&mt('Store message for re-use').
+		$disbase.='<label><input type="checkbox" name="storebasecomment" />'.&mt('Save message for re-use').
 		    '</label> <a href="/adm/email?showcommentbaseurl='.
 		    &escape($content{'baseurl'}).'" target="comments">'.
 		    &mt('Show re-usable messages').'</a><br />';
@@ -1678,8 +1680,8 @@ sub examblock {
             'cbds' => 'Communication blocking during scheduled exams',
             'desc' => "You can use communication blocking to prevent $usertype enrolled in this course from displaying LON-CAPA messages sent by other $usertype during an online exam. As blocking of communication could potentially interrupt legitimate communication between $usertype who are also both enrolled in a different LON-CAPA course, please be careful that you select the correct start and end times for your scheduled exam when setting or modifying these parameters.",
              'mecb' => 'Modify existing communication blocking periods',
-             'ncbc' => 'No communication blocks currently stored',
-             'stor' => 'Store',
+             'ncbc' => 'No communication blocks currently saved',
+             'stor' => 'Save',
     );
 
     my %ltext = &Apache::lonlocal::texthash(
@@ -2206,10 +2208,10 @@ sub storedcommentlisting {
     my ($r)=@_;
     my %msgs=&Apache::lonnet::dump('nohist_stored_comments',undef,undef,
        '^'.&escape(&escape($env{'form.showcommentbaseurl'})));
-    $r->print(&Apache::loncommon::start_page('Stored Comment Listing',undef,
+    $r->print(&Apache::loncommon::start_page('Saved Comment Listing',undef,
 					     {'onlybody' => 1}));
     if ((keys %msgs)[0]=~/^error\:/) {
-	$r->print(&mt('No stored comments yet.'));
+	$r->print(&mt('No saved comments yet.'));
     } else {
 	my $found=0;
 	foreach my $key (sort(keys(%msgs))) {
@@ -2217,7 +2219,7 @@ sub storedcommentlisting {
 	    $found=1;
 	}
 	unless ($found) {
-	    $r->print(&mt('No stored comments yet for this resource.'));
+	    $r->print(&mt('No saved comments yet for this resource.'));
 	}
     }
 }
@@ -2228,8 +2230,9 @@ sub sendoffmail {
     my ($r,$folder)=@_;
     my $suffix=&Apache::lonmsg::foldersuffix($folder);
     my $sendstatus='';
-    my %specialmsg_status;
-    my $numspecial = 0;
+    my %msg_status;
+    my $numsent = 0;
+    my $nosentstore = 1;
     my ($cdom,$cnum,$group);
     if (exists($env{'form.group'})) {
         $group = $env{'form.group'};
@@ -2286,6 +2289,7 @@ sub sendoffmail {
 	 	}
 	    }
 	} elsif ($env{'form.sendmode'} eq 'upload') {
+            $nosentstore = 0;
 	    foreach my $line (split(/[\n\r\f]+/,$env{'form.upfile'})) {
                 my ($rec,$txt) = ($line =~ /^([^:]+:[^:]+):(.*)$/);
 		if ($txt) {
@@ -2323,7 +2327,8 @@ sub sendoffmail {
         } else {
             $savemsg=&Apache::lonfeedback::clear_out_html($env{'form.message'});
         }
-	
+        my @recusers;
+        my @recudoms;
 	foreach my $address (sort(keys(%toaddr))) {
 	    my ($recuname,$recdomain)=split(/\:/,$address);
             my $msgtxt = $savemsg;
@@ -2337,7 +2342,8 @@ sub sendoffmail {
 						   $msgsubj,$msgtxt,
 						   $env{'form.sendbck'},
 						   $env{'form.permanent'},
-						   \$sentmessage{$address});
+						   \$sentmessage{$address},
+                                                   $nosentstore);
 	    } else {
 		$r->print(&mt('Sending').' '.$recuname.':'.$recdomain.': ');
 		@thismsg=
@@ -2346,101 +2352,93 @@ sub sendoffmail {
 						     $content{'citation'},
 						     undef,undef,
 						     $env{'form.permanent'},
-						     \$sentmessage{$address});
-            }
-	    if (($env{'request.course.id'}) && 
-                (($msgtype eq 'critical') || 
-                 ($env{'form.sendmode'} eq 'group') ||
-                 ($env{'form.courserecord'}))) {
-	        $specialmsg_status{$recuname.':'.$recdomain} =
-		    join(' ',@thismsg);
-		foreach my $result (@thismsg) {
-		    if ($result eq 'ok' || $result eq 'con_delayed') {
-			$numspecial++;
-		    }
-		}
+						     \$sentmessage{$address},
+                                                     undef,undef,undef,
+                                                     $nosentstore);
+            }
+	    $msg_status{$recuname.':'.$recdomain}=join(' ',@thismsg);
+	    if ($msg_status{$recuname.':'.$recdomain} =~ /(ok|con_delayed)/) {  
+	        $numsent++;
+                push(@recusers,$recuname);
+                push(@recudoms,$recdomain);
 	    }
 	    $sendstatus.=' '.join(' ',@thismsg);
 	}
-        if (($env{'request.course.id'}) && 
-            (($env{'form.sendmode'} eq 'group') ||
-             ($env{'form.courserecord'}) ||
-             ($msgtype eq 'critical'))) {
-            my $subj_prefix;
-            if ($msgtype eq 'critical') {
-                $subj_prefix = 'Critical.';
-            } elsif ($env{'form.sendmode'} eq 'group') {
-                $subj_prefix = 'Broadcast.';
-            } else {
-                $subj_prefix = 'Archive';
-            }
-            my ($specialmsgid,$specialresult);
-            my $course_str = &escape('['.$cnum.':'.$cdom.']');
+        my $subj_prefix;
+        if ($numsent > 0) {
+            if (($env{'request.course.id'}) && 
+                (($env{'form.sendmode'} eq 'group') ||
+                 ($env{'form.courserecord'}) ||
+                 ($msgtype eq 'critical'))) {
+                if ($msgtype eq 'critical') {
+                    $subj_prefix = 'Critical.';
+                } elsif ($env{'form.sendmode'} eq 'group') {
+                    $subj_prefix = 'Broadcast.';
+                } else {
+                    $subj_prefix = 'Archive';
+                }
+                my ($specialmsgid,$specialresult);
+                my $course_str = &escape('['.$cnum.':'.$cdom.']');
 
-            if ($numspecial) {
-                $specialresult = &Apache::lonmsg::user_normal_msg_raw($cnum,$cdom,$subj_prefix.
-                    ' '.$course_str,$savemsg,undef,undef,undef,
-                    undef,undef,\$specialmsgid);
+                $specialresult = 
+                    &Apache::lonmsg::user_normal_msg_raw($cnum,$cdom,
+                        $subj_prefix.' '.$course_str,$savemsg,undef,undef,
+                        undef,undef,undef,\$specialmsgid,undef,undef,undef,
+                        undef,undef,1);
                 $specialmsgid = &unescape($specialmsgid);
-            }
-            if ($specialresult eq 'ok') {
-                my $record_sent;
-                my @recusers;
-                my @recudoms;
-                my ($stamp,$crssubj,$msgname,$msgdom,$msgcount,$context,$pid) =
-		    split(/\:/,&unescape($specialmsgid));
-
-                foreach my $recipient (sort(keys(%toaddr))) {
-                    if ($specialmsg_status{$recipient} =~ /\s*(ok|con_delayed)\s*/) {
-                        my $usersubj = $subj_prefix.'['.$recipient.']';
-                        my $usermsgid = 
-			    &Apache::lonmsg::buildmsgid($stamp,$usersubj,
-							$msgname,$msgdom,
-							$msgcount,$context,
-							$pid);
-                        &Apache::lonmsg::user_normal_msg_raw($cnum,$cdom,$subj_prefix.
-                                             ' ['.$recipient.']',$msgsubj,undef,
-                        undef,undef,undef,$usermsgid,undef,undef,$specialmsgid);
-                        my ($uname,$udom) = split(/:/,$recipient);
-                        push(@recusers,$uname);
-                        push(@recudoms,$udom);
+                if ($specialresult eq 'ok') {
+                    my ($stamp,$crssubj,$msgname,$msgdom,$msgcount,$context,$pid) =
+		        split(/\:/,&unescape($specialmsgid));
+
+                    foreach my $recipient (sort(keys(%toaddr))) {
+                        if ($msg_status{$recipient} =~ /\s*(ok|con_delayed)\s*/) {
+                            my $usersubj = $subj_prefix.'['.$recipient.']';
+                            my $usermsgid = 
+			        &Apache::lonmsg::buildmsgid($stamp,$usersubj,
+							    $msgname,$msgdom,
+							    $msgcount,$context,
+							    $pid);
+                            &Apache::lonmsg::user_normal_msg_raw($cnum,$cdom,
+                                $subj_prefix.' ['.$recipient.']',$msgsubj,
+                                undef,undef,undef,undef,$usermsgid,undef,
+                                undef,$specialmsgid,undef,undef,undef,1);
+                        }
                     }
-                }
-                if (@recusers) {
-                    my $specialmessage;
-                    my $sentsubj = 
-			$subj_prefix.' ('.$numspecial.' sent) '.$msgsubj;
-                    $sentsubj = &HTML::Entities::encode($sentsubj,'<>&"');
-                    my $sentmsgid = 
-			&Apache::lonmsg::buildmsgid($stamp,$sentsubj,$msgname,
-						    $msgdom,$msgcount,$context,
-						    $pid);
-                    ($specialmsgid,$specialmessage) = &Apache::lonmsg::packagemsg($msgsubj,$savemsg,
-                            undef,undef,undef,\@recusers,\@recudoms,$sentmsgid);
-                    $record_sent = &Apache::lonmsg::store_sent_mail($specialmsgid,$specialmessage);
+                    if (($env{'form.sendmode'} ne 'upload') && (@recusers > 0)) {
+                        &Apache::lonmsg::process_sent_mail($msgsubj,
+                           $subj_prefix,$numsent,$stamp,$msgname,$msgdom,
+                           $msgcount,$context,$pid,$savemsg,\@recusers,
+                           \@recudoms);
+                    }
+                } else {
+                    &Apache::lonnet::logthis('Failed to create record of critical, broadcast or archived message in '.$env{'course.'.$env{'request.course.id'}.'.num'}.' at '.$env{'course.'.$env{'request.course.id'}.'.domain'}.' - no msgid generated');
                 }
             } else {
-                &Apache::lonnet::logthis('Failed to create record of critical message or broadcast in '.$env{'course.'.$env{'request.course.id'}.'.num'}.' at '.$env{'course.'.$env{'request.course.id'}.'.domain'}.' - no msgid generated');
+                my $stamp = time;
+                my $msgcount = &Apache::lonmsg::get_uniq();
+                my $context = &Apache::lonmsg::get_course_context();
+                &Apache::lonmsg::process_sent_mail($msgsubj,$subj_prefix,
+                       $numsent,$stamp,$env{'user.name'},
+                       $env{'user.domain'},$msgcount,$context,
+                       $$,$savemsg,\@recusers,\@recudoms);
             }
         }
-    } else {
-	&printheader($r,'','No messages sent.'); 
-    }
-    if (!$env{'form.multiforward'}) { 
-        if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
-	    $r->print('<br /><span class="LC_success">'.&mt('Completed.').
-                      '</span>');
-	    if ($env{'form.displayedcrit'}) {
-	        &discrit($r);
+        if (!$env{'form.multiforward'}) { 
+            if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
+	        $r->print('<br /><span class="LC_success">'.&mt('Completed.').
+                          '</span>');
+	        if ($env{'form.displayedcrit'}) {
+	            &discrit($r);
+                }
+                if ($group ne '') {
+                    $r->print(&groupmail_sent($group,$cdom,$cnum)); 
+	        } else {
+	            &Apache::loncommunicate::menu($r);
+	        }
+            } else {
+	        $r->print('<p><span class="LC_error">'.&mt('Could not deliver message').'</span> '.
+		          &mt('Please use the browser "Back" button and correct the recipient addresses '."($sendstatus)").'</p>');
             }
-            if ($group ne '') {
-                $r->print(&groupmail_sent($group,$cdom,$cnum)); 
-	    } else {
-	        &Apache::loncommunicate::menu($r);
-	    }
-        } else {
-	    $r->print('<p><span class="LC_error">'.&mt('Could not deliver message').'</span> '.
-		  &mt('Please use the browser "Back" button and correct the recipient addresses '."($sendstatus)").'</p>');
         }
     }
     return $sendstatus;