--- loncom/interface/lonmsg.pm	2005/12/10 00:46:34	1.164
+++ loncom/interface/lonmsg.pm	2006/03/15 21:55:43	1.176
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.164 2005/12/10 00:46:34 raeburn Exp $
+# $Id: lonmsg.pm,v 1.176 2006/03/15 21:55:43 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -137,7 +137,7 @@ my $interdis;
 
 sub packagemsg {
     my ($subject,$message,$citation,$baseurl,$attachmenturl,
-	$recuser,$recdomain,$msgid,$type)=@_;
+	$recuser,$recdomain,$msgid,$type,$crsmsgid)=@_;
     $message =&HTML::Entities::encode($message,'<>&"');
     $citation=&HTML::Entities::encode($citation,'<>&"');
     $subject =&HTML::Entities::encode($subject,'<>&"');
@@ -170,11 +170,19 @@ sub packagemsg {
         $msgid = &buildmsgid($now,$subject,$env{'user.name'},$env{'user.domain'},
                             $msgcount,$course_context,$$);
     }
-    my $result='<sendername>'.$env{'user.name'}.'</sendername>'.
+    my $result = '<sendername>'.$env{'user.name'}.'</sendername>'.
            '<senderdomain>'.$env{'user.domain'}.'</senderdomain>'.
            '<subject>'.$subject.'</subject>'.
-	   '<time>'.&Apache::lonlocal::locallocaltime($now).'</time>'.
-	   '<servername>'.$ENV{'SERVER_NAME'}.'</servername>'.
+           '<time>'.&Apache::lonlocal::locallocaltime($now).'</time>';
+    if (defined($crsmsgid)) {
+        $result.= '<courseid>'.$course_context.'</courseid>'.
+                  '<coursesec>'.$env{'request.course.sec'}.'</coursesec>'.
+                  '<msgid>'.$msgid.'</msgid>'.
+                  '<coursemsgid>'.$crsmsgid.'</coursemsgid>'.
+                  '<message>'.$message.'</message>';
+        return ($msgid,$result);
+    }
+    $result .= '<servername>'.$ENV{'SERVER_NAME'}.'</servername>'.
            '<host>'.$ENV{'HTTP_HOST'}.'</host>'.
 	   '<client>'.$ENV{'REMOTE_ADDR'}.'</client>'.
 	   '<browsertype>'.$env{'browser.type'}.'</browsertype>'.
@@ -241,6 +249,7 @@ sub unpackagemsg {
            }
        }
     }
