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

www lon-capa-cvs@mail.lon-capa.org
Tue, 09 Nov 2004 16:29:32 -0000


This is a MIME encoded message

--www1100017772
Content-Type: text/plain

www		Tue Nov  9 11:29:32 2004 EDT

  Modified files:              
    /loncom/interface	loncommunicate.pm lonmsg.pm 
  Log:
  Trying to clean up and consolidate before attacking folders again.
  
  
--www1100017772
Content-Type: text/plain
Content-Disposition: attachment; filename="www-20041109112932.txt"

Index: loncom/interface/loncommunicate.pm
diff -u loncom/interface/loncommunicate.pm:1.23 loncom/interface/loncommunicate.pm:1.24
--- loncom/interface/loncommunicate.pm:1.23	Fri Sep 10 02:38:24 2004
+++ loncom/interface/loncommunicate.pm	Tue Nov  9 11:29:32 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Communicate
 #
-# $Id: loncommunicate.pm,v 1.23 2004/09/10 06:38:24 www Exp $
+# $Id: loncommunicate.pm,v 1.24 2004/11/09 16:29:32 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,12 +45,7 @@
 'dmu' => 'Distribute Messages from Uploaded File to Course',
 'unr' => 
      'User Notes, Records of Face-to-Face Discussions, and Critical Messages',
-'nm' => 'New Messages',
-'su' => 'Subject',
-'da' => 'Date',
-'us' => 'Username',
-'op' => 'Open',
-'do' => 'Domain',
+
 'cbs' => 'Configure blocking of student communication during exams' 
 
 );
@@ -90,74 +85,6 @@
 END
     }
     $r->print('</table>');
-    my @msgids = sort split(/\&/,&Apache::lonnet::reply
-                            ('keys:'.$ENV{'user.domain'}.':'.
-                             $ENV{'user.name'}.':nohist_email',
-                             $ENV{'user.home'}));
-    my @newmsgs;
-    my %setters = ();
-    my $startblock = 0;
-    my $endblock = 0;
-    my %blocked = ();
-    my $numblocked = 0;
-    # Check for blocking of display because of scheduled online exams.
-    &Apache::lonmsg::blockcheck(\%setters,\$startblock,\$endblock);
-    foreach (@msgids) {
-        my ($sendtime,$shortsubj,$fromname,$fromdom,$status)=
-	    &Apache::lonmsg::unpackmsgid($_);
-        if (defined($sendtime) && $sendtime!~/error/) {
-            my $numsendtime = $sendtime;
-            $sendtime = &Apache::lonlocal::locallocaltime($sendtime);
-            if ($status eq 'new') {
-                if ($numsendtime >= $startblock && ($numsendtime <= $endblock && $endblock > 0) ) {
-                    $blocked{$_} = 'ON';
-                    $numblocked ++;
-                } else {
-                    push @newmsgs, { 
-                        msgid    => $_,
-                        sendtime => $sendtime,
-                        shortsub => &Apache::lonnet::unescape($shortsubj),
-                        from     => $fromname,
-                        fromdom  => $fromdom 
-                        }
-                }
-            }
-        }
-    }
-    if ($#newmsgs >= 0) {
-        $r->print(<<TABLEHEAD);
-<h2>$lt{'nm'}</h2>
-<table border=2><tr><th>&nbsp</th>
-<th>$lt{'da'}</th><th>$lt{'us'}</th><th>$lt{'do'}</th><th>$lt{'su'}</th></tr>
-TABLEHEAD
-        foreach my $msg (@newmsgs) {
-            $r->print(<<"ENDLINK");
-<tr bgcolor="#FFBB77">
-<td><a href="/adm/email?display=$msg->{'msgid'}">$lt{'op'}</a></td>
-ENDLINK
-            foreach ('sendtime','from','fromdom','shortsub') {
-                $r->print("<td>$msg->{$_}</td>");
-            }
-            $r->print("</td></tr>");
-        }
-        $r->print('</table></body></html>');
-    } elsif ($numblocked == 0) {
-        $r->print("<h3>".&mt('You have no unread messages')."</h3>");
-    }
-    if ($numblocked > 0) {
-        my $beginblock = &Apache::lonlocal::locallocaltime($startblock);
-        my $finishblock = &Apache::lonlocal::locallocaltime($endblock);
-        if ($numblocked == 1) {
-            $r->print("<h3>".&mt('You have').' '.$numblocked.' '.&mt('blocked unread message').".</h3>");
-            $r->print(&mt('This message is not viewable because').' ');
-        } else {
-            $r->print("<h3>".&mt('You have').' '.$numblocked.' '.&mt('blocked unread messages').".</h3>");
-            $r->print(&mt('These').' '.$numblocked.' '.&mt('messages are not viewable because '));
-        }
-        $r->print(
-&mt('display of LON-CAPA messages sent to you by other students between').' '.$beginblock.' '.&mt('and').' '.$finishblock.' '.&mt('is currently being blocked because of online exams').'.');
-        &Apache::lonmsg::build_block_table($r,$startblock,$endblock,\%setters);
-    }
 }
 
 sub handler {
@@ -185,6 +112,7 @@
 # ---------------------------------------------------------------------- Header
     &Apache::lonmsg::header($r);
     &menu($r);
+    &Apache::lonmsg::disnew($r);
     return OK;
 }
 
