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

banghart lon-capa-cvs@mail.lon-capa.org
Tue, 10 Jan 2006 02:11:18 -0000


banghart		Mon Jan  9 21:11:18 2006 EDT

  Modified files:              
    /loncom/interface	lonmsg.pm 
  Log:
  	Style stuff.
  
  
Index: loncom/interface/lonmsg.pm
diff -u loncom/interface/lonmsg.pm:1.170 loncom/interface/lonmsg.pm:1.171
--- loncom/interface/lonmsg.pm:1.170	Mon Jan  9 15:07:27 2006
+++ loncom/interface/lonmsg.pm	Mon Jan  9 21:11:17 2006
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.170 2006/01/09 20:07:27 albertel Exp $
+# $Id: lonmsg.pm,v 1.171 2006/01/10 02:11:17 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -296,8 +296,8 @@
     $msg->to($to);
     $msg->subject('[LON-CAPA] '.$subject);
     if (my $fh = $msg->open()) {
-	print $fh $body;
-	$fh->close;
+	    print $fh $body;
+	    $fh->close;
     }
 }
 
@@ -307,7 +307,7 @@
     my ($to,$touname,$toudom,$subj,$crit,$text)=@_;
     my $sender=$env{'environment.firstname'}.' '.$env{'environment.lastname'};
     unless ($sender=~/\w/) { 
-	$sender=$env{'user.name'}.'@'.$env{'user.domain'};
+	    $sender=$env{'user.name'}.'@'.$env{'user.domain'};
     }
     my $critical=($crit?' critical':'');
     $text=~s/\&lt\;/\</gs;
@@ -609,26 +609,26 @@
                                        $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);
+	    $status=&user_normal_msg_raw($user,$domain,$subject,$message,
+	            $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;
 }