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

albertel lon-capa-cvs-allow@mail.lon-capa.org
Wed, 02 May 2007 20:26:13 -0000


albertel		Wed May  2 16:26:13 2007 EDT

  Modified files:              
    /loncom/interface	lonmsg.pm lonmsgdisplay.pm 
  Log:
  - style police
  - html police
  
  
Index: loncom/interface/lonmsg.pm
diff -u loncom/interface/lonmsg.pm:1.202 loncom/interface/lonmsg.pm:1.203
--- loncom/interface/lonmsg.pm:1.202	Wed May  2 15:56:34 2007
+++ loncom/interface/lonmsg.pm	Wed May  2 16:26:08 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.202 2007/05/02 19:56:34 raeburn Exp $
+# $Id: lonmsg.pm,v 1.203 2007/05/02 20:26:08 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -717,7 +717,7 @@
 sub store_recipients {
     my ($subject,$sendername,$senderdom,$reciphash) = @_;
     my $context = &get_course_context();
-    my $now = time;
+    my $now = time();
     my $msgcount = &get_uniq();
     my $recipid =
         &buildmsgid($now,$subject,$sendername,$senderdom,$msgcount,$context,$$);
Index: loncom/interface/lonmsgdisplay.pm
diff -u loncom/interface/lonmsgdisplay.pm:1.73 loncom/interface/lonmsgdisplay.pm:1.74
--- loncom/interface/lonmsgdisplay.pm:1.73	Wed May  2 15:56:34 2007
+++ loncom/interface/lonmsgdisplay.pm	Wed May  2 16:26:08 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.73 2007/05/02 19:56:34 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.74 2007/05/02 20:26:08 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2182,12 +2182,16 @@
                      ($ccdom eq $env{'user.domain'}))) {
                     my $showcc ='<span class="LC_nobreak">';
                     if ($context eq 'replying') { 
-                        $showcc = '<label><input type="checkbox" name="replying_cc" value="'.$cc.'">';
+                        $showcc = '<label><input type="checkbox" name="replying_cc" value="'.$cc.'" />';
                     }
                     $showcc .= &Apache::loncommon::aboutmewrapper(
                                        &Apache::loncommon::plainname($ccname,
-                                         $ccdom),$ccname,$ccdom).'</label></span>';
-                    push (@ccs,$showcc);
+                                         $ccdom),$ccname,$ccdom);
+		    if ($context eq 'replying') {
+			$showcc .='</label>';
+		    }
+		    $showcc .= '</span>';
+		    push(@ccs,$showcc);
                 }
             }
         }