--- loncom/interface/lonmsg.pm	2004/10/26 19:50:15	1.111
+++ loncom/interface/lonmsg.pm	2006/12/28 19:43:24	1.195
@@ -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.195 2006/12/28 19:43:24 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -26,105 +26,28 @@
 # http://www.lon-capa.org/
 #
 
-
 package Apache::lonmsg;
 
-=pod
-
-=head1 NAME
-
-Apache::lonmsg: supports internal messaging
-
-=head1 SYNOPSIS
-
-lonmsg provides routines for sending messages, receiving messages, and
-a handler to allow users to read, send, and delete messages.
-
-=head1 OVERVIEW
-
-=head2 Messaging Overview
-
-X<messages>LON-CAPA provides an internal messaging system similar to
-email, but customized for LON-CAPA's usage. LON-CAPA implements its
-own messaging system, rather then building on top of email, because of
-the features LON-CAPA messages can offer that conventional e-mail can
-not:
-
-=over 4
-
-=item * B<Critical messages>: A message the recipient B<must>
-acknowlegde receipt of before they are allowed to continue using the
-system, preventing a user from claiming they never got a message
-
-=item * B<Receipts>: LON-CAPA can reliably send reciepts informing the
-sender that it has been read; again, useful for preventing students
-from claiming they did not see a message. (While conventional e-mail
-has some reciept support, it's sporadic, e-mail client-specific, and
-generally the receiver can opt to not send one, making it useless in
-this case.)
-
-=item * B<Context>: LON-CAPA knows about the sender, such as where
-they are in a course. When a student mails an instructor asking for
-help on the problem, the instructor receives not just the student's
-question, but all submissions the student has made up to that point,
-the user's rendering of the problem, and the complete view the student
-saw of the resource, including discussion up to that point. Finally,
-the instructor is reading all of this inside of LON-CAPA, not their
-email program, so they have full access to LON-CAPA's grading
-interface, or other features they may wish to use in response to the
-student's query.
-
-=item * B<Blocking>: LON-CAPA can block display of e-mails that are 
-sent to a student during an online exam. A course coordinator or
-instructor can set an open and close date/time for scheduled online
-exams in a course. If a user uses the LON-CAPA internal messaging 
-system to display e-mails during the scheduled blocking event,  
-display of all e-mail sent during the blocking period will be 
-suppressed, and a message of explanation, including details of the 
-currently active blocking periods will be displayed instead. A user 
-who has a course coordinator or instructor role in a course will be
-unaffected by any blocking periods for the course, unless the user
-also has a student role in the course, AND has selected the student role.
-
-=back
-
-Users can ask LON-CAPA to forward messages to conventional e-mail
-addresses on their B<PREF> screen, but generally, LON-CAPA messages
-are much more useful then traditional email can be made to be, even
-with HTML support.
-
-Right now, this document will cover just how to send a message, since
-it is likely you will not need to programmatically read messages,
-since lonmsg already implements that functionality.
-
-=head1 FUNCTIONS
-
-=over 4
-
-=cut
-
 use strict;
-use Apache::lonnet();
-use vars qw($msgcount);
+use Apache::lonnet;
 use HTML::TokeParser();
-use Apache::Constants qw(:common);
-use Apache::loncommon();
-use Apache::lontexconvert();
-use HTML::Entities();
-use Mail::Send;
 use Apache::lonlocal;
-use Apache::loncommunicate;
+use Mail::Send;
+use LONCAPA qw(:DEFAULT :match);
 
-# Querystring component with sorting type
-my $sqs;
-my $startdis;
-my $interdis;
+{
+    my $uniq;
+    sub get_uniq {
+	$uniq++;
+	return $uniq;
+    }
+}
 
 # ===================================================================== Package
 
 sub packagemsg {
     my ($subject,$message,$citation,$baseurl,$attachmenturl,
-	$recuser,$recdomain)=@_;
+	$recuser,$recdomain,$msgid,$type,$crsmsgid,$symb,$error)=@_;
     $message =&HTML::Entities::encode($message,'<>&"');
     $citation=&HTML::Entities::encode($citation,'<>&"');
     $subject =&HTML::Entities::encode($subject,'<>&"');
