--- loncom/interface/lonmsg.pm	2006/12/28 18:47:15	1.194
+++ loncom/interface/lonmsg.pm	2007/02/09 15:30:48	1.196
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.194 2006/12/28 18:47:15 raeburn Exp $
+# $Id: lonmsg.pm,v 1.196 2007/02/09 15:30:48 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -274,20 +274,20 @@ sub sendnotification {
         $coursetext .= "\n\n";
     }
     my $body = $coursetext. 
-               &mt('You received a[_1] message from '.$sender.' in LON-CAPA.',$critical).' '.&mt("The subject is 
+               &mt('You received a'.$critical.' message from [_1] in LON-CAPA.',$sender).' '.&mt('The subject is 
 
- $subj
+ [_1]
 
-")."\n".
+',$subj)."\n".
 '=== '.&mt('Excerpt')." ============================================================
 $text
 ========================================================================
 
-".&mt("Use 
+".&mt('Use 
 
- $url
+ [_1]
 
-to access the full message.");
+to access the full message.',$url);
     &sendemail($to,'New'.$critical.' message from '.$sender,$body);
 }
 # ============================================================= Check for email
@@ -553,9 +553,9 @@ 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'})
-		|| &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
-					    '/'.$env{'request.course.sec'})))) {
+		(&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,$symb,$error);
@@ -563,31 +563,30 @@ sub user_normal_msg_raw {
                &store_sent_mail($msgid,$packed_message_no_citation);
            }
        }
-    } else {
-       $status='no_host';
-    }
-    if (defined($newid)) {
-        $$newid = $msgid;
-    }
-    if (defined($sentmessage)) {
-        $$sentmessage = $packed_message;
-    }
-
+       if (defined($newid)) {
+	   $$newid = $msgid;
+       }
+       if (defined($sentmessage)) {
+	   $$sentmessage = $packed_message;
+       }
 # Notifications
-    my %userenv = &Apache::lonnet::get('environment',['notification',
-                                                      'permanentemail'],
-                                       $domain,$user);
-    if ($userenv{'notification'}) {
-	&sendnotification($userenv{'notification'},$user,$domain,$subject,0,
-			  $text,$msgid);
-    }
-    if ($toperm && $userenv{'permanentemail'}) {
-	&sendnotification($userenv{'permanentemail'},$user,$domain,$subject,0,
-			  $text,$msgid);
-    }
-    &Apache::lonnet::log($env{'user.domain'},$env{'user.name'},
-                         $env{'user.home'},
-      'Sending '.$msgid.' to '.$user.' at '.$domain.' with status: '.$status);
+       my %userenv = &Apache::lonnet::get('environment',['notification',
+							 'permanentemail'],
+					  $domain,$user);
+       if ($userenv{'notification'}) {
+	   &sendnotification($userenv{'notification'},$user,$domain,$subject,0,
+			     $text,$msgid);
+       }
+       if ($toperm && $userenv{'permanentemail'}) {
+	   &sendnotification($userenv{'permanentemail'},$user,$domain,$subject,0,
+			     $text,$msgid);
+       }
+       &Apache::lonnet::log($env{'user.domain'},$env{'user.name'},
+			    $env{'user.home'},
+			    'Sending '.$msgid.' to '.$user.' at '.$domain.' with status: '.$status);
+   } else {
+       $status='no_host';
+   }
     return $status;
 }