--- loncom/interface/lonmsgdisplay.pm	2006/08/29 00:28:51	1.35.2.5
+++ loncom/interface/lonmsgdisplay.pm	2006/12/07 01:11:38	1.47
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.35.2.5 2006/08/29 00:28:51 albertel Exp $
+# $Id: lonmsgdisplay.pm,v 1.47 2006/12/07 01:11:38 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -138,24 +138,134 @@ my $interdis;
 
 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'),
-			      'new' => &mt('New Messages Only'),
-                              'critical' => &mt('Critical'),
-			      'sent' => &mt('Sent Messages'),
-			      map { $_ => $_ } @allfolders)).
-			      ' '.&mt('Show').
-			      '<select name="interdis">'.
-			      join("\n",map { '<option value="'.$_.'"'.
-	 ($_==$interdis?' selected="selected"':'').'>'.$_.'</option>' }
-				   (10,20,50,100,200)).'</select>'.	
-   '<input type="submit" value="'.&mt('View Folder').'" /><br />'.
+    my %lt = &Apache::lonlocal::texthash(
+                actn => 'Action',
+                fold => 'Folder',
+                show => 'Show',
+                go   => 'Go',
+    );
+
+    my %actions = &Apache::lonlocal::texthash(
+                                view => 'View Folder',
+                                rename => 'Rename Folder',
+                                delete => 'Delete Folder',
+    );
+    $actions{'select_form_order'} = ['view','rename','delete'];
+
+    my %permfolders = &get_permanent_folders();
+    my $permlist = join("','",sort(keys(%permfolders)));
+    my ($permlistkeys,$permlistvals);
+    foreach my $key (sort(keys(%permfolders))) {
+        $permlistvals .= $permfolders{$key}."','";
+        $permlistkeys .= $key."','";
+    }
+    $permlistvals =~ s/','$//;
+    $permlistkeys =~ s/','$//;
+    my %gotfolders = &Apache::lonmsg::get_user_folders();
+    my %userfolders;
+
+    foreach my $key (keys(%gotfolders)) {
+        $userfolders{$key} = $key;
+    }
+    my @userorder = sort(keys(%userfolders));
+    my %formhash = (%permfolders,%userfolders);
+    my $folderlist = join("','",@userorder);
+    $folderlist .= "','".$permlistvals;
+
+    $formhash{'select_form_order'} = ['','critical','new',@userorder,'sent','trash'];
+    my $output = qq|<script type="text/javascript">
+function folder_choice(targetform,caller) {
+    var permfolders_keys = new Array('$permlistkeys');
+    var permfolders_vals = new Array('$permlistvals');
+    var allfolders = new Array('$folderlist');
+    if (caller == 'change') {
+        if (targetform.folderaction.options[targetform.folderaction.selectedIndex].value == 'rename') {
+            for (var i=0; i<permfolders_keys.length; i++) {
+                if (permfolders_keys[i] == targetform.folder.value) {
+                    alert("The '"+permfolders_vals[i]+"' folder may not be renamed as it is a mail folder provided by the system.");
+                    return;
+                }
+            }
+            var foldername=prompt('New Name for Folder','New Name');
+            if (foldername) {
+                targetform.renamed.value=foldername;
+                for (var i=0; i<allfolders.length; i++) {
+                    if (allfolders[i] == foldername) {
+                        alert("The folder may not be renamed '"+foldername+"' as this name is already in use for a system-provided or user-defined folder.");
+                        return;
+                    }
+                }
+                targetform.submit();
+            }
+        }
+        else {
+            targetform.submit();
+        }
+    }
+    if (caller == 'new') {
+        var newname=targetform.newfolder.value;
+        if (newname) {
+            for (var i=0; i<allfolders.length; i++) {
+                if (allfolders[i] == newname) {
+                    alert("The new folder may not be named '"+newname+"' as this name is already in use for a system-provided or user-defined folder.");
+                    return;
+                }
+            }
+            targetform.submit();
+        }
+    }
+}
+</script>|;
+    $output .= '
+<form method="post" action="/adm/email" name="folderlist">
+<table border="0" cellspacing="2" cellpadding="2">
+ <tr>
+  <td align="left">
+   <table border="0" cellspacing="2" cellpadding="2">
+    <tr>
+     <td align="center"><b>'.$lt{'fold'}.'</b><br />'."\n".
+         &Apache::loncommon::select_form($folder,'folder',%formhash).'
+     </td>
+     <td align="center"><b>'.$lt{'show'}.'</b><br />
+      <select name="interdis">'.
+          join("\n",map { '<option value="'.$_.'"'.
+			      ($_==$interdis?' selected="selected"':'').'>'.$_.'</option>' 
+			}
+	       (10,20,50,100,200)).'</select>
+     </td>
+     <td align="center"><b>'.$lt{'actn'}.'</b><br />'.
+         &Apache::loncommon::select_form('view','folderaction',%actions).'
+     </td><td><br />'.
+    '<input type="button" value="'.$lt{'go'}.'" onClick="javascript:folder_choice(this.form,'."'change'".');" />
+     </td>
+    </tr>
+   </table>
+  </td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+  <td align="right">
+   <table><tr><td><br />
+    <input type="button" value="'.&mt('Make New Folder').
+    '" onClick="javascript:folder_choice(this.form,'."'new'".');" /></td>'.
+    '<td align="center"><b>'.&mt('New Folder').'<br />'.
+    '<input type="text" size="15" name="newfolder" value="" />
+    </td></tr></table>
+  </td>
+ </tr>
+</table>'."\n".
     '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" />'.
