[LON-CAPA-cvs] cvs: loncom /interface lonmsg.pm

[raeburn]

raeburn		Wed Jun  2 16:40:08 2004 EDT

  Modified files:              
    /loncom/interface	lonmsg.pm 
  Log:
  Broadcast messages now appear in display of user notes, record of face to face discussions, critical messages, and broadcast messages for each student.  Assigned to me as item 7 in "1.2 Plans" - LON-CAPA dev list 2/10.  Partial solution to bug #2331.
  
  
Index: loncom/interface/lonmsg.pm
diff -u loncom/interface/lonmsg.pm:1.101 loncom/interface/lonmsg.pm:1.102
--- loncom/interface/lonmsg.pm:1.101	Mon May 17 15:00:45 2004
+++ loncom/interface/lonmsg.pm	Wed Jun  2 16:40:07 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.101 2004/05/17 19:00:45 raeburn Exp $
+# $Id: lonmsg.pm,v 1.102 2004/06/02 20:40:07 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -963,8 +963,10 @@
         $content{'message'}=~s/\n/\<br\>/g;
         if ($content{'subject'}=~/^Record/) {
 	    $result.='<h3>'.&mt('Record').'</h3>';
+        } elsif ($content{'subject'}=~/^Broadcast/) {
+            $result .='<h3>'.&mt('Broadcast Message').'</h3>';
         } else {
-            $result.='<h3>'.&mt('Sent Message').'</h3>';
+            $result.='<h3>'.&mt('Critical Message').'</h3>';
             %content=&unpackagemsg($content{'message'});
             $content{'message'}=
                 '<b>'.&mt('Subject').': '.$content{'subject'}.'</b><br />'.
@@ -982,9 +984,9 @@
     # Check to see if there were any messages.
     if ($result eq '') {
 	if ($target ne 'tex') { 
-	    $r->print("<p><b>".&mt("No notes, face-to-face discussion records, or critical messages in this course.")."</b></p>");
+	    $r->print("<p><b>".&mt("No notes, face-to-face discussion records, critical messages, or broadcast messages in this course.")."</b></p>");
 	} else {
-	    $r->print('\textbf{'.&mt("No notes, face-to-face discussion records, or critical messages in this course.").'}\\\\');
+	    $r->print('\textbf{'.&mt("No notes, face-to-face discussion records, critical messages or broadcast messages in this course.").'}\\\\');
 	}
     } else {
        $r->print($result);
@@ -1000,7 +1002,7 @@
     }
     &printheader($r,
 		 '/adm/email?recordftf=query',
-		 "User Notes, Face-to-Face, Critical Messages");
+		 "User Notes, Face-to-Face, Critical Messages, Broadcast Messages");
 # from query string
 
     if ($ENV{'form.recname'}) { $ENV{'form.recuname'}=$ENV{'form.recname'}; }
@@ -1015,7 +1017,7 @@
 	('stdselect','recuname','recdomain');
     my %lt=&Apache::lonlocal::texthash('user' => 'Username',
 				       'dom' => 'Domain',
-				       'head' => 'User Notes, Records of Face-To-Face Discussions, and Critical Messages in Course',
+				       'head' => 'User Notes, Records of Face-To-Face Discussions, Critical Messages, and Broadcast Messages in Course',
 				       'subm' => 'Retrieve discussion and message records',
 				       'newr' => 'New Record (record is visible to course faculty and staff)',
 				       'post' => 'Post this Record');
@@ -1667,6 +1669,13 @@
 						      &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
 						      $msgtxt,
 						      $content{'citation'});
+                    if (($ENV{'request.course.id'}) && ($ENV{'form.sendmode'} eq 'group')) {
+                        &user_normal_msg_raw(
+                        $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
+                        $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+                        'Broadcast ['.$recuname.':'.$recdomain.']',
+                        $msgtxt);
+                    }
 		}
 		$r->print($thismsg.'<br />');
 		$sendstatus.=' '.$thismsg;