Index: loncom/interface/lonmsg.pm
diff -u loncom/interface/lonmsg.pm:1.111 loncom/interface/lonmsg.pm:1.112
--- loncom/interface/lonmsg.pm:1.111	Tue Oct 26 15:50:15 2004
+++ loncom/interface/lonmsg.pm	Tue Nov  9 11:29:32 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.111 2004/10/26 19:50:15 www Exp $
+# $Id: lonmsg.pm,v 1.112 2004/11/09 16:29:32 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -770,6 +770,90 @@
     return @temp;
 }
 
+# ======================================================== Display new messages
+
+
+sub disnew {
+    my $r=shift;
+    my %lt=&Apache::lonlocal::texthash(
+				       'nm' => 'New Messages',
+				       'su' => 'Subject',
+				       'da' => 'Date',
+				       'us' => 'Username',
+				       'op' => 'Open',
+				       'do' => 'Domain'
+				       );
+    my @msgids = sort split(/\&/,&Apache::lonnet::reply
+                            ('keys:'.$ENV{'user.domain'}.':'.
+                             $ENV{'user.name'}.':nohist_email',
+                             $ENV{'user.home'}));
+    my @newmsgs;
+    my %setters = ();
+    my $startblock = 0;
+    my $endblock = 0;
+    my %blocked = ();
+    my $numblocked = 0;
+    # Check for blocking of display because of scheduled online exams.
+    &blockcheck(\%setters,\$startblock,\$endblock);
+    foreach (@msgids) {
+        my ($sendtime,$shortsubj,$fromname,$fromdom,$status)=
+	    &Apache::lonmsg::unpackmsgid($_);
+        if (defined($sendtime) && $sendtime!~/error/) {
+            my $numsendtime = $sendtime;
+            $sendtime = &Apache::lonlocal::locallocaltime($sendtime);
+            if ($status eq 'new') {
+                if ($numsendtime >= $startblock && ($numsendtime <= $endblock && $endblock > 0) ) {
+                    $blocked{$_} = 'ON';
+                    $numblocked ++;
+                } else {
+                    push @newmsgs, { 
+                        msgid    => $_,
+                        sendtime => $sendtime,
+                        shortsub => &Apache::lonnet::unescape($shortsubj),
+                        from     => $fromname,
+                        fromdom  => $fromdom 
+                        }
+                }
+            }
+        }
+    }
+    if ($#newmsgs >= 0) {
+        $r->print(<<TABLEHEAD);
+<h2>$lt{'nm'}</h2>
+<table border=2><tr><th>&nbsp</th>
+<th>$lt{'da'}</th><th>$lt{'us'}</th><th>$lt{'do'}</th><th>$lt{'su'}</th></tr>
+TABLEHEAD
+        foreach my $msg (@newmsgs) {
+            $r->print(<<"ENDLINK");
+<tr bgcolor="#FFBB77">
+<td><a href="/adm/email?display=$msg->{'msgid'}">$lt{'op'}</a></td>
+ENDLINK
+            foreach ('sendtime','from','fromdom','shortsub') {
+                $r->print("<td>$msg->{$_}</td>");
+            }
+            $r->print("</td></tr>");
+        }
+        $r->print('</table></body></html>');
+    } elsif ($numblocked == 0) {
+        $r->print("<h3>".&mt('You have no unread messages')."</h3>");
+    }
+    if ($numblocked > 0) {
+        my $beginblock = &Apache::lonlocal::locallocaltime($startblock);
+        my $finishblock = &Apache::lonlocal::locallocaltime($endblock);
+        if ($numblocked == 1) {
+            $r->print("<h3>".&mt('You have').' '.$numblocked.' '.&mt('blocked unread message').".</h3>");
+            $r->print(&mt('This message is not viewable because').' ');
+        } else {
+            $r->print("<h3>".&mt('You have').' '.$numblocked.' '.&mt('blocked unread messages').".</h3>");
+            $r->print(&mt('These').' '.$numblocked.' '.&mt('messages are not viewable because '));
+        }
+        $r->print(
+&mt('display of LON-CAPA messages sent to you by other students between').' '.$beginblock.' '.&mt('and').' '.$finishblock.' '.&mt('is currently being blocked because of online exams').'.');
+        &build_block_table($r,$startblock,$endblock,\%setters);
+    }
+}
+
+
 # ======================================================== Display all messages
 
 sub disall {

--www1100017772--