-			      ($folder=~/^(new|critical)/?'</form>':'');
+    '<input type="hidden" name="renamed" value="" />'.
+        ($folder=~/^(new|critical)/?'</form>':'');
+    return $output;
+}
+
+sub get_permanent_folders {
+    my %permfolders = 
+	&Apache::lonlocal::texthash(''         => 'INBOX',
+				    'trash'    => 'TRASH',
+				    'new'      => 'New Messages Only',
+				    'critical' => 'Critical',
+				    'sent'     => 'Sent Messages',
+				    );
+    return %permfolders;
 }
 
 sub scrollbuttons {
@@ -195,14 +305,123 @@ sub statuschange {
 # ============================================================= Make new folder
 
 sub makefolder {
-    my ($newfolder)=@_;
-    if (($newfolder eq 'sent')
-     || ($newfolder eq 'critical')
-     || ($newfolder eq 'trash')
-     || ($newfolder eq 'new')) { return; }
-    &Apache::lonnet::put('email_folders',{$newfolder => time});
+    my ($newfolder) = @_;
+    my %permfolders = &get_permanent_folders();
+    my %userfolders = &Apache::lonmsg::get_user_folders();
+    my ($outcome,$warning);
+    if (defined($userfolders{$newfolder})) {
+        return &mt('The folder name: "[_1]" is already in use for an existing folder.',$newfolder);
+    }
+    foreach my $perm (keys(%permfolders)) {
+        if ($permfolders{$perm} eq $newfolder) {
+            return &mt('The folder name: "[_1]" is already used for one of the folders automatically generated by the system.',$newfolder);
+        }
+    } 
+    if (&get_msgfolder_lock() eq 'ok') {
+        my %counter_hash = &Apache::lonnet::get('email_folders',["\0".'idcount']);
+        my $lastcount = $counter_hash{"\0".'idcount'};
+        my $folder_id = $lastcount + 1;
+        while (defined($userfolders{$folder_id})) {
+            $folder_id ++;
+        }
+        my %folderinfo = ( id      => $folder_id,
+                           created => time, );
+        $outcome =  
+	    &Apache::lonnet::put('email_folders',{$newfolder => \%folderinfo,
+						  "\0".'idcount' => $folder_id});
+        my $releaseresult = &release_msgfolder_lock();
+        if ($releaseresult ne 'ok') {
+            $warning = $releaseresult;
+        }
+    } else {
+        $outcome = 
+	    &mt('Error - could not obtain lock on email folders record.');
+    }
+    return ($outcome,$warning);
+}
+
+# ============================================================= Delete folder
+
+sub deletefolder {
+    my ($folder)=@_;
+    my %permfolders = &get_permanent_folders();
+    if (defined($permfolders{$folder})) {
+        return &mt('The folder [_1] may not be deleted',$folder); 
+    }
+    my %userfolders = &Apache::lonmsg::get_user_folders();
+    if (!defined($userfolders{$folder})) {
+        return &mt('The folder [_1] does not exist so deletion is not required.',
+                   $folder);
+    }
+    # check folder is empty;
+    my $suffix=&Apache::lonmsg::foldersuffix($folder);
+    my @messages = &Apache::lonnet::getkeys('nohist_email'.$suffix);
+    if (@messages > 0) {
+        return &mt('The folder [_1] contains messages so it may not be deleted.').
+               '<br />'.
+               &mt('Delete or move the messages to a different folder first.');
+    }
+    my $delresult = &Apache::lonnet::del('email_folders',[$folder]);
+    return $delresult;
+}
+
+sub renamefolder {
+    my ($folder) = @_;
+    my $newname = $env{'form.renamed'};
+    my %permfolders = &get_permanent_folders();
+    if ($env{'form.renamed'} eq '') {
+        return &mt('The folder "[_1]" may not be renamed to "[_2]" as the new name you requested is an invalid name.',$folder,$newname);
+    }
+    if (defined($permfolders{$newname})) {
+        return &mt('The folder "[_1]" may not be renamed to "[_2]" as the new name you requested is reserved for folders provided automatically by the system.',$folder,$newname);
+    }
+    my %userfolders = &Apache::lonmsg::get_user_folders();
+    if (defined($userfolders{$newname})) {
+        return &mt('The folder "[_1]" may not be renamed to "[_2]" because the new name you requested is already being used for an existing folder.',$folder,$newname);
+    }
+    if (!defined($userfolders{$folder})) {
+        return &mt('The folder "[_1]" could not be renamed to "[_2]" because the folder does not exist.',$folder,$newname);
+    }
+    my %folderinfo;
+    if (ref($userfolders{$folder}) eq 'HASH') {
+        %folderinfo = %{$userfolders{$folder}};
+    } else {
+        %folderinfo = ( id      => $folder,
+                        created => $userfolders{$folder},);
+    }
+    my $outcome =
+     &Apache::lonnet::put('email_folders',{$newname => \%folderinfo});
+    if ($outcome eq 'ok') {
+        $outcome = &Apache::lonnet::del('email_folders',[$folder]);
+    }
+    return $outcome;
 }
 
+sub get_msgfolder_lock {
+    # get lock for mail folder counter.
+    my $lockhash = { "\0".'lock_counter' => time, };
+    my $tries = 0;
+    my $gotlock = &Apache::lonnet::newput('email_folders',$lockhash);
+    while (($gotlock ne 'ok') && $tries <3) {
+        $tries ++;
+        sleep(1);
+        $gotlock = &Apache::lonnet::newput('email_folders',$lockhash);
+    }
+    return $gotlock;
+}
+
+sub release_msgfolder_lock {
+    #  remove lock
+    my @del_lock = ("\0".'lock_counter');
+    my $dellockoutcome=&Apache::lonnet::del('email_folders',\@del_lock);
+    if ($dellockoutcome ne 'ok') {
+        return ('<br />'.&mt('Warning: failed to release lock for counter').'<br />');
+    } else {
+        return 'ok';
+    }
+}
+
+
 # ======================================================== Move between folders
 
 sub movemsg {
@@ -486,8 +705,8 @@ sub discrit {
         '<input type="hidden" name="confirm" value="true" />';
     my %what=&Apache::lonnet::dump('critical');
     my $result = '';
-    foreach (sort keys %what) {
-        my %content=&Apache::lonmsg::unpackagemsg($what{$_});
+    foreach my $key (sort(keys(%what))) {
+        my %content=&Apache::lonmsg::unpackagemsg($what{$key});
         next if ($content{'senderdomain'} eq '');
         $result.='<hr />'.&mt('From').': <b>'.
 &Apache::loncommon::aboutmewrapper(
@@ -500,8 +719,8 @@ $content{'sendername'}.':'.
             '</pre><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_'.$_.'" '.
+            '<input type="submit" name="rec_'.$key.'" value="'.&mt('Confirm Receipt').'" />'.
+            '<input type="submit" name="reprec_'.$key.'" '.
                   'value="'.&mt('Confirm Receipt and Reply').'" />';
     }
     # Check to see if there were any messages.
@@ -520,6 +739,7 @@ sub sortedmessages {
     my ($blocked,$startblock,$endblock,$numblocked,$folder) = @_;
     my $suffix=&Apache::lonmsg::foldersuffix($folder);
     my @messages = &Apache::lonnet::getkeys('nohist_email'.$suffix);
+
     #unpack the varibles and repack into temp for sorting
     my @temp;
     my %descriptions;
@@ -649,17 +869,15 @@ sub disnew {
     my @msgids = sort(&Apache::lonnet::getkeys('nohist_email'));
     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);
+    my ($startblock,$endblock) = &Apache::loncommon::blockcheck(\%setters,'com');
     my %status_cache = 
 	&Apache::lonnet::get('email_status',\@msgids);
     my %descriptions;
-    foreach (@msgids) {
-	my $msgid=&escape($_);
+    foreach my $id (@msgids) {
+	my $msgid=&escape($id);
         my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)=
 	    &Apache::lonmsg::unpackmsgid($msgid,undef,undef,\%status_cache);
         if (defined($sendtime) && $sendtime!~/error/) {
@@ -668,7 +886,7 @@ sub disnew {
             $sendtime = &Apache::lonlocal::locallocaltime($sendtime);
             if ($status eq 'new') {
                 if ($numsendtime >= $startblock && ($numsendtime <= $endblock && $endblock > 0) ) {
-                    $blocked{$_} = 'ON';
+                    $blocked{$id} = 'ON';
                     $numblocked ++;
                 } else {
                     push @newmsgs, { 
@@ -694,8 +912,8 @@ TABLEHEAD
 <tr class="LC_mail_new">
 <td><a href="/adm/email?dismode=new&display=$msg->{'msgid'}">$lt{'op'}</a></td>
 ENDLINK
-            foreach ('sendtime','from','fromdom','shortsub','course') {
-                $r->print("<td>$msg->{$_}</td>");
+            foreach my $item ('sendtime','from','fromdom','shortsub','course') {
+                $r->print("<td>$msg->{$item}</td>");
             }
             $r->print("</td></tr>");
         }
@@ -706,16 +924,10 @@ ENDLINK
     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);
+        $r->print('<h3>'.&mt('You have [quant,_1,blocked unread message,blocked unread messages].',$numblocked).'</h3>'."\n".
+                 &mt('[quant,_1,message is,messages are] not viewable because display of LON-CAPA messages sent to you by other students between [_2] and [_3] is currently being blocked because of online exams.',$numblocked,$beginblock,$finishblock).'<br />'."\n".
+                 &Apache::loncommon::build_block_table($startblock,$endblock,
+                                                       \%setters));
     }
 }
 
@@ -740,10 +952,8 @@ sub disfolder {
     my ($r,$folder)=@_;
     my %blocked = ();
     my %setters = ();
-    my $startblock;
-    my $endblock;
     my $numblocked = 0;
-    &blockcheck(\%setters,\$startblock,\$endblock);
+    my ($startblock,$endblock) = &Apache::loncommon::blockcheck(\%setters,'com');
     $r->print(<<ENDDISHEADER);
 <script type="text/javascript">
     function checkall() {
@@ -766,7 +976,7 @@ sub disfolder {
 </script>
 ENDDISHEADER
     my $fsqs='&folder='.$folder;
-    my @temp=sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder);
+    my @temp=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder);
     my $totalnumber=$#temp+1;
     unless ($totalnumber>0) {
 	$r->print('<h2>'.&mt('Empty Folder').'</h2>');
@@ -874,20 +1084,23 @@ ENDDISHEADER
 	      '<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=(); }
+    my %gotfolders = &Apache::lonmsg::get_user_folders();
+    my %userfolders;
+    foreach my $key (keys(%gotfolders)) {
+        $userfolders{$key} = $key;
+    }
     $r->print(
 	&Apache::loncommon::select_form('','movetofolder',
-			     ( map { $_ => $_ } @allfolders))
-	      );
+			                %userfolders));
     my $postedstartdis=$startdis+1;
     $r->print('<input type="hidden" name="folder" value="'.$folder.'" /><input type="hidden" name="startdis" value="'.$postedstartdis.'" /><input type="hidden" name="interdis" value="'.$env{'form.interdis'}.'" /></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);
+                  &mt('[_1,quant,message is, messages are] not viewable because display of LON-CAPA messages sent to you by other students between [_2] and [_3] is currently being blocked because of online exams.',$numblocked,$beginblock,$finishblock));
+        $r->print(&Apache::loncommon::build_block_table($startblock,$endblock,
+                                                        \%setters));
     }
 }
 
@@ -1039,7 +1252,7 @@ sub compout {
     my $latexHelp = Apache::loncommon::helpLatexCheatsheet();
     if ($broadcast ne 'upload') {
        $r->print(<<"ENDCOMP");
-<tr><td>$lt{'ad'}<br /><tt>username\@domain,username\@domain, ...
+<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" />
@@ -1077,14 +1290,14 @@ Subject: <input type="text" size="50" na
 <p>
 The file format for the uploaded portion of the message is:
 <pre>
-username1\@domain1: text
-username2\@domain2: text
-username3\@domain1: text
+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>
+<tt>username:domain</tt>, and appended to the general message text.</p>
 <p>
 <input type="file" name="upfile" size="40" /></p><p>
 $dispcrit
@@ -1135,8 +1348,8 @@ sub retrieve_instructor_comments {
 			 $env{'course.'.$env{'request.course.id'}.'.num'},
                          '%255b'.$user.'%253a'.$domain.'%255d');
     my $result='';
-    foreach (sort(keys(%records))) {
-        my %content=&Apache::lonmsg::unpackagemsg($records{$_});
+    foreach my $key (sort(keys(%records))) {
+        my %content=&Apache::lonmsg::unpackagemsg($records{$key});
         next if ($content{'senderdomain'} eq '');
         next if ($content{'subject'} !~ /^Record/);
 	# &Apache::lonfeedback::newline_to_br(\$content{'message'});
@@ -1163,8 +1376,8 @@ sub disfacetoface {
 			 $env{'course.'.$env{'request.course.id'}.'.num'},
                          '%255b'.$user.'%253a'.$domain.'%255d');
     my $result='';
-    foreach (sort keys %records) {
-        my %content=&Apache::lonmsg::unpackagemsg($records{$_});
+    foreach my $key (sort(keys(%records))) {
+        my %content=&Apache::lonmsg::unpackagemsg($records{$key});
         next if ($content{'senderdomain'} eq '');
 	&Apache::lonfeedback::newline_to_br(\$content{'message'});
         if ($content{'subject'}=~/^Record/) {
@@ -1311,8 +1524,8 @@ ENDBFORM
 sub examblock {
     my ($r,$action) = @_;
     unless ($env{'request.course.id'}) { return;}
-    if (!&Apache::lonnet::allowed('srm',$env{'request.course.id'})
-	&& ! &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
+    if (!&Apache::lonnet::allowed('dcm',$env{'request.course.id'})
+	&& ! &Apache::lonnet::allowed('dcm',$env{'request.course.id'}.
 				      '/'.$env{'request.course.sec'})) {
 	$r->print('Not allowed');
 	return;
@@ -1331,6 +1544,7 @@ sub examblock {
             'dura' => 'Duration',
             'setb' => 'Set by',
             'even' => 'Event',
+            'blck' => 'Blocked?',
             'actn' => 'Action',
             'star' => 'Start',
             'endd' => 'End'
@@ -1387,35 +1601,40 @@ sub blockstore {
     my $addtotal = 0;
     my %blocking = ();
     $r->print('<h3>'.$lt{'head'}.'</h3>');
-    foreach (keys %env) {
-        if ($_ =~ m/^form\.modify_(\w+)$/) {
+    foreach my $envkey (keys(%env)) {
+        if ($envkey =~ m/^form\.modify_(\d+)$/) {
             $adds{$1} = $1;
             $removals{$1} = $1;
             $modtotal ++;
-        } elsif ($_ =~ m/^form\.cancel_(\d+)$/) {
+        } elsif ($envkey =~ m/^form\.cancel_(\d+)$/) {
             $cancels{$1} = $1;
             unless ( defined($removals{$1}) ) {
                 $removals{$1} = $1;
                 $canceltotal ++;
             }
-        } elsif ($_ =~ m/^form\.add_(\d+)$/) {
+        } elsif ($envkey =~ m/^form\.add_(\d+)$/) {
             $adds{$1} = $1;
             $addtotal ++;
-        }
+        } 
     }
 
-    foreach (keys %removals) {
-        my $hashkey = $env{'form.key_'.$_};
+    foreach my $key (keys(%removals)) {
+        my $hashkey = $env{'form.key_'.$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($_);
+    foreach my $key (keys(%adds)) {
+        unless ( defined($cancels{$key}) ) {
+            my ($newstart,$newend) = &get_dates_from_form($key);
             my $newkey = $newstart.'____'.$newend;
-            $blocking{$newkey} = $env{'user.name'}.':'.$env{'user.domain'}.':'.$env{'form.title_'.$_};
+            my $blocktypes = &get_block_choices($key);
+            $blocking{$newkey} = {
+                          setter => $env{'user.name'}.':'.$env{'user.domain'},
+                          event  => &escape($env{'form.title_'.$key}),
+                          blocks => $blocktypes,
+                        };
         }
     }
     if ($addtotal + $modtotal > 0) {
@@ -1466,6 +1685,20 @@ sub get_blockdates {
     }
 }
 
+sub get_block_choices {
+    my $item = shift;
+    my $blocklist;
+    my ($typeorder,$types) = &blocktype_text();
+    foreach my $type (@{$typeorder}) {
+        if ($env{'form.'.$type.'_'.$item}) {
+            $blocklist->{$type} = 'on'; 
+        } else {
+            $blocklist->{$type} = 'off';
+        }
+    }
+    return $blocklist;
+}
+
 sub display_blocker_status {
     my ($r,$records,$ltext) = @_;
     my $parmcount = 0;
@@ -1474,13 +1707,15 @@ sub display_blocker_status {
         'modi' => 'Modify',
         'canc' => 'Cancel',
     );
+    my ($typeorder,$types) = &blocktype_text();
     $r->print(&Apache::loncommon::start_data_table());
     $r->print(<<"END");
   <tr>
-    <th>$$ltext{'dura'}</th>
-    <th>$$ltext{'setb'}</th>
-    <th>$$ltext{'even'}</th>
-    <th>$$ltext{'actn'}?</th>
+    <th>$ltext->{'dura'}</th>
+    <th>$ltext->{'setb'}</th>
+    <th>$ltext->{'even'}</th>
+    <th>$ltext->{'blck'}</th>
+    <th>$ltext->{'actn'}?</th>
   </tr>
 END
     foreach my $record (sort(keys(%{$records}))) {
@@ -1491,15 +1726,29 @@ END
         my $startform = &Apache::lonhtmlcommon::date_setter('blockform','startdate_'.$parmcount,$start,$onchange);
         my $endform = &Apache::lonhtmlcommon::date_setter('blockform','enddate_'.$parmcount,$end,$onchange);
 	
-	my ($setuname,$setudom,$title) = 
-	    &parse_block_record($$records{$record});
+	my ($setuname,$setudom,$title,$blocks) = 
+	    &Apache::loncommon::parse_block_record($$records{$record});
 	$title = &HTML::Entities::encode($title,'"<>&');
-        my $settername = &Apache::loncommon::plainname($setuname,$setudom);
+        my $settername = 
+           &Apache::loncommon::aboutmewrapper(
+                           &Apache::loncommon::plainname($setuname,$setudom),
+                           $setuname,$setudom);
         $r->print(&Apache::loncommon::start_data_table_row());
         $r->print(<<"END");
-        <td>$$ltext{'star'}:&nbsp;$startform<br/>$$ltext{'endd'}:&nbsp;&nbsp;$endform</td>
+        <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="$record" /></td>
+        <td>
+END
+        foreach my $block (@{$typeorder}) {
+            my $blockstatus = '';
+            if ($blocks->{$block} eq 'on') {
+                $blockstatus = 'checked="true"';
+            }
+            $r->print('<label><input type="checkbox" name="'.$block.'_'.$parmcount.'" '.$blockstatus.' value="1" />'.$types->{$block}.'</label><br />');
+        }
+        $r->print(<<"END");
+        </td>      
         <td><label>$lt{'modi'}?&nbsp;<input type="checkbox" name="modify_$parmcount" /></label><br /><label>$lt{'canc'}?&nbsp;&nbsp;<input type="checkbox" name="cancel_$parmcount" /></label>
 END
         $r->print(&Apache::loncommon::end_data_table_row());
@@ -1513,19 +1762,6 @@ END
     return $parmcount;
 }
 
-sub parse_block_record {
-    my ($record) = @_;
-    my ($setuname,$setudom,$title);
-    my @data = split(/:/,$record,3);
-    if (scalar(@data) eq 2) {
-	$title = $data[1];
-	($setuname,$setudom) = split(/@/,$data[0]);
-    } else {
-	($setuname,$setudom,$title) = @data;
-    }
-    return ($setuname,$setudom,$title);
-}
-
 sub display_addblocker_table {
     my ($r,$parmcount,$ltext) = @_;
     my $start = time;
@@ -1540,21 +1776,30 @@ sub display_addblocker_table {
         'exam' => 'e.g., Exam 1',
         'addn' => 'Add new communication blocking periods'
     );
+    my ($typeorder,$types) = &blocktype_text();
     $r->print(<<"END");
 <h4>$lt{'addn'}</h4> 
 END
     $r->print(&Apache::loncommon::start_data_table());
     $r->print(<<"END");
    <tr>
-     <th>$$ltext{'dura'}</th>
-     <th>$$ltext{'even'} $lt{'exam'}</th>
-     <th>$$ltext{'actn'}?</th>
+     <th>$ltext->{'dura'}</th>
+     <th>$ltext->{'even'} $lt{'exam'}</th>
+     <th>$ltext->{'blck'}</th>
+     <th>$ltext->{'actn'}?</th>
    </tr>
 END
-   $r->print(&Apache::loncommon::start_data_table_row());
+    $r->print(&Apache::loncommon::start_data_table_row());
     $r->print(<<"END");
-     <td>$$ltext{'star'}:&nbsp;$startform<br />$$ltext{'endd'}:&nbsp;&nbsp;$endform</td>
+     <td>$ltext->{'star'}:&nbsp;$startform<br />$ltext->{'endd'}:&nbsp;&nbsp;$endform</td>
      <td><input type="text" name="title_$parmcount" size="15" value="" /></td>
+     <td>
+END
+    foreach my $block (@{$typeorder}) {
+        $r->print('<label><input type="checkbox" name="'.$block.'_'.$parmcount.'" value="1" />'.$types->{$block}.'</label><br />');
+     }
+     $r->print(<<"END");
+     </td> 
      <td><label>$lt{'addb'}?&nbsp;<input type="checkbox" name="add_$parmcount" value="1" /></label></td>
 END
     $r->print(&Apache::loncommon::end_data_table_row());
@@ -1562,86 +1807,17 @@ END
     return;
 }
 
-sub blockcheck {
-    my ($setters,$startblock,$endblock) = @_;
-    # Retrieve active student roles and active course coordinator/instructor roles
-    my %live_courses =
-	map { $_ => 1} &Apache::loncommon::findallcourses();
-    # FIXME should really probe for apriv, but ::allowed can only probe the 
-    #       currently active role
-    my %staff_of =
-	map { $_ => 1} &Apache::loncommon::findallcourses(['cc','in']);
-
-    # Retrieve blocking times and identity of blocker for active courses
-    # for students.
-    return if (!%live_courses);
-
-    foreach my $course (keys(%live_courses)) {
-	my $cdom = $env{'course.'.$course.'.domain'};
-	my $cnum = $env{'course.'.$course.'.num'};
-
-	# if they are a staff member and are currently not playing student
-	next if ( $staff_of{$course} 
-		  && ($env{'request.role'} !~ m{^st\./$cdom/$cnum}));
-
-	$setters->{$course} = {};
-	$setters->{$course}{'staff'} = [];
-	$setters->{$course}{'times'} = [];
-	my %records = &Apache::lonnet::dump('comm_block',$cdom,$cnum);
-	foreach my $record (keys %records) {
-	    my ($start,$end) = ($record =~ m/^(\d+)____(\d+)$/);
-	    if ($start <= time && $end >= time) {
-		my ($staff_name,$staff_dom,$title) = 
-		    &parse_block_record($records{$record});
-		push(@{$$setters{$course}{'staff'}}, [$staff_name,$staff_dom]);
-		push(@{$$setters{$course}{'times'}}, [$start,$end]);
-		if ( ($$startblock == 0) || ($$startblock > $1) ) {
-		    $$startblock = $1;
-		}
-		if ( ($$endblock == 0) || ($$endblock < $2) ) {
-		    $$endblock = $2;
-		}
-	    }
-	}
-    }
-}
-
-sub build_block_table {
-    my ($r,$startblock,$endblock,$setters) = @_;
-    my %lt = &Apache::lonlocal::texthash(
-        'cacb' => 'Currently active communication blocks',
-        'cour' => 'Course',
-        'dura' => 'Duration',
-        'blse' => 'Block set by'
+sub blocktype_text {
+    my %types = &Apache::lonlocal::texthash(
+        'com' => 'Messaging',
+        'chat' => 'Chat',
+        'boards' => 'Discussion',
+        'port' => 'Portfolio',
+        'groups' => 'Groups',
+        'blogs' => 'Blogs',
     );
-    $r->print(<<"END");
-<br /><br />$lt{'cacb'}:<br /><br />
-END
-    $r->print(&Apache::loncommon::start_data_table());
-    $r->print(<<"END");
-<tr>
- <th>$lt{'cour'}</th>
- <th>$lt{'dura'}</th>
- <th>$lt{'blse'}</th>
-</tr>
-END
-    foreach my $course (keys(%{$setters})) {
-        my %courseinfo=&Apache::lonnet::coursedescription($course);
-        for (my $i=0; $i<@{$$setters{$course}{staff}}; $i++) {
-            my ($uname,$udom) = @{$$setters{$course}{staff}[$i]};
-            my $fullname = &Apache::loncommon::plainname($uname,$udom);
-            my ($openblock,$closeblock) = @{$$setters{$course}{times}[$i]};
-            $openblock = &Apache::lonlocal::locallocaltime($openblock);
-            $closeblock= &Apache::lonlocal::locallocaltime($closeblock);
-            $r->print(&Apache::loncommon::start_data_table_row().
-		      '<td>'.$courseinfo{'description'}.'</td>'.
-                      '<td>'.$openblock.' to '.$closeblock.'</td>'.
-                      '<td>'.$fullname.' ('.$uname.':'.$udom.
-                      ')</td>'.
-		       &Apache::loncommon::end_data_table_row());
-        }
-    }
-    $r->print(&Apache::loncommon::end_data_table());
+    my $typeorder = ['com','chat','boards','port','groups','blogs'];
+    return ($typeorder,\%types);
 }
 
 # ----------------------------------------------------------- Display a message
@@ -1651,13 +1827,11 @@ sub displaymessage {
     my $suffix=&Apache::lonmsg::foldersuffix($folder);
     my %blocked = ();
     my %setters = ();
-    my $startblock = 0;
-    my $endblock = 0;
     my $numblocked = 0;
     my $crstype = &Apache::loncommon::course_type();
 
 # info to generate "next" and "previous" buttons and check if message is blocked
-    &blockcheck(\%setters,\$startblock,\$endblock);
+    my ($startblock,$endblock) = &Apache::loncommon::blockcheck(\%setters,'com');
     my @messages=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder);
     if ( $blocked{$msgid} eq 'ON' ) {
         &printheader($r,'/adm/email',&mt('Display a Message'));
@@ -1790,7 +1964,7 @@ sub header {
     
     my $extra = &Apache::loncommon::studentbrowser_javascript();
     if ($baseurl) {
-	$extra .= "<base href=\"http://$ENV{'SERVER_NAME'}/$baseurl\" />";
+	$extra .= "<base href=\"".&Apache::lonnet::absolute_url()."/$baseurl\" />";
     }
     $r->print(&Apache::loncommon::start_page('Communication and Messages',
  					$extra));
@@ -1814,9 +1988,9 @@ sub storecomment {
     my ($r)=@_;
     my $msgtxt=&Apache::lonfeedback::clear_out_html($env{'form.message'});
     my $cleanmsgtxt='';
-    foreach (split(/[\n\r]/,$msgtxt)) {
-	unless ($_=~/^\s*(\>|\&gt\;)/) {
-	    $cleanmsgtxt.=$_."\n";
+    foreach my $line (split(/[\n\r]/,$msgtxt)) {
+	unless ($line=~/^\s*(\>|\&gt\;)/) {
+	    $cleanmsgtxt.=$line."\n";
 	}
     }
     my $key=&escape($env{'form.baseurl'}).'___'.time;
@@ -1833,8 +2007,8 @@ sub storedcommentlisting {
 	$r->print(&mt('No stored comments yet.'));
     } else {
 	my $found=0;
-	foreach (sort keys %msgs) {
-	    $r->print("\n".$msgs{$_}."<hr />");
+	foreach my $key (sort(keys(%msgs))) {
+	    $r->print("\n".$msgs{$key}."<hr />");
 	    $found=1;
 	}
 	unless ($found) {
@@ -1906,9 +2080,10 @@ sub sendoffmail {
 	    }
 	} elsif ($env{'form.sendmode'} eq 'upload') {
 	    foreach my $line (split(/[\n\r\f]+/,$env{'form.upfile'})) {
-		my ($rec,$txt)=split(/\s*\:\s*/,$line);
+                my ($rec,$txt) = ($line =~ /^([^:]+:[^:]+):(.*)$/);
 		if ($txt) {
-		    $rec=~s/\@/\:/;
+                    $rec =~ s/^\s+//;
+                    $rec =~ s/\s+$//;
 		    $toaddr{$rec}.=$txt."\n";
 		}
 	    }
@@ -1918,8 +2093,8 @@ sub sendoffmail {
 	    }
 	}
 	if ($env{'form.additionalrec'}) {
-	    foreach (split(/\,/,$env{'form.additionalrec'})) {
-		my ($auname,$audom)=split(/\@/,$_);
+	    foreach my $rec (split(/\,/,$env{'form.additionalrec'})) {
+		my ($auname,$audom)=split(/:/,$rec);
 		if (($auname ne "") && ($audom ne "")) {
 		    $toaddr{$auname.':'.$audom}='';
 		}
@@ -2140,12 +2315,12 @@ sub handler {
     } elsif ($env{'form.confirm'}) {
 	&printheader($r,'','Confirmed Receipt');
 	my $replying = 0;
-	foreach (keys %env) {
-	    if ($_=~/^form\.rec\_(.*)$/) {
+	foreach my $envkey (keys(%env)) {
+	    if ($envkey=~/^form\.rec\_(.*)$/) {
 		$r->print('<b>'.&mt('Confirming Receipt').':</b> '.
 			  &Apache::lonmsg::user_crit_received($1).'<br>');
 	    }
-	    if ($_=~/^form\.reprec\_(.*)$/) {
+	    if ($envkey=~/^form\.reprec\_(.*)$/) {
 		my $msgid=$1;
 		$r->print('<b>'.&mt('Confirming Receipt').':</b> '.
 			  &Apache::lonmsg::user_crit_received($msgid).'<br>');
@@ -2254,14 +2429,46 @@ sub handler {
 	}
     } elsif ($env{'form.newfolder'}) {
 	&printheader($r,'','New Folder');
-	&makefolder($env{'form.newfolder'});
-	&Apache::loncommunicate::menu($r);
-	&disall($r,$env{'form.newfolder'});
+        my $showfolder = $env{'form.newfolder'};
+	my ($makeresult,$warning) = &makefolder($env{'form.newfolder'});
+        if ($makeresult eq 'ok') {
+            $r->print(&mt('Mail folder "[_1]" created.',$showfolder).'<br />');
+        } else {
+            $r->print(&mt('Creation failed.').' '.$makeresult.'<br />'.
+                      $warning);
+            $showfolder = $folder;
+        }
+        &Apache::loncommunicate::menu($r);
+	&disall($r,$showfolder);
     } elsif ($env{'form.showcommentbaseurl'}) {
 	&storedcommentlisting($r);
+    } elsif ($env{'form.folderaction'} eq 'delete') {
+        &printheader($r,'','Deleted Folder');
+        my $showfolder = '';
+        my $delresult = &deletefolder($folder);
+        if ($delresult eq 'ok') {
+            $r->print(&mt('Mail folder "[_1]" deleted.',$folder).'<br />');
+        } else {
+            $r->print(&mt('Deletion failed.').' '.$delresult.'<br />');
+            $showfolder = $folder;
+        }
+        &Apache::loncommunicate::menu($r);
+        &disall($r,$showfolder);
+    } elsif ($env{'form.folderaction'} eq 'rename') {
+        &printheader($r,'','Renamed Folder');
+        my $showfolder = $env{'form.renamed'};
+        my $renresult = &renamefolder($folder);
+        if ($renresult eq 'ok') {
+            $r->print(&mt('Mail folder "[_1]" renamed "[_2]".',$folder,$showfolder).'<br />');
+        } else {
+            $r->print(&mt('Renaming failed.').' '.$renresult.'<br />');
+            $showfolder = $folder;
+        }
+        &Apache::loncommunicate::menu($r);
+        &disall($r,$showfolder);
     } else {
 	&printheader($r,'','Display All Messages');
-	&Apache::loncommunicate::menu($r); 
+	&Apache::loncommunicate::menu($r);
 	&disall($r,($folder?$folder:$dismode));
     }
     $r->print(&Apache::loncommon::end_page());