@@ -134,34 +57,74 @@ sub packagemsg {
     #remove machine specification
     $attachmenturl =~ s|^http://[^/]+/|/|;
     $attachmenturl =&HTML::Entities::encode($attachmenturl,'<>&"');
-
+    my $course_context;
+    if (defined($env{'form.replyid'})) {
+        my ($sendtime,$shortsubj,$fromname,$fromdomain,$count,$origcid)=
+                   split(/\:/,&unescape($env{'form.replyid'}));
+        $course_context = $origcid;
+    }
+    foreach my $key (keys(%env)) {
+        if ($key=~/^form\.(rep)?rec\_(.*)$/) {
+            my ($sendtime,$shortsubj,$fromname,$fromdomain,$count,$origcid) =
+                                    split(/\:/,&unescape($2));
+            $course_context = $origcid;
+            last;
+        }
+    }
+    unless(defined($course_context)) {
+        $course_context = $env{'request.course.id'};
+    }
     my $now=time;
-    $msgcount++;
-    my $partsubj=$subject;
-    $partsubj=&Apache::lonnet::escape($partsubj);
-    my $msgid=&Apache::lonnet::escape(
-           $now.':'.$partsubj.':'.$ENV{'user.name'}.':'.
-           $ENV{'user.domain'}.':'.$msgcount.':'.$$);
-    my $result='<sendername>'.$ENV{'user.name'}.'</sendername>'.
-           '<senderdomain>'.$ENV{'user.domain'}.'</senderdomain>'.
+    my $msgcount = &get_uniq();
+    unless(defined($msgid)) {
+        $msgid = &buildmsgid($now,$subject,$env{'user.name'},$env{'user.domain'},
+                           $msgcount,$course_context,$symb,$error,$$);
+    }
+    my $result = '<sendername>'.$env{'user.name'}.'</sendername>'.
+           '<senderdomain>'.$env{'user.domain'}.'</senderdomain>'.
            '<subject>'.$subject.'</subject>'.
-	   '<time>'.&Apache::lonlocal::locallocaltime($now).'</time>'.
-	   '<servername>'.$ENV{'SERVER_NAME'}.'</servername>'.
+           '<time>'.&Apache::lonlocal::locallocaltime($now).'</time>';
+    if (defined($crsmsgid)) {
+        $result.= '<courseid>'.$course_context.'</courseid>'.
+                  '<coursesec>'.$env{'request.course.sec'}.'</coursesec>'.
+                  '<msgid>'.$msgid.'</msgid>'.
+                  '<coursemsgid>'.$crsmsgid.'</coursemsgid>'.
+                  '<message>'.$message.'</message>';
+        return ($msgid,$result);
+    }
+    $result .= '<servername>'.$ENV{'SERVER_NAME'}.'</servername>'.
            '<host>'.$ENV{'HTTP_HOST'}.'</host>'.
 	   '<client>'.$ENV{'REMOTE_ADDR'}.'</client>'.
-	   '<browsertype>'.$ENV{'browser.type'}.'</browsertype>'.
-	   '<browseros>'.$ENV{'browser.os'}.'</browseros>'.
-	   '<browserversion>'.$ENV{'browser.version'}.'</browserversion>'.
-           '<browsermathml>'.$ENV{'browser.mathml'}.'</browsermathml>'.
+	   '<browsertype>'.$env{'browser.type'}.'</browsertype>'.
+	   '<browseros>'.$env{'browser.os'}.'</browseros>'.
+	   '<browserversion>'.$env{'browser.version'}.'</browserversion>'.
+           '<browsermathml>'.$env{'browser.mathml'}.'</browsermathml>'.
 	   '<browserraw>'.$ENV{'HTTP_USER_AGENT'}.'</browserraw>'.
-	   '<courseid>'.$ENV{'request.course.id'}.'</courseid>'.
-	   '<coursesec>'.$ENV{'request.course.sec'}.'</coursesec>'.
-	   '<role>'.$ENV{'request.role'}.'</role>'.
-	   '<resource>'.$ENV{'request.filename'}.'</resource>'.
-           '<msgid>'.$msgid.'</msgid>'.
-	   '<recuser>'.$recuser.'</recuser>'.
-	   '<recdomain>'.$recdomain.'</recdomain>'.
-	   '<message>'.$message.'</message>';
+	   '<courseid>'.$course_context.'</courseid>'.
+	   '<coursesec>'.$env{'request.course.sec'}.'</coursesec>'.
+	   '<role>'.$env{'request.role'}.'</role>'.
+	   '<resource>'.$env{'request.filename'}.'</resource>'.
+           '<msgid>'.$msgid.'</msgid>';
+    if (ref($recuser) eq 'ARRAY') {
+        for (my $i=0; $i<@{$recuser}; $i++) {
+            if ($type eq 'dcmail') {
+                my ($username,$email) = split(/:/,$$recuser[$i]);
+                $username = &unescape($username);
+                $email = &unescape($email);
+                $username = &HTML::Entities::encode($username,'<>&"');
+                $email = &HTML::Entities::encode($email,'<>&"');
+                $result .= '<recipient username="'.$username.'">'.
+                                            $email.'</recipient>';
+            } else {
+                $result .= '<recuser>'.$$recuser[$i].'</recuser>'.
+                           '<recdomain>'.$$recdomain[$i].'</recdomain>';
+            }
+        }
+    } else {
+        $result .= '<recuser>'.$recuser.'</recuser>'.
+                   '<recdomain>'.$recdomain.'</recdomain>';
+    }
+    $result .= '<message>'.$message.'</message>';
     if (defined($citation)) {
 	$result.='<citation>'.$citation.'</citation>';
     }
@@ -171,7 +134,18 @@ sub packagemsg {
     if (defined($attachmenturl)) {
 	$result.= '<attachmenturl>'.$attachmenturl.'</attachmenturl>';
     }
-    return $msgid,$result;
+    if (defined($symb)) {
+        $result.= '<symb>'.$symb.'</symb>';
+        if (defined($course_context)) {
+            if ($course_context eq $env{'request.course.id'}) {
+                my $resource_title = &Apache::lonnet::gettitle($symb);
+                if (defined($resource_title)) {
+                    $result .= '<resource_title>'.$resource_title.'</resource_title>';
+                }
+            }
+        }
+    }
+    return ($msgid,$result);
 }
 
 # ================================================== Unpack message into a hash
@@ -185,9 +159,18 @@ sub unpackagemsg {
        if ($token->[0] eq 'S') {
 	   my $entry=$token->[1];
            my $value=$parser->get_text('/'.$entry);
-           $content{$entry}=$value;
+           if (($entry eq 'recuser') || ($entry eq 'recdomain')) {
+               push(@{$content{$entry}},$value);
+           } elsif ($entry eq 'recipient') {
+               my $username = $token->[2]{'username'};
+               $username = &HTML::Entities::decode($username,'<>&"');
+               $content{$entry}{$username} = $value;
+           } else {
+               $content{$entry}=$value;
+           }
        }
     }
+    if (!exists($content{'recuser'})) { $content{'recuser'} = []; }
     if ($content{'attachmenturl'}) {
        my ($fname)=($content{'attachmenturl'}=~m|/([^/]+)$|);
        if ($notoken) {
@@ -205,63 +188,112 @@ sub unpackagemsg {
 
 # ======================================================= Get info out of msgid
 
+sub buildmsgid {
+    my ($now,$subject,$uname,$udom,$msgcount,$course_context,$symb,$error,$pid) = @_;
+    $subject=&escape($subject);
+    $symb = &escape($symb);
+    return(&escape($now.':'.$subject.':'.$uname.':'.
+           $udom.':'.$msgcount.':'.$course_context.':'.$pid.':'.$symb.':'.$error));
+}
+
 sub unpackmsgid {
-    my ($msgid,$folder)=@_;
-    $msgid=&Apache::lonnet::unescape($msgid);
-    my $suffix=&foldersuffix($folder);
-    my ($sendtime,$shortsubj,$fromname,$fromdomain)=split(/\:/,
-                          &Apache::lonnet::unescape($msgid));
-    my %status=&Apache::lonnet::get('email_status'.$suffix,[$msgid]);
-    if ($status{$msgid}=~/^error\:/) { $status{$msgid}=''; }
-    unless ($status{$msgid}) { $status{$msgid}='new'; }
-    return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid});
-} 
+    my ($msgid,$folder,$skipstatus,$status_cache)=@_;
+    $msgid=&unescape($msgid);
+    my ($sendtime,$shortsubj,$fromname,$fromdomain,$count,$fromcid,
+        $processid,$symb,$error) = split(/\:/,&unescape($msgid));
+    $shortsubj = &unescape($shortsubj);
+    $shortsubj = &HTML::Entities::decode($shortsubj);
+    $symb = &unescape($symb);
+    if (!defined($processid)) { $fromcid = ''; }
+    my %status=();
+    unless ($skipstatus) {
+	if (ref($status_cache)) {
+	    $status{$msgid} = $status_cache->{$msgid};
+	} else {
+	    my $suffix=&foldersuffix($folder);
+	    %status=&Apache::lonnet::get('email_status'.$suffix,[$msgid]);
+	}
+	if ($status{$msgid}=~/^error\:/) { $status{$msgid}=''; }
+        unless ($status{$msgid}) { $status{$msgid}='new'; }
+    }
+    return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid},$fromcid,$symb,$error);
+}
 
 
 sub sendemail {
     my ($to,$subject,$body)=@_;
+    my %senderemails=&Apache::loncommon::getemails();
+    my $senderaddress='';
+    foreach my $type ('notification','permanentemail','critnotification') {
+	if ($senderemails{$type}) {
+	    $senderaddress=$senderemails{$type};
+	}
+    }
     $body=
     "*** ".&mt('This is an automatic message generated by the LON-CAPA system.')."\n".
-    "*** ".&mt('Please do not reply to this address.')."\n\n".$body;
+    "*** ".($senderaddress?&mt('You can reply to this message'):&mt('Please do not reply to this address.')."\n*** ".
+	    &mt('A reply will not be received by the recipient!'))."\n\n".$body;
     my $msg = new Mail::Send;
     $msg->to($to);
     $msg->subject('[LON-CAPA] '.$subject);
-    my %oldENV=%ENV;
-    undef(%ENV);
+    if ($senderaddress) { $msg->add('Reply-to',$senderaddress); $msg->add('From',$senderaddress); }
     if (my $fh = $msg->open()) {
 	print $fh $body;
 	$fh->close;
     }
-    %ENV=%oldENV;
-    undef(%oldENV);
 }
 
 # ==================================================== Send notification emails
 
 sub sendnotification {
-    my ($to,$touname,$toudom,$subj,$crit)=@_;
-    my $sender=$ENV{'environment.firstname'}.' '.$ENV{'environment.lastname'};
+    my ($to,$touname,$toudom,$subj,$crit,$text,$msgid)=@_;
+    my $sender=$env{'environment.firstname'}.' '.$env{'environment.lastname'};
+    unless ($sender=~/\w/) { 
+	$sender=$env{'user.name'}.'@'.$env{'user.domain'};
+    }
     my $critical=($crit?' critical':'');
+    $text=~s/\&lt\;/\</gs;
+    $text=~s/\&gt\;/\>/gs;
+    $text=~s/\<\/*[^\>]+\>//gs;
     my $url='http://'.
       $Apache::lonnet::hostname{&Apache::lonnet::homeserver($touname,$toudom)}.
       '/adm/email?username='.$touname.'&domain='.$toudom;
-    my $body=(<<ENDMSG);
-You received a$critical message from $sender in LON-CAPA. The subject is
+    my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid,
+        $symb,$error) = &Apache::lonmsg::unpackmsgid($msgid);
+    my $coursetext;
+    if ($fromcid ne '') {
+        $coursetext = "\n".&mt('Course').': ';
+        if ($env{'course.'.$fromcid.'.description'} ne '') {
+            $coursetext .= $env{'course.'.$fromcid.'.description'};
+        } else {
+            my %coursehash = &Apache::lonnet::coursedescription($fromcid,);
+            if ($coursehash{'description'} ne '') {
+                $coursetext .= $coursehash{'description'};
+            }
+        }
+        $coursetext .= "\n\n";
+    }
+    my $body = $coursetext. 
+               &mt('You received a'.$critical.' message from [_1] in LON-CAPA.',$sender).' '.&mt('The subject is 
+
+ [_1]
 
- $subj
+',$subj)."\n".
+'=== '.&mt('Excerpt')." ============================================================
+$text
+========================================================================
 
-Use
+".&mt('Use 
 
- $url
+ [_1]
 
-to access this message.
-ENDMSG
+to access the full message.',$url);
     &sendemail($to,'New'.$critical.' message from '.$sender,$body);
 }
 # ============================================================= Check for email
 
 sub newmail {
-    if ((time-$ENV{'user.mailcheck.time'})>300) {
+    if ((time-$env{'user.mailcheck.time'})>300) {
         my %what=&Apache::lonnet::get('email_status',['recnewemail']);
         &Apache::lonnet::appenv('user.mailcheck.time'=>time);
         if ($what{'recnewemail'}>0) { return 1; }
@@ -286,12 +318,14 @@ sub author_res_msg {
     my $homeserver=&Apache::lonnet::homeserver($author,$domain);
     if ($homeserver ne 'no_host') {
        my $id=unpack("%32C*",$message);
+       $message .= " <p>This error occurred on machine ".
+	   $Apache::lonnet::perlvar{'lonHostID'}."</p>";
        my $msgid;
        ($msgid,$message)=&packagemsg($filename,$message);
        return &Apache::lonnet::reply('put:'.$domain.':'.$author.
          ':nohist_res_msgs:'.
-          &Apache::lonnet::escape($filename.'_'.$id).'='.
-          &Apache::lonnet::escape($message),$homeserver);
+          &escape($filename.'_'.$id).'='.
+          &escape($message),$homeserver);
     }
     return 'no_host';
 }
@@ -301,7 +335,7 @@ sub author_res_msg {
 sub retrieve_author_res_msg {
     my $url=shift;
     $url=&Apache::lonnet::declutter($url);
-    my ($domain,$author)=($url=~/^(\w+)\/(\w+)\//);
+    my ($domain,$author)=($url=~/^($match_domain)\/($match_username)\//);
     my %errormsgs=&Apache::lonnet::dump('nohist_res_msgs',$domain,$author);
     my $msgs='';
     foreach (keys %errormsgs) {
@@ -321,7 +355,7 @@ sub retrieve_author_res_msg {
 sub del_url_author_res_msg {
     my $url=shift;
     $url=&Apache::lonnet::declutter($url);
-    my ($domain,$author)=($url=~/^(\w+)\/(\w+)\//);
+    my ($domain,$author)=($url=~/^($match_domain)\/($match_username)\//);
     my @delmsgs=();
     foreach (&Apache::lonnet::getkeys('nohist_res_msgs',$domain,$author)) {
 	if ($_=~/^\Q$url\E\_\d+$/) {
@@ -330,7 +364,20 @@ sub del_url_author_res_msg {
     }
     return &Apache::lonnet::del('nohist_res_msgs',\@delmsgs,$domain,$author);
 }
+# =================================== Clear out all author messages in URL path
 
+sub clear_author_res_msg {
+    my $url=shift;
+    $url=&Apache::lonnet::declutter($url);
+    my ($domain,$author)=($url=~/^($match_domain)\/($match_username)\//);
+    my @delmsgs=();
+    foreach (&Apache::lonnet::getkeys('nohist_res_msgs',$domain,$author)) {
+	if ($_=~/^\Q$url\E/) {
+	    push (@delmsgs,$_);
+	}
+    }
+    return &Apache::lonnet::del('nohist_res_msgs',\@delmsgs,$domain,$author);
+}
 # ================= Return hash with URLs for which there is a resource message
 
 sub all_url_author_res_msg {
@@ -343,44 +390,66 @@ sub all_url_author_res_msg {
     return %returnhash;
 }
 
+# ====================================== Add a comment to the User Notes screen
+
+sub store_instructor_comment {
+    my ($msg,$uname,$udom) = @_;
+    my $cid  = $env{'request.course.id'};
+    my $cnum = $env{'course.'.$cid.'.num'};
+    my $cdom = $env{'course.'.$cid.'.domain'};
+    my $subject= &mt('Record').' ['.$uname.':'.$udom.']';
+    my $result = &user_normal_msg_raw($cnum,$cdom,$subject,$msg);
+    return $result;
+}
+
 # ================================================== Critical message to a user
 
 sub user_crit_msg_raw {
-    my ($user,$domain,$subject,$message,$sendback)=@_;
+    my ($user,$domain,$subject,$message,$sendback,$toperm,$sentmessage)=@_;
 # Check if allowed missing
-    my $status='';
+    my ($status,$packed_message);
     my $msgid='undefined';
     unless (($message)&&($user)&&($domain)) { $status='empty'; };
+    my $text=$message;
     my $homeserver=&Apache::lonnet::homeserver($user,$domain);
     if ($homeserver ne 'no_host') {
-       ($msgid,$message)=&packagemsg($subject,$message);
-       if ($sendback) { $message.='<sendback>true</sendback>'; }
+       ($msgid,$packed_message)=&packagemsg($subject,$message);
+       if ($sendback) { $packed_message.='<sendback>true</sendback>'; }
        $status=&Apache::lonnet::critical(
            'put:'.$domain.':'.$user.':critical:'.
-           &Apache::lonnet::escape($msgid).'='.
-           &Apache::lonnet::escape($message),$homeserver);
-       if ($ENV{'request.course.id'}) {
-          &user_normal_msg_raw(
-            $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
-            $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-            'Critical ['.$user.':'.$domain.']',
-	    $message);
-       }
+           &escape($msgid).'='.
+           &escape($packed_message),$homeserver);
+        if (defined($sentmessage)) {
+            $$sentmessage = $packed_message;
+        }
+        if ($env{'request.course.id'} eq '') {
+            (undef,my $packed_message_no_citation) =
+            &packagemsg($subject,$message,undef,undef,undef,$user,$domain,
+                        $msgid);
+            if ($status eq 'ok' || $status eq 'con_delayed') {
+                &store_sent_mail($msgid,$packed_message_no_citation);
+            }
+        }
     } else {
        $status='no_host';
     }
+
 # Notifications
-    my %userenv = &Apache::lonnet::get('environment',['critnotification'],
-                                       $domain,$user);
+    my %userenv = &Apache::loncommon::getemails($user,$domain);
     if ($userenv{'critnotification'}) {
-      &sendnotification($userenv{'critnotification'},$user,$domain,$subject,1);
+      &sendnotification($userenv{'critnotification'},$user,$domain,$subject,1,
+			$text,$msgid);
+    }
+    if ($toperm && $userenv{'permanentemail'}) {
+      &sendnotification($userenv{'permanentemail'},$user,$domain,$subject,1,
+			$text,$msgid);
     }
 # Log this
     &Apache::lonnet::logthis(
       'Sending critical email '.$msgid.
       ', log status: '.
-      &Apache::lonnet::log($ENV{'user.domain'},$ENV{'user.name'},
-                         $ENV{'user.home'},
+      &Apache::lonnet::log($env{'user.domain'},$env{'user.name'},
+                         $env{'user.home'},
       'Sending critical '.$msgid.' to '.$user.' at '.$domain.' with status: '
       .$status));
     return $status;
@@ -394,25 +463,38 @@ sub user_crit_msg_raw {
     a critical message $message to the $user at $domain. If $sendback is true,
     a reciept will be sent to the current user when $user recieves the message.
 
+    Additionally it will check if the user has a Forwarding address
+    set, and send the message to that address instead
+
+    returns 
+      - in array context a list of results for each message that was sent
+      - in scalar context a space seperated list of results for each 
+           message sent
+
 =cut
 
 sub user_crit_msg {
-    my ($user,$domain,$subject,$message,$sendback)=@_;
-    my $status='';
+    my ($user,$domain,$subject,$message,$sendback,$toperm,$sentmessage)=@_;
+    my @status;
     my %userenv = &Apache::lonnet::get('environment',['msgforward'],
                                        $domain,$user);
     my $msgforward=$userenv{'msgforward'};
     if ($msgforward) {
-       foreach (split(/\,/,$msgforward)) {
-	 my ($forwuser,$forwdomain)=split(/\:/,$_);
-         $status.=
-	   &user_crit_msg_raw($forwuser,$forwdomain,$subject,$message,
-                $sendback).' ';
+       foreach my $addr (split(/\,/,$msgforward)) {
+	 my ($forwuser,$forwdomain)=split(/\:/,$addr);
+         push(@status,
+	      &user_crit_msg_raw($forwuser,$forwdomain,$subject,$message,
+				 $sendback,$toperm,$sentmessage));
        }
     } else { 
-	$status=&user_crit_msg_raw($user,$domain,$subject,$message,$sendback);
+	push(@status,
+	     &user_crit_msg_raw($user,$domain,$subject,$message,$sendback,
+				$toperm,$sentmessage));
     }
-    return $status;
+    if (wantarray) {
+	return @status;
+    }
+    return join(' ',@status);
 }
 
 # =================================================== Critical message received
@@ -423,8 +505,8 @@ sub user_crit_received {
     my %contents=&unpackagemsg($message{$msgid},1);
     my $status='rec: '.($contents{'sendback'}?
      &user_normal_msg($contents{'sendername'},$contents{'senderdomain'},
-                     &mt('Receipt').': '.$ENV{'user.name'}.' '.&mt('at').' '.$ENV{'user.domain'}.', '.$contents{'subject'},
-                     &mt('User').' '.$ENV{'user.name'}.' '.&mt('at').' '.$ENV{'user.domain'}.
+                     &mt('Receipt').': '.$env{'user.name'}.' '.&mt('at').' '.$env{'user.domain'}.', '.$contents{'subject'},
+                     &mt('User').' '.$env{'user.name'}.' '.&mt('at').' '.$env{'user.domain'}.
                      ' acknowledged receipt of message'."\n".'   "'.
                      $contents{'subject'}.'"'."\n".&mt('dated').' '.
                      $contents{'time'}.".\n"
@@ -434,8 +516,8 @@ sub user_crit_received {
      'nohist_email',{$contents{'msgid'} => $message{$msgid}});
     $status.=' del: '.
      &Apache::lonnet::del('critical',[$contents{'msgid'}]);
-    &Apache::lonnet::log($ENV{'user.domain'},$ENV{'user.name'},
-                         $ENV{'user.home'},'Received critical message '.
+    &Apache::lonnet::log($env{'user.domain'},$env{'user.name'},
+                         $env{'user.home'},'Received critical message '.
                          $contents{'msgid'}.
                          ', '.$status);
     return $status;
@@ -444,40 +526,67 @@ sub user_crit_received {
 # ======================================================== Normal communication
 
 sub user_normal_msg_raw {
-    my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl)=@_;
+    my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl,
+        $toperm,$currid,$newid,$sentmessage,$crsmsgid,$symb,$restitle,
+        $error)=@_;
 # Check if allowed missing
-    my $status='';
+    my ($status,$packed_message);
     my $msgid='undefined';
+    my $text=$message;
     unless (($message)&&($user)&&($domain)) { $status='empty'; };
     my $homeserver=&Apache::lonnet::homeserver($user,$domain);
     if ($homeserver ne 'no_host') {
-       ($msgid,$message)=&packagemsg($subject,$message,$citation,$baseurl,
-                                     $attachmenturl,$user,$domain);
+       ($msgid,$packed_message)=
+	                 &packagemsg($subject,$message,$citation,$baseurl,
+                                     $attachmenturl,$user,$domain,$currid,
+                                     undef,$crsmsgid,$symb,$error);
+
 # Store in user folder
        $status=&Apache::lonnet::critical(
            'put:'.$domain.':'.$user.':nohist_email:'.
-           &Apache::lonnet::escape($msgid).'='.
-           &Apache::lonnet::escape($message),$homeserver);
+           &escape($msgid).'='.
+           &escape($packed_message),$homeserver);
 # Save new message received time
        &Apache::lonnet::put
                          ('email_status',{'recnewemail'=>time},$domain,$user);
-# Into sent-mail folder
-       $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'});
+# Into sent-mail folder unless a broadcast message or critical message
+       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'})))) {
+           (undef,my $packed_message_no_citation) =
+               &packagemsg($subject,$message,undef,$baseurl,$attachmenturl,
+                           $user,$domain,$currid,undef,$crsmsgid,$symb,$error);
+           if ($status eq 'ok' || $status eq 'con_delayed') {
+               &store_sent_mail($msgid,$packed_message_no_citation);
+           }
+       }
     } else {
        $status='no_host';
     }
+    if (defined($newid)) {
+        $$newid = $msgid;
+    }
+    if (defined($sentmessage)) {
+        $$sentmessage = $packed_message;
+    }
+
 # Notifications
-    my %userenv = &Apache::lonnet::get('environment',['notification'],
+    my %userenv = &Apache::lonnet::get('environment',['notification',
+                                                      'permanentemail'],
                                        $domain,$user);
     if ($userenv{'notification'}) {
-	&sendnotification($userenv{'notification'},$user,$domain,$subject,0);
+	&sendnotification($userenv{'notification'},$user,$domain,$subject,0,
+			  $text,$msgid);
     }
-    &Apache::lonnet::log($ENV{'user.domain'},$ENV{'user.name'},
-                         $ENV{'user.home'},
+    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);
     return $status;
 }
@@ -486,57 +595,43 @@ sub user_normal_msg_raw {
 
 =pod
 
-=item * B<user_normal_msg($user, $domain, $subject, $message,
-    $citation, $baseurl, $attachmenturl)>: Sends a message to the
-    $user at $domain, with subject $subject and message $message.
+=item * B<user_normal_msg($user, $domain, $subject, $message, $citation,
+       $baseurl, $attachmenturl, $toperm, $sentmessage, $symb, $restitle, $error)>:
+ Sends a message to the  $user at $domain, with subject $subject and message $message.
 
 =cut
 
 sub user_normal_msg {
-    my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl)=@_;
+    my ($user,$domain,$subject,$message,$citation,$baseurl,$attachmenturl,
+	$toperm,$sentmessage,$symb,$restitle,$error)=@_;
     my $status='';
     my %userenv = &Apache::lonnet::get('environment',['msgforward'],
                                        $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).' ';
-       }
-    } else { 
+        foreach (split(/\,/,$msgforward)) {
+	    my ($forwuser,$forwdomain)=split(/\:/,$_);
+	    $status.=
+	        &user_normal_msg_raw($forwuser,$forwdomain,$subject,$message,
+				     $citation,$baseurl,$attachmenturl,$toperm,
+				     undef,undef,$sentmessage,undef,$symb,$restitle,$error).' ';
+        }
+    } else {
 	$status=&user_normal_msg_raw($user,$domain,$subject,$message,
-				     $citation,$baseurl,$attachmenturl);
+				     $citation,$baseurl,$attachmenturl,$toperm,
+				     undef,undef,$sentmessage,undef,$symb,$restitle,$error);
     }
     return $status;
 }
 
-
-# ============================================================ List all folders
-
-sub folderlist {
-    my $folder=shift;
-    my @allfolders=&Apache::lonnet::getkeys('email_folders');
-    if ($allfolders[0]=~/^error:/) { @allfolders=(); }
-    return '<form method="post" action="/adm/email">'.
-	&mt('Folder').': '.
-	&Apache::loncommon::select_form($folder,'folder',
-			     ('' => &mt('INBOX'),'trash' => &mt('TRASH'),
-			      'sent' => &mt('Sent Messages'),
-			      map { $_ => $_ } @allfolders)).
-			      ' '.&mt('Show').' '.
-	    &Apache::loncommon::select_form($interdis,'interdis',
-(' 10' => '10', ' 20' => '20', ' 50' => '50', '100' => '100', '200' => '200')).	
-   '<input type="submit" value="'.&mt('View Folder').'" /><br />'.
-   '<input type="submit" name="firstview" value="'.&mt('First').'" />'.
-   '<input type="submit" name="prevview" value="'.&mt('Previous').'" />'.
-   '<input type="text" size="5" name="startdis" value="'.$startdis.'" />'.
-   '<input type="submit" name="nextview" value="'.&mt('Next').'" />'.
-   '<input type="submit" name="lastview" value="'.&mt('Last').'" />'.
-	'<a href="/adm/email?critical=display'.$sqs.'">'.
-	    &mt('View Critical Messages').'</a>'.
-	    '</form>';
+sub store_sent_mail {
+    my ($msgid,$message) = @_;
+    my $status =' '.&Apache::lonnet::critical(
+               'put:'.$env{'user.domain'}.':'.$env{'user.name'}.
+                                          ':nohist_email_sent:'.
+               &escape($msgid).'='.
+               &escape($message),$env{'user.home'});
+    return $status;
 }
 
 # =============================================================== Folder suffix
@@ -544,1397 +639,33 @@ sub folderlist {
 sub foldersuffix {
     my $folder=shift;
     unless ($folder) { return ''; }
-    return '_'.&Apache::lonnet::escape($folder);
-}
-
-# =============================================================== Status Change
-
-sub statuschange {
-    my ($msgid,$newstatus,$folder)=@_;
-    my $suffix=&foldersuffix($folder);
-    my %status=&Apache::lonnet::get('email_status'.$suffix,[$msgid]);
-    if ($status{$msgid}=~/^error\:/) { $status{$msgid}=''; }
-    unless ($status{$msgid}) { $status{$msgid}='new'; }
-    unless (($status{$msgid} eq 'replied') || 
-            ($status{$msgid} eq 'forwarded')) {
-	&Apache::lonnet::put('email_status'.$suffix,{$msgid => $newstatus});
-    }
-    if (($newstatus eq 'deleted') || ($newstatus eq 'new')) {
-	&Apache::lonnet::put('email_status'.$suffix,{$msgid => $newstatus});
-    }
-}
-
-# ============================================================= Make new folder
-
-sub makefolder {
-    my ($newfolder)=@_;
-    &Apache::lonnet::put('email_folders',{$newfolder => time});
-}
-
-# ======================================================== Move between folders
-
-sub movemsg {
-    my ($msgid,$srcfolder,$trgfolder)=@_;
-    my $unmsgid=&Apache::lonnet::unescape($msgid);
-    my $srcsuffix=&foldersuffix($srcfolder);
-    my $trgsuffix=&foldersuffix($trgfolder);
-
-# Copy message
-    my %message=&Apache::lonnet::get('nohist_email'.$srcsuffix,[$msgid]);
-    &Apache::lonnet::put('nohist_email'.$trgsuffix,{$msgid => $message{$msgid}});
-
-# Copy status
-    my %status=&Apache::lonnet::get('email_status'.$srcsuffix,[$unmsgid]);
-    &Apache::lonnet::put('email_status'.$trgsuffix,{$unmsgid => $status{$unmsgid}});
-# See if was deleted -> becomes "read" in trash
-    my $currentstatus=(&unpackmsgid($status{$unmsgid}),$srcfolder);
-    if ($currentstatus eq 'deleted') {
-	&statuschange($msgid,'read',$trgfolder);
-    }
-# Delete orginals
-    &Apache::lonnet::del('nohist_email'.$srcsuffix,[$msgid]);
-    &Apache::lonnet::del('email_status'.$srcsuffix,[$unmsgid]);
-}
-
-# ======================================================= Display a course list
-
-sub discourse {
-    my $r=shift;
-    my $classlist = &Apache::loncoursedata::get_classlist();
-    my $now=time;
-    my %lt=&Apache::lonlocal::texthash('cfa' => 'Check for All',
-            'cfs' => 'Check for Section/Group',
-            'cfn' => 'Check for None');
-    $r->print(<<ENDDISHEADER);
-<input type="hidden" name="sendmode" value="group" />
-<script>
-    function checkall() {
-	for (i=0; i<document.forms.compemail.elements.length; i++) {
-            if 
-          (document.forms.compemail.elements[i].name.indexOf('send_to_')==0) {
-	      document.forms.compemail.elements[i].checked=true;
-            }
-        }
-    }
-
-    function checksec() {
-	for (i=0; i<document.forms.compemail.elements.length; i++) {
-            if 
-          (document.forms.compemail.elements[i].name.indexOf
-           ('send_to_&&&'+document.forms.compemail.chksec.value)==0) {
-	      document.forms.compemail.elements[i].checked=true;
-            }
-        }
-    }
-
-    function uncheckall() {
-	for (i=0; i<document.forms.compemail.elements.length; i++) {
-            if 
-          (document.forms.compemail.elements[i].name.indexOf('send_to_')==0) {
-	      document.forms.compemail.elements[i].checked=false;
-            }
-        }
-    }
-</script>
-<input type="button" onClick="checkall()" value="$lt{'cfa'}" />&nbsp;
-<input type="button" onClick="checksec()" value="$lt{'cfs'}" />
-<input type="text" size="5" name=chksec />&nbsp;
-<input type="button" onClick="uncheckall()" value="$lt{'cfn'}" />
-<p>
-ENDDISHEADER
-    my %coursepersonnel=&Apache::lonnet::get_course_adv_roles();
-    $r->print('<table>');
-    foreach my $role (sort keys %coursepersonnel) {
-        foreach (split(/\,/,$coursepersonnel{$role})) {
-            my ($puname,$pudom)=split(/\:/,$_);
-            $r->print('<tr><td><label>'.
-                      '<input type="checkbox" name="send_to_&&&&&&_'.
-                      $puname.':'.$pudom.'" /> '.
-                      &Apache::loncommon::plainname($puname,$pudom).
-                      '</label></td>'.
-                      '<td>('.$_.'),</td><td><i>'.$role.'</i></td></tr>');
-        }
-    }
-    $r->print('</table><table>');
-    while (my ($student,$info) = each(%$classlist)) {
-        my ($sname,$sdom,$status,$fullname,$section) =
-            (@{$info}[&Apache::loncoursedata::CL_SNAME(),
-                      &Apache::loncoursedata::CL_SDOM(),
-                      &Apache::loncoursedata::CL_STATUS(),
-                      &Apache::loncoursedata::CL_FULLNAME(),
-                      &Apache::loncoursedata::CL_SECTION()]);
-        next if ($status ne 'Active');
-        my $key = 'send_to_&&&'.$section.'&&&'.$student;
-        if (! defined($fullname) || $fullname eq '') { $fullname = $sname; }
-        $r->print('<tr><td><label>'.
-                  qq{<input type="checkbox" name="$key">}.('&nbsp;'x2).
-                  $fullname.'</td><td>'.$sname.'@'.$sdom.'</td><td>'.$section.
-                  '</td></tr>');
-    }
-    $r->print('</table>');
-}
-
-# ==================================================== Display Critical Message
-
-sub discrit {
-    my $r=shift;
-    my $header = '<h1><font color=red>'.&mt('Critical Messages').'</font></h1>'.
-        '<form action=/adm/email method=post>'.
-        '<input type=hidden name=confirm value=true>';
-    my %what=&Apache::lonnet::dump('critical');
-    my $result = '';
-    foreach (sort keys %what) {
-        my %content=&unpackagemsg($what{$_});
-        next if ($content{'senderdomain'} eq '');
-        $content{'message'}=~s/\n/\<br\>/g;
-        $result.='<hr />'.&mt('From').': <b>'.
-&Apache::loncommon::aboutmewrapper(
- &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('.
-$content{'sendername'}.'@'.
-            $content{'senderdomain'}.') '.$content{'time'}.
-            '<br />'.&mt('Subject').': '.$content{'subject'}.
-            '<br /><blockquote>'.
-              &Apache::lontexconvert::msgtexconverted($content{'message'}).
-            '</blockquote><small>'.
-&mt('You have to confirm that you received this message. After confirmation, this message will be moved to your regular inbox').
-            '</small><br />'.
-            '<input type=submit name="rec_'.$_.'" value="'.&mt('Confirm Receipt').'">'.
-            '<input type=submit name="reprec_'.$_.'" '.
-                  'value="'.&mt('Confirm Receipt and Reply').'">';
-    }
-    # Check to see if there were any messages.
-    if ($result eq '') {
-        $result = "<h2>".&mt('You have no critical messages.')."</h2>".
-	    '<a href="/adm/roles">'.&mt('Select a course').'</a><br />'.
-            '<a href="/adm/email">'.&mt('Communicate').'</a>';
-    } else {
-        $r->print($header);
-    }
-    $r->print($result);
-    $r->print('<input type="hidden" name="displayedcrit" value="true" /></form>');
-}
-
-sub sortedmessages {
-    my ($blocked,$startblock,$endblock,$numblocked,$folder) = @_;
-    my $suffix=&foldersuffix($folder);
-    my @messages = &Apache::lonnet::getkeys('nohist_email'.$suffix);
-    #unpack the varibles and repack into temp for sorting
-    my @temp;
-    foreach (@messages) {
-	my $msgid=&Apache::lonnet::escape($_);
-	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status)=
-	    &Apache::lonmsg::unpackmsgid($msgid,$folder);
-	my @temp1 = ($sendtime,$shortsubj,$fromname,$fromdomain,$status,
-		     $msgid);
-        # Check whether message was sent during blocking period.
-        if ($sendtime >= $startblock && ($sendtime <= $endblock && $endblock > 0) ) {
-            my $escid = &Apache::lonnet::unescape($msgid);
-            $$blocked{$escid} = 'ON';
-            $$numblocked ++;
-        } else { 
-            push @temp ,\@temp1;
-        }
-    }
-    #default sort
-    @temp = sort  {$a->[0] <=> $b->[0]} @temp;    
-    if ($ENV{'form.sortedby'} eq "date"){
-        @temp = sort  {$a->[0] <=> $b->[0]} @temp;    
-    }
-    if ($ENV{'form.sortedby'} eq "revdate"){
-    	@temp = sort  {$b->[0] <=> $a->[0]} @temp; 
-    }
-    if ($ENV{'form.sortedby'} eq "user"){
-	@temp = sort  {lc($a->[2]) cmp lc($b->[2])} @temp;
-    }
-    if ($ENV{'form.sortedby'} eq "revuser"){
-	@temp = sort  {lc($b->[2]) cmp lc($a->[2])} @temp;
-    }
-    if ($ENV{'form.sortedby'} eq "domain"){
-        @temp = sort  {$a->[3] cmp $b->[3]} @temp;
-    }
-    if ($ENV{'form.sortedby'} eq "revdomain"){
-        @temp = sort  {$b->[3] cmp $a->[3]} @temp;
-    }
-    if ($ENV{'form.sortedby'} eq "subject"){
-        @temp = sort  {lc($a->[1]) cmp lc($b->[1])} @temp;
-    }
-    if ($ENV{'form.sortedby'} eq "revsubject"){
-        @temp = sort  {lc($b->[1]) cmp lc($a->[1])} @temp;
-    }
-    if ($ENV{'form.sortedby'} eq "status"){
-        @temp = sort  {$a->[4] cmp $b->[4]} @temp;
-    }
-    if ($ENV{'form.sortedby'} eq "revstatus"){
-        @temp = sort  {$b->[4] cmp $a->[4]} @temp;
-    }
-    return @temp;
-}
-
-# ======================================================== Display all messages
-
-sub disall {
-    my ($r,$folder)=@_;
-    my %blocked = ();
-    my %setters = ();
-    my $startblock;
-    my $endblock;
-    my $numblocked = 0;
-    &blockcheck(\%setters,\$startblock,\$endblock);
-    $r->print(<<ENDDISHEADER);
-<script>
-    function checkall() {
-	for (i=0; i<document.forms.disall.elements.length; i++) {
-            if 
-          (document.forms.disall.elements[i].name.indexOf('delmark_')==0) {
-	      document.forms.disall.elements[i].checked=true;
-            }
-        }
-    }
-
-    function uncheckall() {
-	for (i=0; i<document.forms.disall.elements.length; i++) {
-            if 
-          (document.forms.disall.elements[i].name.indexOf('delmark_')==0) {
-	      document.forms.disall.elements[i].checked=false;
-            }
-        }
-    }
-</script>
-ENDDISHEADER
-    my $fsqs='&folder='.$folder;
-    my @temp=sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder);
-    my $totalnumber=$#temp+1;
-    my $number=int($totalnumber/$interdis)+1;
-    my $firstdis=$interdis*$startdis;
-    if ($firstdis>$#temp) { $firstdis=$#temp-$interdis+1; }
-    my $lastdis=$firstdis+$interdis-1;
-    if ($lastdis>$#temp) { $lastdis=$#temp; }
-    $r->print('<h2>'.&mt('Display All Messages').'</h2>'.
-	      &folderlist($folder).
-	      '<form method="post" name="disall" action="/adm/email">'.
-	      '<table border=2><tr><th colspan="3">&nbsp</th><th>');
-    if ($ENV{'form.sortedby'} eq "revdate") {
-	$r->print('<a href = "?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>');
-    } else {
-	$r->print('<a href = "?sortedby=revdate'.$fsqs.'">'.&mt('Date').'</a></th>');
-    }
-    $r->print('<th>');
-    if ($ENV{'form.sortedby'} eq "revuser") {
-	$r->print('<a href = "?sortedby=user'.$fsqs.'">'.&mt('Username').'</a>');
-    } else {
-	$r->print('<a href = "?sortedby=revuser'.$fsqs.'">'.&mt('Username').'</a>');
-    }
-    $r->print('</th><th>');
-    if ($ENV{'form.sortedby'} eq "revdomain") {
-	$r->print('<a href = "?sortedby=domain'.$fsqs.'">'.&mt('Domain').'</a>');
-    } else {
-	$r->print('<a href = "?sortedby=revdomain'.$fsqs.'">'.&mt('Domain').'</a>');
-    }
-    $r->print('</th><th>');
-    if ($ENV{'form.sortedby'} eq "revsubject") {
-	$r->print('<a href = "?sortedby=subject'.$fsqs.'">'.&mt('Subject').'</a>');
-    } else {
-    	$r->print('<a href = "?sortedby=revsubject'.$fsqs.'">'.&mt('Subject').'</a>');
-    }
-    $r->print('</th><th>');
-    if ($ENV{'form.sortedby'} eq "revstatus") {
-	$r->print('<a href = "?sortedby=status'.$fsqs.'">'.&mt('Status').'</th>');
+    my $suffix;
+    my %folderhash = &get_user_folders($folder);
+    if (ref($folderhash{$folder}) eq 'HASH') {
+        $suffix = '_'.&escape($folderhash{$folder}{'id'});
     } else {
-     	$r->print('<a href = "?sortedby=revstatus'.$fsqs.'">'.&mt('Status').'</th>');
-    }
-    $r->print('</tr>');
-    for (my $n=$firstdis;$n<=$lastdis;$n++) {
-	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID)= @{$temp[$n]};
-	if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) {
-	    if ($status eq 'new') {
-		$r->print('<tr bgcolor="#FFBB77">');
-	    } elsif ($status eq 'read') {
-		$r->print('<tr bgcolor="#BBBB77">');
-	    } elsif ($status eq 'replied') {
-		$r->print('<tr bgcolor="#AAAA88">'); 
-	    } else {
-		$r->print('<tr bgcolor="#99BBBB">');
-	    }
-	    $r->print('<td></a><input type=checkbox name="delmark_'.$origID.'" /></td><td><a href="/adm/email?display='.$origID.$sqs. 
-		      '">'.&mt('Open').'</a></td><td>'.
-		      ($folder ne 'trash'?'<a href="/adm/email?markdel='.$origID.$sqs.
-		      '">'.&mt('Delete'):'&nbsp').'</td>'.
-		      '<td>'.&Apache::lonlocal::locallocaltime($sendtime).'</td><td>'.
-		      $fromname.'</td><td>'.$fromdomain.'</td><td>'.
-		      &Apache::lonnet::unescape($shortsubj).'</td><td>'.
-                      $status.'</td></tr>');
-	} elsif ($status eq 'deleted') {
-# purge
-	    &movemsg(&Apache::lonnet::unescape($origID),$folder,'trash');
-	}
-    }   
-    $r->print('</table><p>'.
-  '<a href="javascript:checkall()">'.&mt('Check All').'</a>&nbsp;'.
-  '<a href="javascript:uncheckall()">'.&mt('Uncheck All').'</a></p>'.
-  '<input type="hidden" name="sortedby" value="'.$ENV{'form.sortedby'}.'" />');
-    if ($folder ne 'trash') {
-	$r->print(
-	      '<p><input type="submit" name="markeddel" value="'.&mt('Delete Checked').'" /></p>');
-    }
-$r->print('<p><input type="submit" name="markedmove" value="'.&mt('Move Checked to Folder').'" />');
-    my @allfolders=&Apache::lonnet::getkeys('email_folders');
-    if ($allfolders[0]=~/^error:/) { @allfolders=(); }
-    $r->print(
-	&Apache::loncommon::select_form('','movetofolder',
-			     ( map { $_ => $_ } @allfolders))
-	      );
-    $r->print('<input type="hidden" name="folder" value="'.$folder.'" /></form>');
-    if ($numblocked > 0) {
-        my $beginblock = &Apache::lonlocal::locallocaltime($startblock);
-        my $finishblock = &Apache::lonlocal::locallocaltime($endblock);
-        $r->print('<br /><br />'.
-                  $numblocked.' '.&mt('message(s) is/are not viewable because 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);
+        $suffix = '_'.&escape($folder);
     }
+    return $suffix;
 }
 
-# ============================================================== Compose output
-
-sub compout {
-    my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder)=@_;
-
-    if ($broadcast eq 'individual') {
-	&printheader($r,'/adm/email?compose=individual',
-	     'Send a Message');
-    } elsif ($broadcast) {
-	&printheader($r,'/adm/email?compose=group',
-	     'Broadcast Message');
-    } elsif ($forwarding) {
-	&Apache::lonhtmlcommon::add_breadcrumb
-        ({href=>"/adm/email?display=".&Apache::lonnet::escape($forwarding),
-          text=>"Display Message"});
-	&printheader($r,'/adm/email?forward='.&Apache::lonnet::escape($forwarding),
-	     'Forwarding a Message');
-    } elsif ($replying) {
-	&Apache::lonhtmlcommon::add_breadcrumb
-        ({href=>"/adm/email?display=".&Apache::lonnet::escape($replying),
-          text=>"Display Message"});
-	&printheader($r,'/adm/email?replyto='.&Apache::lonnet::escape($replying),
-	     'Replying to a Message');
-    } elsif ($replycrit) {
-	$r->print('<h3>'.&mt('Replying to a Critical Message').'</h3>');
-	$replying=$replycrit;
-    } else {
-	&printheader($r,'/adm/email?compose=upload',
-	     'Distribute from Uploaded File');
-    }
-
-    my $dispcrit='';
-    my $dissub='';
-    my $dismsg='';
-    my $func=&mt('Send New');
-    my %lt=&Apache::lonlocal::texthash('us' => 'Username',
-				       'do' => 'Domain',
-				       'ad' => 'Additional Recipients',
-				       'sb' => 'Subject',
-				       'ca' => 'Cancel',
-				       'ma' => 'Mail');
-
-    if (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
-	 my $crithelp = Apache::loncommon::help_open_topic("Course_Critical_Message");
-         $dispcrit=
- '<input type="checkbox" name="critmsg" /> '.&mt('Send as critical message').' ' . $crithelp . 
- '<br>'.
- '<input type="checkbox" name="sendbck" /> '.&mt('Send as critical message').'  ' .
- &mt('and return receipt') . $crithelp . '<p>';
-     }
-    my %message;
-    my %content;
-    my $defdom=$ENV{'user.domain'};
-    if ($forwarding) {
-	%message=&Apache::lonnet::get('nohist_email',[$forwarding]);
-	%content=&unpackagemsg($message{$forwarding},$folder);
-	$dispcrit.='<input type="hidden" name="forwid" value="'.
-	    $forwarding.'" />';
-	$func=&mt('Forward');
-	
-	$dissub=&mt('Forwarding').': '.$content{'subject'};
-	$dismsg=&mt('Forwarded message from').' '.
-	    $content{'sendername'}.' '.&mt('at').' '.$content{'senderdomain'};
-    }
-    if ($replying) {
-	%message=&Apache::lonnet::get('nohist_email',[$replying]);
-	%content=&unpackagemsg($message{$replying},$folder);
-	$dispcrit.='<input type="hidden" name="replyid" value="'.
-	    $replying.'" />';
-	$func=&mt('Send Reply to');
-	
-	$dissub=&mt('Reply').': '.$content{'subject'};       
-	$dismsg='> '.$content{'message'};
-	$dismsg=~s/\r/\n/g;
-	$dismsg=~s/\f/\n/g;
-	$dismsg=~s/\n+/\n\> /g;
-    }
-    my $citation=&displayresource(%content);
-    if ($ENV{'form.recdom'}) { $defdom=$ENV{'form.recdom'}; }
-      $r->print(
-                '<form action="/adm/email"  name="compemail" method="post"'.
-                ' enctype="multipart/form-data">'."\n".
-                '<input type="hidden" name="sendmail" value="on" />'."\n".
-                '<table>');
-    unless (($broadcast eq 'group') || ($broadcast eq 'upload')) {
-	if ($replying) {
-	    $r->print('<tr><td colspan="2">'.&mt('Replying to').' '.
-		      &Apache::loncommon::aboutmewrapper(
-							 &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).' ('.
-		      $content{'sendername'}.'@'.
-		      $content{'senderdomain'}.')'.
-		      '<input type="hidden" name="recuname" value="'.$content{'sendername'}.'" />'.
-		      '<input type="hidden" name="recdomain" value="'.$content{'senderdomain'}.'" />'.
-		      '</td></tr>');
-	} else {
-	    my $domform = &Apache::loncommon::select_dom_form($defdom,'recdomain');
-	    my $selectlink=&Apache::loncommon::selectstudent_link
-	    ('compemail','recuname','recdomain');
-	    $r->print(<<"ENDREC");
-<tr><td>$lt{'us'}:</td><td><input type="text" size="12" name="recuname" value="$ENV{'form.recname'}"></td><td rowspan="2">$selectlink</td></tr>
-<tr><td>$lt{'do'}:</td>
-<td>$domform</td></tr>
-ENDREC
-        }
-    }
-    my $latexHelp = Apache::loncommon::helpLatexCheatsheet();
-    if ($broadcast ne 'upload') {
-       $r->print(<<"ENDCOMP");
-<tr><td>$lt{'ad'}<br /><tt>username\@domain,username\@domain, ...
-</tt></td><td>
-<input type="text" size="50" name="additionalrec" /></td></tr>
-<tr><td>$lt{'sb'}:</td><td><input type="text" size="50" name="subject" value="$dissub" />
-</td></tr></table>
-$latexHelp
-<textarea name="message" cols="80" rows="15" wrap="hard">$dismsg
-</textarea></p><br />
-$dispcrit
-<input type="submit" name="send" value="$func $lt{'ma'}" />
-<input type="submit" name="cancel" value="$lt{'ca'}" /><hr />
-$citation
-ENDCOMP
-    } else { # $broadcast is 'upload'
-	$r->print(<<ENDUPLOAD);
-<input type="hidden" name="sendmode" value="upload" />
-<input type="hidden" name="send" value="on" />
-<h3>Generate messages from a file</h3>
-<p>
-Subject: <input type="text" size="50" name="subject" />
-</p>
-<p>General message text<br />
-<textarea name="message" cols="60" rows="10" wrap="hard">$dismsg
-</textarea></p>
-<p>
-The file format for the uploaded portion of the message is:
-<pre>
-username1\@domain1: text
-username2\@domain2: text
-username3\@domain1: text
-</pre>
-</p>
-<p>
-The messages will be assembled from all lines with the respective 
-<tt>username\@domain</tt>, and appended to the general message text.</p>
-<p>
-<input type="file" name="upfile" size="40" /></p><p>
-$dispcrit
-<input type="submit" value="Upload and Send" /></p>
-ENDUPLOAD
-    }
-    if ($broadcast eq 'group') {
-       &discourse;
-    }
-    $r->print('</form>');
-}
-
-# ---------------------------------------------------- Display all face to face
-
-sub retrieve_instructor_comments {
-    my ($user,$domain)=@_;
-    my $target=$ENV{'form.grade_target'};
-    if (! $ENV{'request.course.id'}) { return; }
-    if (! &Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
-	return;
-    }
-    my %records=&Apache::lonnet::dump('nohist_email',
-			 $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-			 $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
-                         '%255b'.$user.'%253a'.$domain.'%255d');
-    my $result='';
-    foreach (sort(keys(%records))) {
-        my %content=&unpackagemsg($records{$_});
-        next if ($content{'senderdomain'} eq '');
-        next if ($content{'subject'} !~ /^Record/);
-        # $content{'message'}=~s/\n/\<br\>/g;
-        $result.='Recorded by '.
-            $content{'sendername'}.'@'.$content{'senderdomain'}."\n";
-        $result.=
-            &Apache::lontexconvert::msgtexconverted($content{'message'})."\n";
-     }
-    return $result;
-}
+# ========================================================= User-defined folders 
 
-sub disfacetoface {
-    my ($r,$user,$domain)=@_;
-    my $target=$ENV{'form.grade_target'};
-    unless ($ENV{'request.course.id'}) { return; }
-    unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
-	return;
-    }
-    my %records=&Apache::lonnet::dump('nohist_email',
-			 $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-			 $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
-                         '%255b'.$user.'%253a'.$domain.'%255d');
-    my $result='';
-    foreach (sort keys %records) {
-        my %content=&unpackagemsg($records{$_});
-        next if ($content{'senderdomain'} eq '');
-        $content{'message'}=~s/\n/\<br\>/g;
-        if ($content{'subject'}=~/^Record/) {
-	    $result.='<h3>'.&mt('Record').'</h3>';
-        } elsif ($content{'subject'}=~/^Broadcast/) {
-            $result .='<h3>'.&mt('Broadcast Message').'</h3>';
-        } else {
-            $result.='<h3>'.&mt('Critical Message').'</h3>';
-            %content=&unpackagemsg($content{'message'});
-            $content{'message'}=
-                '<b>'.&mt('Subject').': '.$content{'subject'}.'</b><br />'.
-		$content{'message'};
-        }
-        $result.=&mt('By').': <b>'.
-&Apache::loncommon::aboutmewrapper(
- &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('.
-$content{'sendername'}.'@'.
-            $content{'senderdomain'}.') '.$content{'time'}.
-            '<br /><blockquote>'.
-              &Apache::lontexconvert::msgtexconverted($content{'message'}).
-	      '</blockquote>';
-     }
-    # Check to see if there were any messages.
-    if ($result eq '') {
-	if ($target ne 'tex') { 
-	    $r->print("<p><b>".&mt("No notes, face-to-face discussion records, critical messages, or broadcast messages in this course.")."</b></p>");
-	} else {
-	    $r->print('\textbf{'.&mt("No notes, face-to-face discussion records, critical messages or broadcast messages in this course.").'}\\\\');
-	}
-    } else {
-       $r->print($result);
+sub get_user_folders {
+    my ($folder) = @_;
+    my %userfolders = 
+          &Apache::lonnet::dump('email_folders',undef,undef,$folder);
+    my $lock = "\0".'lock_counter'; # locks db while counter incremented
+    my $counter = "\0".'idcount';   # used in suffix for email db files
+    if (defined($userfolders{$lock})) {
+        delete($userfolders{$lock});
     }
-}
-
-# ---------------------------------------------------------------- Face to face
-
-sub facetoface {
-    my ($r,$stage)=@_;
-    unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
-	return;
-    }
-    &printheader($r,
-		 '/adm/email?recordftf=query',
-		 "User Notes, Face-to-Face, Critical Messages, Broadcast Messages");
-# from query string
-
-    if ($ENV{'form.recname'}) { $ENV{'form.recuname'}=$ENV{'form.recname'}; }
-    if ($ENV{'form.recdom'}) { $ENV{'form.recdomain'}=$ENV{'form.recdom'}; }
-
-    my $defdom=$ENV{'user.domain'};
-# already filled in
-    if ($ENV{'form.recdomain'}) { $defdom=$ENV{'form.recdomain'}; }
-# generate output
-    my $domform = &Apache::loncommon::select_dom_form($defdom,'recdomain');
-    my $stdbrws = &Apache::loncommon::selectstudent_link
-	('stdselect','recuname','recdomain');
-    my %lt=&Apache::lonlocal::texthash('user' => 'Username',
-				       'dom' => 'Domain',
-				       'head' => 'User Notes, Records of Face-To-Face Discussions, Critical Messages, and Broadcast Messages in Course',
-				       'subm' => 'Retrieve discussion and message records',
-				       'newr' => 'New Record (record is visible to course faculty and staff)',
-				       'post' => 'Post this Record');
-    $r->print(<<"ENDTREC");
-<h3>$lt{'head'}</h3>
-<form method="post" action="/adm/email" name="stdselect">
-<input type="hidden" name="recordftf" value="retrieve" />
-<table>
-<tr><td>$lt{'user'}:</td><td><input type="text" size="12" name="recuname" value="$ENV{'form.recuname'}" /></td>
-<td rowspan="2">
-$stdbrws
-<input type="submit" value="$lt{'subm'}" /></td>
-</tr>
-<tr><td>$lt{'dom'}:</td>
-<td>$domform</td></tr>
-</table>
-</form>
-ENDTREC
-    if (($stage ne 'query') &&
-        ($ENV{'form.recdomain'}) && ($ENV{'form.recuname'})) {
-        chomp($ENV{'form.newrecord'});
-        if ($ENV{'form.newrecord'}) {
-           &user_normal_msg_raw(
-            $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
-            $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-            &mt('Record').
-	     ' ['.$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}.']',
-	    $ENV{'form.newrecord'});
-        }
-        $r->print('<h3>'.&Apache::loncommon::plainname($ENV{'form.recuname'},
-				     $ENV{'form.recdomain'}).'</h3>');
-        &disfacetoface($r,$ENV{'form.recuname'},$ENV{'form.recdomain'});
-	$r->print(<<ENDRHEAD);
-<form method="post" action="/adm/email">
-<input name="recdomain" value="$ENV{'form.recdomain'}" type="hidden" />
-<input name="recuname" value="$ENV{'form.recuname'}" type="hidden" />
-ENDRHEAD
-        $r->print(<<ENDBFORM);
-<hr />$lt{'newr'}<br />
-<textarea name="newrecord" cols="80" rows="10" wrap="hard"></textarea>
-<br />
-<input type="hidden" name="recordftf" value="post" />
-<input type="submit" value="$lt{'post'}" />
-</form>
-ENDBFORM
-    }
-}
-
-# ----------------------------------------------------------- Blocking during exams
-
-sub examblock {
-    my ($r,$action) = @_;
-    unless ($ENV{'request.course.id'}) { return;}
-    unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) { $r->print('Not allowed'); }
-    my %lt=&Apache::lonlocal::texthash(
-            'comb' => 'Communication Blocking',
-            'cbds' => 'Communication blocking during scheduled exams',
-            'desc' => 'You can use communication blocking to prevent students enrolled in this course from displaying LON-CAPA messages sent by other students during an online exam. As blocking of communication could potentially interrupt legitimate communication between students who are also both enrolled in a different LON-CAPA course, please be careful that you select the correct start and end times for your scheduled exam when setting or modifying these parameters.',
-             'mecb' => 'Modify existing communication blocking periods',
-             'ncbc' => 'No communication blocks currently stored'
-    );
-
-    my %ltext = &Apache::lonlocal::texthash(
-            'dura' => 'Duration',
-            'setb' => 'Set by',
-            'even' => 'Event',
-            'actn' => 'Action',
-            'star' => 'Start',
-            'endd' => 'End'
-    );
-
-    &printheader($r,'/adm/email?block=display',$lt{'comb'});
-    $r->print('<h3>'.$lt{'cbds'}.'</h3>');
-
-    if ($action eq 'store') {
-        &blockstore($r);
-    }
-
-    $r->print($lt{'desc'}.'<br /><br />
-               <form name="blockform" method="post" action="/adm/email?block=store">
-             ');
-
-    $r->print('<h4>'.$lt{'mecb'}.'</h4>');
-    my %records = ();
-    my $blockcount = 0;
-    my $parmcount = 0;
-    &get_blockdates(\%records,\$blockcount);
-    if ($blockcount > 0) {
-        $parmcount = &display_blocker_status($r,\%records,\%ltext);
-    } else {
-        $r->print($lt{'ncbc'}.'<br /><br />');
-    }
-    &display_addblocker_table($r,$parmcount,\%ltext);
-    $r->print(<<"END");
-<br />
-<input type="hidden" name="blocktotal" value="$blockcount" />
-<input type ="submit" value="Save Changes" />
-</form>
-</body>
-</html>
-END
-    return;
-}
-
-sub blockstore {
-    my $r = shift;
-    my %lt=&Apache::lonlocal::texthash(
-            'tfcm' => 'The following changes were made',
-            'cbps' => 'communication blocking period(s)',
-            'werm' => 'was/were removed',
-            'wemo' => 'was/were modified',
-            'wead' => 'was/were added',
-            'ncwm' => 'No changes were made.' 
-    );
-    my %adds = ();
-    my %removals = ();
-    my %cancels = ();
-    my $modtotal = 0;
-    my $canceltotal = 0;
-    my $addtotal = 0;
-    my %blocking = ();
-    $r->print('<h3>'.$lt{'head'}.'</h3>');
-    foreach (keys %ENV) {
-        if ($_ =~ m/^form\.modify_(\w+)$/) {
-            $adds{$1} = $1;
-            $removals{$1} = $1;
-            $modtotal ++;
-        } elsif ($_ =~ m/^form\.cancel_(\d+)$/) {
-            $cancels{$1} = $1;
-            unless ( defined($removals{$1}) ) {
-                $removals{$1} = $1;
-                $canceltotal ++;
-            }
-        } elsif ($_ =~ m/^form\.add_(\d+)$/) {
-            $adds{$1} = $1;
-            $addtotal ++;
-        }
-    }
-
-    foreach (keys %removals) {
-        my $hashkey = $ENV{'form.key_'.$_};
-        &Apache::lonnet::del('comm_block',["$hashkey"],
-                         $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-                         $ENV{'course.'.$ENV{'request.course.id'}.'.num'}
-                         );
-    }
-    foreach (keys %adds) {
-        unless ( defined($cancels{$_}) ) {
-            my ($newstart,$newend) = &get_dates_from_form($_);
-            my $newkey = $newstart.'____'.$newend;
-            $blocking{$newkey} = $ENV{'user.name'}.'@'.$ENV{'user.domain'}.':'.$ENV{'form.title_'.$_};
-        }
-    }
-    if ($addtotal + $modtotal > 0) {
-        &Apache::lonnet::put('comm_block',\%blocking,
-                     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-                     $ENV{'course.'.$ENV{'request.course.id'}.'.num'}
-                     );
-    }
-    my $chgestotal = $canceltotal + $modtotal + $addtotal;
-    if ($chgestotal > 0) {
-        $r->print($lt{'tfcm'}.'<ul>');
-        if ($canceltotal > 0) {
-            $r->print('<li>'.$canceltotal.' '.$lt{'cbps'},' '.$lt{'werm'}.'</li>');
-        }
-        if ($modtotal > 0) {
-            $r->print('<li>'.$modtotal.' '.$lt{'cbps'},' '.$lt{'wemo'}.'</li>');
-        }
-        if ($addtotal > 0) {
-            $r->print('<li>'.$addtotal.' '.$lt{'cbps'},' '.$lt{'wead'}.'</li>');
-        }
-        $r->print('</ul>');
-    } else {
-        $r->print($lt{'ncwm'});
-    }
-    $r->print('<br />');
-    return;
-}
-
-sub get_dates_from_form {
-    my $item = shift;
-    my $startdate = &Apache::lonhtmlcommon::get_date_from_form('startdate_'.$item);
-    my $enddate   = &Apache::lonhtmlcommon::get_date_from_form('enddate_'.$item);
-    return ($startdate,$enddate);
-}
-
-sub get_blockdates {
-    my ($records,$blockcount) = @_;
-    $$blockcount = 0;
-    %{$records} = &Apache::lonnet::dump('comm_block',
-                         $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-                         $ENV{'course.'.$ENV{'request.course.id'}.'.num'}
-                         );
-    $$blockcount = keys %{$records};
-                                                                                                             
-    foreach (keys %{$records}) {
-        if ($_ eq 'error: 2 tie(GDBM) Failed while attempting dump') {
-            $$blockcount = 0;
-            last;
-        }
-    }
-}
-
-sub display_blocker_status {
-    my ($r,$records,$ltext) = @_;
-    my $parmcount = 0;
-    my @bgcols = ("#eeeeee","#dddddd");
-    my $function = &Apache::loncommon::get_users_function();
-    my $color = &Apache::loncommon::designparm($function.'.tabbg',
-                                                    $ENV{'user.domain'});
-    my %lt = &Apache::lonlocal::texthash(
-        'modi' => 'Modify',
-        'canc' => 'Cancel',
-    );
-    $r->print(<<"END");
-<table border="0" cellpadding="0" cellspacing="0">
- <tr>
-  <td width="100%" bgcolor="#000000">
-   <table width="100%" border="0" cellpadding="1" cellspacing="0">
-    <tr>
-     <td width="100%" bgcolor="#000000">
-      <table border="0" cellpadding="3" cellspacing="3" bgcolor="#FFFFFF">
-       <tr bgcolor="$color">
-        <td><b>$$ltext{'dura'}</b></td>
-        <td><b>$$ltext{'setb'}</b></td>
-        <td><b>$$ltext{'even'}</b></td>
-        <td><b>$$ltext{'actn'}?</b></td>
-       </tr>
-END
-    foreach (sort keys %{$records}) {
-        my $iter = $parmcount%2;
-        my $onchange = 'onFocus="javascript:window.document.forms['.
-                       "'blockform'].elements['modify_".$parmcount."'].".
-                       'checked=true;"';
-        my ($start,$end) = split/____/,$_;
-        my $startform = &Apache::lonhtmlcommon::date_setter('blockform','startdate_'.$parmcount,$start,$onchange);
-        my $endform = &Apache::lonhtmlcommon::date_setter('blockform','enddate_'.$parmcount,$end,$onchange);
-        my ($setter,$title) = split/:/,$$records{$_};
-        my ($setuname,$setudom) = split/@/,$setter;
-        my $settername = &Apache::loncommon::plainname($setuname,$setudom);
-        $r->print(<<"END");
-       <tr bgcolor="$bgcols[$iter]">
-        <td>$$ltext{'star'}:&nbsp;$startform<br/>$$ltext{'endd'}:&nbsp;&nbsp;$endform</td>
-        <td>$settername</td>
-        <td><input type="text" name="title_$parmcount" size="15" value="$title"/><input type="hidden" name="key_$parmcount" value="$_"></td>
-        <td>$lt{'modi'}?&nbsp;<input type="checkbox" name="modify_$parmcount"/><br />$lt{'canc'}?&nbsp;&nbsp;<input type="checkbox" name="cancel_$parmcount"/>
-       </tr>
-END
-        $parmcount ++;
-    }
-    $r->print(<<"END");
-      </table>
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
-</table>
-<br />
-<br />
-END
-    return $parmcount;
-}
-
-sub display_addblocker_table {
-    my ($r,$parmcount,$ltext) = @_;
-    my $start = time;
-    my $end = $start + (60 * 60 * 2); #Default is an exam of 2 hours duration.
-    my $onchange = 'onFocus="javascript:window.document.forms['.
-                   "'blockform'].elements['add_".$parmcount."'].".
-                   'checked=true;"';
-    my $startform = &Apache::lonhtmlcommon::date_setter('blockform','startdate_'.$parmcount,$start,$onchange);
-    my $endform = &Apache::lonhtmlcommon::date_setter('blockform','enddate_'.$parmcount,$end,$onchange);
-    my $function = &Apache::loncommon::get_users_function();
-    my $color = &Apache::loncommon::designparm($function.'.tabbg',
-                                                    $ENV{'user.domain'});
-    my %lt = &Apache::lonlocal::texthash(
-        'addb' => 'Add block',
-        'exam' => 'e.g., Exam 1',
-        'addn' => 'Add new communication blocking periods'
-    );
-    $r->print(<<"END");
-<h4>$lt{'addn'}</h4> 
-<table border="0" cellpadding="0" cellspacing="0">
- <tr>
-  <td width="100%" bgcolor="#000000">
-   <table width="100%" border="0" cellpadding="1" cellspacing="0">
-    <tr>
-     <td width="100%" bgcolor="#000000">
-      <table border="0" cellpadding="3" cellspacing="3" bgcolor="#FFFFFF">
-       <tr bgcolor="#CCCCFF">
-        <td><b>$$ltext{'dura'}</b></td>
-        <td><b>$$ltext{'even'} $lt{'exam'}</b></td>
-        <td><b>$$ltext{'actn'}?</b></td>
-       </tr>
-       <tr bgcolor="#eeeeee">
-        <td>$$ltext{'star'}:&nbsp;$startform<br />$$ltext{'endd'}:&nbsp;&nbsp;$endform</td>
-        <td><input type="text" name="title_$parmcount" size="15" value=""/></td>
-        <td>$lt{'addb'}?&nbsp;<input type="checkbox" name="add_$parmcount" value="1"/></td>
-       </tr>
-      </table>
-     </td>
-    </tr>
-   </table>
-  </td>
- </tr>
-</table>
-END
-    return;
-}
-
-sub blockcheck {
-    my ($setters,$startblock,$endblock) = @_;
-    # Retrieve active student roles and active course coordinator/instructor roles
-    my @livecses = ();
-    my @staffcses = ();
-    $$startblock = 0;
-    $$endblock = 0;
-    foreach (keys %ENV) {
-        if ($_ =~ m-^user\.role\.(st|cc|in)\./(.+)$-) {
-            my $role = $1;
-            my $cse = $2;
-            $cse =~ s|/|_|;
-            if ($ENV{$_} =~ m/^(\d*)\.(\d*)$/) {
-                unless (($2 > 0 && $2 < time) || ($1 > time)) {
-                    if ($role eq 'st') {
-                        push @livecses, $cse;
-                    } else {
-                        unless (grep/^$cse$/,@staffcses) {
-                            push @staffcses, $cse;
-                        }
-                    }
-                }
-            }
-        } elsif ($_ =~ m-user\.role\.cr/(\w+)/(\w+)/([^/]+)\./(.+)$- ) { 
-            my $rolepriv = $ENV{'user.role..rolesdef_'.$3};
-        }
-    }
-    # Retrieve blocking times and identity of blocker for active courses for students.
-    if (@livecses > 0) {
-        foreach my $cse (@livecses) {
-            my ($cdom,$crs) = split/_/,$cse;
-            if ( (grep/^$cse$/,@staffcses) && ($ENV{'request.role'} !~ m-^st\./$cdom/$crs$-) ) {
-                next;
-            } else {
-                %{$$setters{$cse}} = ();
-                @{$$setters{$cse}{'staff'}} = ();
-                @{$$setters{$cse}{'times'}} = ();
-                my %records = &Apache::lonnet::dump('comm_block',$cdom,$crs);
-                foreach (keys %records) {
-                    if ($_ =~ m/^(\d+)____(\d+)$/) {
-                        if ($1 <= time && $2 >= time) {
-                            my ($staff,$title) = split/:/,$records{$_};
-                            push @{$$setters{$cse}{'staff'}}, $staff;
-                            push @{$$setters{$cse}{'times'}}, $_;
-                            if ( ($$startblock == 0) || ($$startblock > $1) ) {
-                                $$startblock = $1;
-                            }
-                            if ( ($$endblock == 0) || ($$endblock < $2) ) {
-                                $$endblock = $2;
-                            }
-                        }
-                    }
-                }
-            }
-        }
+    if (defined($userfolders{$counter})) {
+        delete($userfolders{$counter});
     }
+    return %userfolders;
 }
 
-sub build_block_table {
-    my ($r,$startblock,$endblock,$setters) = @_;
-    my $function = &Apache::loncommon::get_users_function();
-    my $color = &Apache::loncommon::designparm($function.'.tabbg',
-                                                    $ENV{'user.domain'});
-    my %lt = &Apache::lonlocal::texthash(
-        'cacb' => 'Currently active communication blocks',
-        'cour' => 'Course',
-        'dura' => 'Duration',
-        'blse' => 'Block set by'
-    ); 
-    $r->print(<<"END");
-<br /<br />$lt{'cacb'}:<br /><br />
-<table border="0" cellpadding="0" cellspacing="0">
- <tr>
-  <td width="100%" bgcolor="#000000">
-   <table width="100%" border="0" cellpadding="1" cellspacing="0">
-    <tr>
-     <td width="100%" bgcolor="#000000">
-      <table border="0" cellpadding="3" cellspacing="3" bgcolor="#FFFFFF">
-       <tr bgcolor="$color">
-        <td><b>$lt{'cour'}</b></td>
-        <td><b>$lt{'dura'}</b></td>
-        <td><b>$lt{'blse'}</b></td>
-       </tr>
-END
-    foreach (keys %{$setters}) {
-        my %courseinfo=&Apache::lonnet::coursedescription($_);
-        for (my $i=0; $i<@{$$setters{$_}{staff}}; $i++) {
-            my ($uname,$udom) = split/\@/,$$setters{$_}{staff}[$i];
-            my $fullname = &Apache::loncommon::plainname($uname,$udom);
-            my ($openblock,$closeblock) = split/____/,$$setters{$_}{times}[$i];
-            $openblock = &Apache::lonlocal::locallocaltime($openblock);
-            $closeblock= &Apache::lonlocal::locallocaltime($closeblock);
-            $r->print('<tr><td>'.$courseinfo{'description'}.'</td>'.
-                      '<td>'.$openblock.' to '.$closeblock.'</td>'.
-                      '<td>'.$fullname.' ('.$uname.'@'.$udom.
-                      ')</td></tr>');
-        }
-    }
-    $r->print('</table></td></tr></table></td></tr></table>');
-}
-
-# ----------------------------------------------------------- Display a message
-
-sub displaymessage {
-    my ($r,$msgid,$folder)=@_;
-    my $suffix=&foldersuffix($folder);
-    my %blocked = ();
-    my %setters = ();
-    my $startblock = 0;
-    my $endblock = 0;
-    my $numblocked = 0;
-# info to generate "next" and "previous" buttons and check if message is blocked
-    &blockcheck(\%setters,\$startblock,\$endblock);
-    my @messages=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder);
-    if ( $blocked{$msgid} eq 'ON' ) {
-        &printheader($r,'/adm/email',&mt('Display a Message'));
-        $r->print(&mt('You attempted to display a message that is currently blocked because you are enrolled in one or more courses for which there is an ongoing online exam.'));
-        &build_block_table($r,$startblock,$endblock,\%setters);
-        return;
-    }
-    &statuschange($msgid,'read',$folder);
-    my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]);
-    my %content=&unpackagemsg($message{$msgid});
-
-    my $counter=0;
-    $r->print('<pre>');
-    my $escmsgid=&Apache::lonnet::escape($msgid);
-    foreach (@messages) {
-	if ($_->[5] eq $escmsgid){
-	    last;
-	}
-	$counter++;
-    }
-    $r->print('</pre>');
-    my $number_of_messages = scalar(@messages); #subtract 1 for last index
-# start output
-    &printheader($r,'/adm/email?display='.&Apache::lonnet::escape($msgid),'Display a Message','',$content{'baseurl'});
-    my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'});
-# Functions
-    $r->print('<table border="2" width="100%"><tr bgcolor="#FFFFAA"><td>'.&mt('Functions').':</td>'.
-	      '<td><a href="/adm/email?replyto='.&Apache::lonnet::escape($msgid).$sqs.
-	      '"><b>'.&mt('Reply').'</b></a></td>'.
-	      '<td><a href="/adm/email?forward='.&Apache::lonnet::escape($msgid).$sqs.
-	      '"><b>'.&mt('Forward').'</b></a></td>'.
-	      '<td><a href="/adm/email?markunread='.&Apache::lonnet::escape($msgid).$sqs.
-	      '"><b>'.&mt('Mark Unread').'</b></a></td>'.
-	      '<td><a href="/adm/email?markdel='.&Apache::lonnet::escape($msgid).$sqs.
-	      '"><b>Delete</b></a></td>'.
-	      '<td><a href="/adm/email?sortedby='.$ENV{'form.sortedby'}.
-	      '&folder='.&Apache::lonnet::escape($folder).
-	      '"><b>'.&mt('Display all Messages').'</b></a></td>');
-    if ($counter > 0){
-	$r->print('<td><a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.
-		  '"><b>'.&mt('Previous').'</b></a></td>');
-    }
-    if ($counter < $number_of_messages - 1){
-	$r->print('<td><a href="/adm/email?display='.$messages[$counter+1]->[5].$sqs.
-		  '"><b>'.&mt('Next').'</b></a></td>');
-    }
-    $r->print('</tr></table>');
-    $r->print('<br /><b>'.&mt('Subject').':</b> '.$content{'subject'}.
-	      ($folder ne 'sent'?'<br /><b>'.&mt('From').':</b> '.
-	      &Apache::loncommon::aboutmewrapper(
-						 &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),
-						 $content{'sendername'},$content{'senderdomain'}).' ('.
-	      $content{'sendername'}.' at '.
-	      $content{'senderdomain'}.') ':'<br /><b>'.&mt('To').':</b> '.
-	      &Apache::loncommon::aboutmewrapper(
-						 &Apache::loncommon::plainname($content{'recuser'},$content{'recdomain'}),
-						 $content{'recuser'},$content{'recdomain'}).' ('.
-	      $content{'recuser'}.' at '.
-	      $content{'recdomain'}.') ').
-	      ($content{'courseid'}?'<br /><b>'.&mt('Course').':</b> '.$courseinfo{'description'}.
-	       ($content{'coursesec'}?' ('.&mt('Group/Section').': '.$content{'coursesec'}.')':''):'').
-	      '<br /><b>'.&mt('Time').':</b> '.$content{'time'}.
-	      '<p><pre>'.
-	      &Apache::lontexconvert::msgtexconverted($content{'message'},1).
-	      '</pre><hr />'.&displayresource(%content).'</p>');
-    return;   
-}
-
-# =========================================================== Show the citation
-
-sub displayresource {
-    my %content=@_;
-#
-# If the recipient is in the same course that the message was sent from and
-# has sufficient privileges, show "all details," else show citation
-#
-    if (($ENV{'request.course.id'} eq $content{'courseid'})
-     && (&Apache::lonnet::allowed('vgr',$content{'courseid'}))) {
-	my $symb=&Apache::lonnet::symbread($content{'baseurl'});
-# Could not get a symb, give up
-	unless ($symb) { return $content{'citation'}; }
-# Have a symb, can render
-	return '<h2>'.&mt('Current attempts of student (if applicable)').'</h2>'.
-	    &Apache::loncommon::get_previous_attempt($symb,
-						     $content{'sendername'},
-						     $content{'senderdomain'},
-						     $content{'courseid'}).
-	    '<hr /><h2>'.&mt('Current screen output (if applicable)').'</h2>'.
-	    &Apache::loncommon::get_student_view($symb,
-						 $content{'sendername'},
-						 $content{'senderdomain'},
-						 $content{'courseid'}).
-	    '<h2>'.&mt('Correct Answer(s) (if applicable)').'</h2>'.
-	    &Apache::loncommon::get_student_answers($symb,
-						    $content{'sendername'},
-						    $content{'senderdomain'},
-						    $content{'courseid'});
-    } else {
-	return $content{'citation'};
-    }
-}
-
-# ================================================================== The Header
-
-sub header {
-    my ($r,$title,$baseurl)=@_;
-    $r->print('<html><head><title>Communication and Messages</title>');
-    if ($baseurl) {
-	$r->print("<base href=\"http://$ENV{'SERVER_NAME'}/$baseurl\" />");
-    }
-    $r->print(&Apache::loncommon::studentbrowser_javascript().'</head>'.
-	      &Apache::loncommon::bodytag('Communication and Messages'));
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs
-                  (undef,($title?$title:'Communication and Messages')));
-
-}
-
-# ---------------------------------------------------------------- Print header
-
-sub printheader {
-    my ($r,$url,$desc,$title,$baseurl)=@_;
-    &Apache::lonhtmlcommon::add_breadcrumb
-	({href=>$url,
-	  text=>$desc});
-    &header($r,$title,$baseurl);
-}
-
-
-# ===================================================================== Handler
-
-sub handler {
-    my $r=shift;
-
-# ----------------------------------------------------------- Set document type
-    
-    &Apache::loncommon::content_type($r,'text/html');
-    $r->send_http_header;
-    
-    return OK if $r->header_only;
-    
-# --------------------------- Get query string for limited number of parameters
-    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-        ['display','replyto','forward','markread','markdel','markunread',
-         'sendreply','compose','sendmail','critical','recname','recdom',
-         'recordftf','sortedby','block','folder','startdis','interdis']);
-    $sqs='&sortedby='.$ENV{'form.sortedby'}.
-	 '&startdis='.$ENV{'form.startdis'}.
-	 '&interdis='.$ENV{'form.interdis'};
-
-# ------------------------------------------------------ They checked for email
-    unless ($ENV{'form.block'}) {
-        &Apache::lonnet::put('email_status',{'recnewemail'=>0});
-    }
-
-# ----------------------------------------------------------------- Breadcrumbs
-
-    &Apache::lonhtmlcommon::clear_breadcrumbs();
-    &Apache::lonhtmlcommon::add_breadcrumb
-        ({href=>"/adm/communicate",
-          text=>"Communication/Messages",
-          faq=>12,bug=>'Communication Tools',});
-
-# ------------------------------------------------------------------ Get Folder
-
-    my $folder=$ENV{'form.folder'};
-    unless ($folder) { 
-	$folder=''; 
-    } else {
-	$sqs='&folder='.&Apache::lonnet::escape($folder);
-    }
-
-# --------------------------------------------------------------------- Display
-
-    $startdis=$ENV{'form.startdis'};
-    unless ($startdis) { $startdis=0; }
-    $interdis=$ENV{'form.interdis'};
-    unless ($interdis) { $interdis=20; }
-
-# --------------------------------------------------------------- Render Output
-
-    if ($ENV{'form.display'}) {
-	&displaymessage($r,$ENV{'form.display'},$folder);
-    } elsif ($ENV{'form.replyto'}) {
-	&compout($r,'',$ENV{'form.replyto'},undef,undef,$folder);
-    } elsif ($ENV{'form.confirm'}) {
-	&printheader($r,'','Confirmed Receipt');
-	foreach (keys %ENV) {
-	    if ($_=~/^form\.rec\_(.*)$/) {
-		$r->print('<b>'.&mt('Confirming Receipt').':</b> '.
-			  &user_crit_received($1).'<br>');
-	    }
-	    if ($_=~/^form\.reprec\_(.*)$/) {
-		my $msgid=$1;
-		$r->print('<b>'.&mt('Confirming Receipt').':</b> '.
-			  &user_crit_received($msgid).'<br>');
-		&compout($r,'','','',$msgid);
-	    }
-	}
-	&discrit($r);
-    } elsif ($ENV{'form.critical'}) {
-	&printheader($r,'','Displaying Critical Messages');
-	&discrit($r);
-    } elsif ($ENV{'form.forward'}) {
-	&compout($r,$ENV{'form.forward'});
-    } elsif ($ENV{'form.markdel'}) {
-	&printheader($r,'','Deleted Message');
-	&statuschange($ENV{'form.markdel'},'deleted',$folder);
-	&disall($r,$folder);
-    } elsif ($ENV{'form.markedmove'}) {
-	my $total=0;
-	foreach (keys %ENV) {
-	    if ($_=~/^form\.delmark_(.*)$/) {
-		&movemsg(&Apache::lonnet::unescape($1),$folder,
-			 $ENV{'form.movetofolder'});
-		$total++;
-	    }
-	}
-	&printheader($r,'','Moved Messages');
-	$r->print('Moved '.$total.' message(s)<p>');
-	&disall($r,$folder);
-    } elsif ($ENV{'form.markeddel'}) {
-	my $total=0;
-	foreach (keys %ENV) {
-	    if ($_=~/^form\.delmark_(.*)$/) {
-		&statuschange(&Apache::lonnet::unescape($1),'deleted',$folder);
-		$total++;
-	    }
-	}
-	&printheader($r,'','Deleted Messages');
-	$r->print('Deleted '.$total.' message(s)<p>');
-	&disall($r,$folder);
-    } elsif ($ENV{'form.markunread'}) {
-	&printheader($r,'','Marked Message as Unread');
-	&statuschange($ENV{'form.markunread'},'new');
-	&disall($r,$folder);
-    } elsif ($ENV{'form.compose'}) {
-	&compout($r,'','',$ENV{'form.compose'});
-    } elsif ($ENV{'form.recordftf'}) {
-	&facetoface($r,$ENV{'form.recordftf'});
-    } elsif ($ENV{'form.block'}) {
-        &examblock($r,$ENV{'form.block'});
-    } elsif ($ENV{'form.sendmail'}) {
-	my $sendstatus='';
-	if ($ENV{'form.send'}) {
-	    &printheader($r,'','Messages being sent.');
-	    $r->rflush();
-	    my %content=();
-	    undef %content;
-	    if ($ENV{'form.forwid'}) {
-		my $msgid=$ENV{'form.forwid'};
-		my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
-		%content=&unpackagemsg($message{$msgid},1);
-		&statuschange($msgid,'forwarded');
-		$ENV{'form.message'}.="\n\n-- Forwarded message --\n\n".
-		    $content{'message'};
-	    }
-	    if ($ENV{'form.replyid'}) {
-		my $msgid=$ENV{'form.replyid'};
-		my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
-		%content=&unpackagemsg($message{$msgid},1);
-		&statuschange($msgid,'replied');
-	    }
-	    my %toaddr=();
-	    undef %toaddr;
-	    if ($ENV{'form.sendmode'} eq 'group') {
-		foreach (keys %ENV) {
-		    if ($_=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) {
-			$toaddr{$1}='';
-		    }
-		}
-	    } elsif ($ENV{'form.sendmode'} eq 'upload') {
-		foreach (split(/[\n\r\f]+/,$ENV{'form.upfile'})) {
-		    my ($rec,$txt)=split(/\s*\:\s*/,$_);
-		    if ($txt) {
-			$rec=~s/\@/\:/;
-			$toaddr{$rec}.=$txt."\n";
-		    }
-		}
-	    } else {
-		$toaddr{$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}}='';
-	    }
-	    if ($ENV{'form.additionalrec'}) {
-		foreach (split(/\,/,$ENV{'form.additionalrec'})) {
-		    my ($auname,$audom)=split(/\@/,$_);
-		    $toaddr{$auname.':'.$audom}='';
-		}
-	    }
-
-	    foreach (keys %toaddr) {
-		my ($recuname,$recdomain)=split(/\:/,$_);
-		my $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'});
-		if ($toaddr{$_}) { $msgtxt.='<hr />'.$toaddr{$_}; }
-		my $thismsg;    
-		if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && 
-		    (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
-		    $r->print(&mt('Sending critical message').' '.$recuname.'@'.$recdomain.': ');
-		    $thismsg=&user_crit_msg($recuname,$recdomain,
-						    &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
-						    $msgtxt,
-						    $ENV{'form.sendbck'});
-		} else {
-		    $r->print(&mt('Sending').' '.$recuname.'@'.$recdomain.': ');
-		    $thismsg=&user_normal_msg($recuname,$recdomain,
-						      &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
-						      $msgtxt,
-						      $content{'citation'});
-                    if (($ENV{'request.course.id'}) && ($ENV{'form.sendmode'} eq 'group')) {
-                        &user_normal_msg_raw(
-                        $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
-                        $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-                        'Broadcast ['.$recuname.':'.$recdomain.']',
-                        $msgtxt);
-                    }
-		}
-		$r->print($thismsg.'<br />');
-		$sendstatus.=' '.$thismsg;
-	    }
-	} else {
-	    &printheader($r,'','No messages sent.'); 
-	}
-	if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
-	    $r->print('<br /><font color="green">'.&mt('Completed.').'</font>');
-	    if ($ENV{'form.displayedcrit'}) {
-		&discrit($r);
-	    } else {
-		&Apache::loncommunicate::menu($r);
-	    }
-	} else {
-	    $r->print(
-		      '<h2><font color="red">'.&mt('Could not deliver message').'</font></h2>'.
-		      &mt('Please use the browser "Back" button and correct the recipient addresses')
-		      );
-	}
-    } elsif ($ENV{'form.newfolder'}) {
-	&printheader($r,'','New Folder');
-	&makefolder($ENV{'form.newfolder'});
-	&disall($r,$ENV{'form.newfolder'});
-    } else {
-	&printheader($r,'','Display All Messages');
-	&disall($r,$folder);
-    }
-    $r->print('</body></html>');
-    return OK;
-}
-# ================================================= Main program, reset counter
-
-BEGIN {
-    $msgcount=0;
-}
-
-=pod
-
-=back
-
-=cut
-
-1; 
-
+1;
 __END__
 
-
-
-
-
-
-