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

[www]

www		Wed Feb  2 16:35:17 2005 EDT

  Modified files:              
    /loncom/interface	lonmsg.pm 
  Log:
  Saving my work on permanent email address copies - not yet tested.
  
  
Index: loncom/interface/lonmsg.pm
diff -u loncom/interface/lonmsg.pm:1.132 loncom/interface/lonmsg.pm:1.133
--- loncom/interface/lonmsg.pm:1.132	Mon Jan 31 06:27:14 2005
+++ loncom/interface/lonmsg.pm	Wed Feb  2 16:35:16 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.132 2005/01/31 11:27:14 www Exp $
+# $Id: lonmsg.pm,v 1.133 2005/02/02 21:35:16 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -414,7 +414,7 @@
 =cut
 
 sub user_crit_msg {
-    my ($user,$domain,$subject,$message,$sendback)=@_;
+    my ($user,$domain,$subject,$message,$sendback,$toperm)=@_;
     my $status='';
     my %userenv = &Apache::lonnet::get('environment',['msgforward'],
                                        $domain,$user);
@@ -424,10 +424,10 @@
 	 my ($forwuser,$forwdomain)=split(/\:/,$_);
          $status.=
 	   &user_crit_msg_raw($forwuser,$forwdomain,$subject,$message,
-                $sendback).' ';
+                $sendback,$toperm).' ';
        }
     } else { 
-	$status=&user_crit_msg_raw($user,$domain,$subject,$message,$sendback);
+	$status=&user_crit_msg_raw($user,$domain,$subject,$message,$sendback,$toperm);
     }
     return $status;
 }
@@ -1083,9 +1083,11 @@
 	 my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message");
          $dispcrit=
  '<input type="checkbox" name="critmsg" /> '.&mt('Send as critical message').' ' . $crithelp . 
- '<br>'.
+ '<br />'.
  '<input type="checkbox" name="sendbck" /> '.&mt('Send as critical message').'  ' .
- &mt('and return receipt') . $crithelp . '<p>';
+ &mt('and return receipt') . $crithelp . 
+ '<br /><input type="checkbox" name="permanent" /> '.
+&mt('Send copy to permanent email address (if known)').'<p>';
      }
     my %message;
     my %content;
@@ -1960,13 +1962,13 @@
 		$thismsg=&user_crit_msg($recuname,$recdomain,
 					&Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
 					$msgtxt,
-					$ENV{'form.sendbck'});
+					$ENV{'form.sendbck'},$ENV{'form.permanent'});
 	    } else {
 		$r->print(&mt('Sending').' '.$recuname.'@'.$recdomain.': ');
 		$thismsg=&user_normal_msg($recuname,$recdomain,
 					  &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
 					  $msgtxt,
-					  $content{'citation'});
+					  $content{'citation'},undef,undef,$ENV{'form.permanent'});
 		if (($ENV{'request.course.id'}) && ($ENV{'form.sendmode'} eq 'group')) {
 		    &user_normal_msg_raw(
 					 $ENV{'course.'.$ENV{'request.course.id'}.'.num'},