+    if (!exists($content{'recuser'})) { $content{'recuser'} = []; }
     if ($content{'attachmenturl'}) {
        my ($fname)=($content{'attachmenturl'}=~m|/([^/]+)$|);
        if ($notoken) {
@@ -266,15 +275,20 @@ sub buildmsgid {
 }
 
 sub unpackmsgid {
-    my ($msgid,$folder,$skipstatus)=@_;
+    my ($msgid,$folder,$skipstatus,$status_cache)=@_;
     $msgid=&Apache::lonnet::unescape($msgid);
-    my ($sendtime,$shortsubj,$fromname,$fromdomain,$count,$fromcid)=split(/\:/,
-                          &Apache::lonnet::unescape($msgid));
+    my ($sendtime,$shortsubj,$fromname,$fromdomain,$count,$fromcid,
+                     $processid)=split(/\:/,&Apache::lonnet::unescape($msgid));
+    if (!defined($processid)) { $fromcid = ''; }
     my %status=();
     unless ($skipstatus) {
-        my $suffix=&foldersuffix($folder);
-        &Apache::lonnet::get('email_status'.$suffix,[$msgid]);
-        if ($status{$msgid}=~/^error\:/) { $status{$msgid}=''; }
+	if (ref($status_cache)) {
+	    $status{$msgid} = $status_cache->{$msgid};
+	} else {
+	    my $suffix=&foldersuffix($folder);
+	    %status=&Apache::lonnet::get('email_status'.$suffix,[$msgid]);
+	}
+	if ($status{$msgid}=~/^error\:/) { $status{$msgid}=''; }
         unless ($status{$msgid}) { $status{$msgid}='new'; }
     }
     return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid},$fromcid);
@@ -530,21 +544,24 @@ sub user_crit_received {
 
 sub user_normal_msg_raw {
     my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl,
-	$toperm,$currid,$newid,$sentmessage)=@_;
+	$toperm,$currid,$newid,$sentmessage,$crsmsgid)=@_;
 # Check if allowed missing
-    my $status='';
+    my ($status,$packed_message);
     my $msgid='undefined';
     my $text=$message;
     unless (($message)&&($user)&&($domain)) { $status='empty'; };
     my $homeserver=&Apache::lonnet::homeserver($user,$domain);
     if ($homeserver ne 'no_host') {
-       ($msgid,$message)=&packagemsg($subject,$message,$citation,$baseurl,
-                                     $attachmenturl,$user,$domain,$currid);
+       ($msgid,$packed_message)=
+	                 &packagemsg($subject,$message,$citation,$baseurl,
+                                     $attachmenturl,$user,$domain,$currid,
+                                                         undef,$crsmsgid);
+
 # Store in user folder
        $status=&Apache::lonnet::critical(
            'put:'.$domain.':'.$user.':nohist_email:'.
            &Apache::lonnet::escape($msgid).'='.
-           &Apache::lonnet::escape($message),$homeserver);
+           &Apache::lonnet::escape($packed_message),$homeserver);
 # Save new message received time
        &Apache::lonnet::put
                          ('email_status',{'recnewemail'=>time},$domain,$user);
@@ -552,8 +569,15 @@ sub user_normal_msg_raw {
        unless (($env{'request.course.id'}) && 
                (($env{'form.sendmode'} eq 'group')  || 
                (($env{'form.critmsg'}) || ($env{'form.sendbck'})) &&
-               (&Apache::lonnet::allowed('srm',$env{'request.course.id'})))) {
-           $status .= &store_sent_mail($msgid,$message);
+               (&Apache::lonnet::allowed('srm',$env{'request.course.id'})
+		|| &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
+					    '/'.$env{'request.course.sec'})))) {
+           (undef, my $packed_message_no_citation)=
+                             &packagemsg($subject,$message,undef     ,$baseurl,
+                                          $attachmenturl,$user,$domain,$currid,
+                                                              undef,$crsmsgid);
+
+           $status .= &store_sent_mail($msgid,$packed_message_no_citation);
        }
     } else {
        $status='no_host';
@@ -562,7 +586,7 @@ sub user_normal_msg_raw {
         $$newid = $msgid;
     }
     if (defined($sentmessage)) {
-        $$sentmessage = $message;
+        $$sentmessage = $packed_message;
     }
 
 # Notifications
@@ -601,26 +625,28 @@ sub user_normal_msg {
                                        $domain,$user);
     my $msgforward=$userenv{'msgforward'};
     if ($msgforward) {
-       foreach (split(/\,/,$msgforward)) {
-	 my ($forwuser,$forwdomain)=split(/\:/,$_);
-         $status.=
-	  &user_normal_msg_raw($forwuser,$forwdomain,$subject,$message,
-	$citation,$baseurl,$attachmenturl,$toperm,undef,undef,$sentmessage).' ';
-       }
+        foreach (split(/\,/,$msgforward)) {
+	    my ($forwuser,$forwdomain)=split(/\:/,$_);
+	    $status.=
+	        &user_normal_msg_raw($forwuser,$forwdomain,$subject,$message,
+				     $citation,$baseurl,$attachmenturl,$toperm,
+				     undef,undef,$sentmessage).' ';
+        }
     } else { 
 	$status=&user_normal_msg_raw($user,$domain,$subject,$message,
-	    $citation,$baseurl,$attachmenturl,$toperm,undef,undef,$sentmessage);
+				     $citation,$baseurl,$attachmenturl,$toperm,
+				     undef,undef,$sentmessage);
     }
     return $status;
 }
 
 sub store_sent_mail {
     my ($msgid,$message) = @_;
-        my $status =' '.&Apache::lonnet::critical(
-                   'put:'.$env{'user.domain'}.':'.$env{'user.name'}.
-                                              ':nohist_email_sent:'.
-                   &Apache::lonnet::escape($msgid).'='.
-                   &Apache::lonnet::escape($message),$env{'user.home'});
+    my $status =' '.&Apache::lonnet::critical(
+               'put:'.$env{'user.domain'}.':'.$env{'user.name'}.
+                                          ':nohist_email_sent:'.
+               &Apache::lonnet::escape($msgid).'='.
+               &Apache::lonnet::escape($message),$env{'user.home'});
     return $status;
 }
 
@@ -748,7 +774,7 @@ sub discourse {
 	for (i=0; i<document.forms.compemail.elements.length; i++) {
             if 
           (document.forms.compemail.elements[i].name.indexOf
-           ('send_to_&&&'+document.forms.compemail.chksec.value)==0) {
+           ('send_to_&&&'+document.forms.compemail.chksec.value+'&&&')==0) {
 	      document.forms.compemail.elements[i].checked=true;
             }
         }
@@ -856,11 +882,15 @@ sub sortedmessages {
     my @messages = &Apache::lonnet::getkeys('nohist_email'.$suffix);
     #unpack the varibles and repack into temp for sorting
     my @temp;
+    my %descriptions;
+    my %status_cache = 
+	&Apache::lonnet::get('email_status'.&foldersuffix($folder),\@messages);
     foreach (@messages) {
 	my $msgid=&Apache::lonnet::escape($_);
 	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid)=
-	    &Apache::lonmsg::unpackmsgid($msgid,$folder);
-        my $description = &get_course_desc($fromcid);
+	    &Apache::lonmsg::unpackmsgid($msgid,$folder,undef,
+					 \%status_cache);
+        my $description = &get_course_desc($fromcid,\%descriptions);
 	my @temp1 = ($sendtime,$shortsubj,$fromname,$fromdomain,$status,
 		     $msgid,$description);
         # Check whether message was sent during blocking period.
@@ -914,15 +944,24 @@ sub sortedmessages {
 }
 
 sub get_course_desc {
-    my ($fromcid) = @_;
-    my $description; 
-    if (defined($env{'course.'.$fromcid.'.description'})) {
-       $description = $env{'course.'.$fromcid.'.description'};
+    my ($fromcid,$descriptions) = @_;
+    my $description;
+    if (!$fromcid) {
+        return $description;
     } else {
-       my %courseinfo=&Apache::lonnet::coursedescription($fromcid);
-        $description = $courseinfo{'description'};
+        if (defined($$descriptions{$fromcid})) {
+            $description = $$descriptions{$fromcid};
+        } else {
+            if (defined($env{'course.'.$fromcid.'.description'})) {
+                $description = $env{'course.'.$fromcid.'.description'};
+            } else {
+                my %courseinfo=&Apache::lonnet::coursedescription($fromcid);                $description = $courseinfo{'description'};
+                $description = $courseinfo{'description'};
+            }
+            $$descriptions{$fromcid} = $description;
+        }
+        return $description;
     }
-    return $description;
 }
 
 # ======================================================== Display new messages
@@ -939,10 +978,7 @@ sub disnew {
 				       'op' => 'Open',
 				       'do' => 'Domain'
 				       );
-    my @msgids = sort split(/\&/,&Apache::lonnet::reply
-                            ('keys:'.$env{'user.domain'}.':'.
-                             $env{'user.name'}.':nohist_email',
-                             $env{'user.home'}));
+    my @msgids = sort(&Apache::lonnet::getkeys('nohist_email'));
     my @newmsgs;
     my %setters = ();
     my $startblock = 0;
@@ -951,11 +987,15 @@ sub disnew {
     my $numblocked = 0;
     # Check for blocking of display because of scheduled online exams.
     &blockcheck(\%setters,\$startblock,\$endblock);
+    my %status_cache = 
+	&Apache::lonnet::get('email_status',\@msgids);
+    my %descriptions;
     foreach (@msgids) {
+	my $msgid=&Apache::lonnet::escape($_);
         my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)=
-	    &Apache::lonmsg::unpackmsgid($_);
+	    &Apache::lonmsg::unpackmsgid($msgid,undef,undef,\%status_cache);
         if (defined($sendtime) && $sendtime!~/error/) {
-            my $description = &get_course_desc($fromcid);
+            my $description = &get_course_desc($fromcid,\%descriptions);
             my $numsendtime = $sendtime;
             $sendtime = &Apache::lonlocal::locallocaltime($sendtime);
             if ($status eq 'new') {
@@ -964,7 +1004,7 @@ sub disnew {
                     $numblocked ++;
                 } else {
                     push @newmsgs, { 
-                        msgid    => $_,
+                        msgid    => $msgid,
                         sendtime => $sendtime,
                         shortsub => &Apache::lonnet::unescape($shortsubj),
                         from     => $fromname,
@@ -1208,7 +1248,9 @@ sub compout {
 				       'ca' => 'Cancel',
 				       'ma' => 'Mail');
 
-    if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})) {
+    if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})
+	|| &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
+				    '/'.$env{'request.course.sec'})) {
 	 my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message");
          $dispcrit=
  '<p><label><input type="checkbox" name="critmsg" /> '.&mt('Send as critical message').'</label> ' . $crithelp . 
@@ -1217,8 +1259,9 @@ sub compout {
  &mt('and return receipt') . '</label>' . $crithelp . 
  '</p><p><label><input type="checkbox" name="permanent" /> '.
 &mt('Send copy to permanent email address (if known)').'</label></p>'.
-'<!-- <p><label><input type="checkbox" name="rsspost" /> '.
-		  &mt('Include in course RSS newsfeed').'</label></p>-->';      }
+'<p><label><input type="checkbox" name="rsspost" /> '.
+		  &mt('Include in course RSS newsfeed').'</label></p>';
+     }
     my %message;
     my %content;
     my $defdom=$env{'user.domain'};
@@ -1334,7 +1377,7 @@ $dispcrit
 ENDUPLOAD
     }
     if ($broadcast eq 'group') {
-       &discourse;
+       &discourse($r);
     }
     $r->print('</form>'.
 	      &Apache::lonfeedback::generate_preview_button('compemail','message').
@@ -1347,7 +1390,9 @@ sub retrieve_instructor_comments {
     my ($user,$domain)=@_;
     my $target=$env{'form.grade_target'};
     if (! $env{'request.course.id'}) { return; }
-    if (! &Apache::lonnet::allowed('srm',$env{'request.course.id'})) {
+    if (! &Apache::lonnet::allowed('srm',$env{'request.course.id'})
+	&& ! &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
+				      '/'.$env{'request.course.sec'})) {
 	return;
     }
     my %records=&Apache::lonnet::dump('nohist_email',
@@ -1372,7 +1417,10 @@ sub disfacetoface {
     my ($r,$user,$domain)=@_;
     my $target=$env{'form.grade_target'};
     unless ($env{'request.course.id'}) { return; }
-    unless (&Apache::lonnet::allowed('srm',$env{'request.course.id'})) {
+    if  (!&Apache::lonnet::allowed('srm',$env{'request.course.id'})
+	 && ! &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
+				       '/'.$env{'request.course.sec'})) {
+	$r->print('Not allowed');
 	return;
     }
     my %records=&Apache::lonnet::dump('nohist_email',
@@ -1389,17 +1437,29 @@ sub disfacetoface {
         } elsif ($content{'subject'}=~/^Broadcast/) {
             $result .='<h3>'.&mt('Broadcast Message').'</h3>';
             if ($content{'subject'}=~/^Broadcast\./) {
-                %content=&unpackagemsg($content{'message'});
-                $content{'message'}=
+                if (defined($content{'coursemsgid'})) {
+                    my $crsmsgid = &Apache::lonnet::escape($content{'coursemsgid'});
+                    my $broadcast_message = &general_message($crsmsgid);
+                    $content{'message'} = '<b>'.&mt('Subject').': '.$content{'message'}.'</b><br />'.$broadcast_message;
+                } else {
+                    %content=&unpackagemsg($content{'message'});
+                    $content{'message'} =
                     '<b>'.&mt('Subject').': '.$content{'subject'}.'</b><br />'.
                     $content{'message'};
+                }
             }    
         } else {
             $result.='<h3>'.&mt('Critical Message').'</h3>';
-            %content=&unpackagemsg($content{'message'});
-            $content{'message'}=
+            if (defined($content{'coursemsgid'})) {
+                my $crsmsgid=&Apache::lonnet::escape($content{'coursemsgid'});
+                my $critical_message = &general_message($crsmsgid);
+                $content{'message'} = '<b>'.&mt('Subject').': '.$content{'message'}.'</b><br />'.$critical_message;
+            } else {
+                %content=&unpackagemsg($content{'message'});
+                $content{'message'}=
                 '<b>'.&mt('Subject').': '.$content{'subject'}.'</b><br />'.
 		$content{'message'};
+            }
         }
         $result.=&mt('By').': <b>'.
 &Apache::loncommon::aboutmewrapper(
@@ -1422,11 +1482,26 @@ $content{'sendername'}.'@'.
     }
 }
 
+sub general_message {
+    my ($crsmsgid) = @_;
+    my %general_content;
+    if ($crsmsgid) { 
+        my %course_content = &Apache::lonnet::get('nohist_email',[$crsmsgid],
+                           $env{'course.'.$env{'request.course.id'}.'.domain'},
+                           $env{'course.'.$env{'request.course.id'}.'.num'});
+        %general_content = &unpackagemsg($course_content{$crsmsgid});
+    }
+    return $general_content{'message'};
+}
+
 # ---------------------------------------------------------------- Face to face
 
 sub facetoface {
     my ($r,$stage)=@_;
-    unless (&Apache::lonnet::allowed('srm',$env{'request.course.id'})) {
+    if (!&Apache::lonnet::allowed('srm',$env{'request.course.id'})
+	&& ! &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
+				      '/'.$env{'request.course.sec'})) {
+	$r->print('Not allowed');
 	return;
     }
     &printheader($r,
@@ -1501,7 +1576,12 @@ ENDBFORM
 sub examblock {
     my ($r,$action) = @_;
     unless ($env{'request.course.id'}) { return;}
-    unless (&Apache::lonnet::allowed('srm',$env{'request.course.id'})) { $r->print('Not allowed'); }
+    if (!&Apache::lonnet::allowed('srm',$env{'request.course.id'})
+	&& ! &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
+				      '/'.$env{'request.course.sec'})) {
+	$r->print('Not allowed');
+	return;
+    }
     my %lt=&Apache::lonlocal::texthash(
             'comb' => 'Communication Blocking',
             'cbds' => 'Communication blocking during scheduled exams',
@@ -1992,9 +2072,10 @@ sub displayresource {
 						    $content{'sendername'},
 						    $content{'senderdomain'},
 						    $content{'courseid'});
-    } else {
+    } elsif ($env{'user.adv'}) {
 	return $content{'citation'};
     }
+    return '';
 }
 
 # ================================================================== The Header
@@ -2116,8 +2197,12 @@ sub sendoffmail {
         my $savemsg;
         my $msgtype;
         my %sentmessage;
+        my $msgsubj=&Apache::lonfeedback::clear_out_html($env{'form.subject'});
         if ((($env{'form.critmsg'}) || ($env{'form.sendbck'})) &&
-            (&Apache::lonnet::allowed('srm',$env{'request.course.id'}))) {
+            (&Apache::lonnet::allowed('srm',$env{'request.course.id'})
+	     || &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
+					 '/'.$env{'request.course.sec'})
+	     )) {
             $savemsg=&Apache::lonfeedback::clear_out_html($env{'form.message'},1);
             $msgtype = 'critical';
         } else {
@@ -2130,17 +2215,16 @@ sub sendoffmail {
 	    if ($toaddr{$_}) { $msgtxt.='<hr />'.$toaddr{$_}; }
 	    my $thismsg;
 	    if ((($env{'form.critmsg'}) || ($env{'form.sendbck'})) && 
-		(&Apache::lonnet::allowed('srm',$env{'request.course.id'}))) {
+		(&Apache::lonnet::allowed('srm',$env{'request.course.id'})
+		 || &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
+					     '/'.$env{'request.course.sec'}))) {
 		$r->print(&mt('Sending critical message').' '.$recuname.'@'.$recdomain.': ');
-		$thismsg=&user_crit_msg($recuname,$recdomain,
-					&Apache::lonfeedback::clear_out_html($env{'form.subject'}),
-					$msgtxt,
-					$env{'form.sendbck'},$env{'form.permanent'},\$sentmessage{$_});
+		$thismsg=&user_crit_msg($recuname,$recdomain,$msgsubj,$msgtxt,
+				$env{'form.sendbck'},$env{'form.permanent'},
+                                                             \$sentmessage{$_});
 	    } else {
 		$r->print(&mt('Sending').' '.$recuname.'@'.$recdomain.': ');
-		$thismsg=&user_normal_msg($recuname,$recdomain,
-					  &Apache::lonfeedback::clear_out_html($env{'form.subject'}),
-					  $msgtxt,
+		$thismsg=&user_normal_msg($recuname,$recdomain,$msgsubj,$msgtxt,
 					  $content{'citation'},undef,undef,$env{'form.permanent'},\$sentmessage{$_});
             }
 	    if (($env{'request.course.id'}) && (($msgtype eq 'critical') || 
@@ -2176,7 +2260,7 @@ sub sendoffmail {
                 my $record_sent;
                 my @recusers = ();
                 my @recudoms = ();
-                my ($stamp,$msgsubj,$msgname,$msgdom,$msgcount,$context,$pid) = 
+                my ($stamp,$crssubj,$msgname,$msgdom,$msgcount,$context,$pid) = 
                             split(/\:/,&Apache::lonnet::unescape($specialmsgid));
                 foreach my $recipient (sort(keys(%toaddr))) {
                     if ($specialmsg_status{$recipient} eq 'ok') {
@@ -2184,8 +2268,8 @@ sub sendoffmail {
                         my $usermsgid = &buildmsgid($stamp,$usersubj,$msgname,
                                               $msgdom,$msgcount,$context,$pid);
                         &user_normal_msg_raw($cnum,$cdom,$subj_prefix.
-                        ' ['.$recipient.']',$sentmessage{$recipient},
-                        undef,undef,undef,undef,$usermsgid);
+                                             ' ['.$recipient.']',$msgsubj,undef,
+                        undef,undef,undef,$usermsgid,undef,undef,$specialmsgid);
                         my ($uname,$udom) = split/:/,$recipient;
                         push(@recusers,$uname);
                         push(@recudoms,$udom);
@@ -2194,14 +2278,12 @@ sub sendoffmail {
                 if (@recusers) {
                     my $specialmessage;
                     my $sentsubj = $subj_prefix.' ('.$numspecial.' sent) '.
-                    &Apache::lonfeedback::clear_out_html($env{'form.subject'});
+                                                                       $msgsubj;
                     $sentsubj = &HTML::Entities::encode($sentsubj,'<>&"');
                     my $sentmsgid = &buildmsgid($stamp,$sentsubj,$msgname,
                                               $msgdom,$msgcount,$context,$pid);
-                    ($specialmsgid,$specialmessage) =
-                         &packagemsg(&Apache::lonfeedback::clear_out_html(
-                             $env{'form.subject'}),$savemsg,undef,undef,undef,
-                                            \@recusers,\@recudoms,$sentmsgid);
+                    ($specialmsgid,$specialmessage) = &packagemsg($msgsubj,$savemsg,
+                            undef,undef,undef,\@recusers,\@recudoms,$sentmsgid);
                     $record_sent = &store_sent_mail($specialmsgid,$specialmessage);
                 }
             } else {