--- loncom/interface/lonmsgdisplay.pm	2006/12/06 23:44:33	1.46
+++ loncom/interface/lonmsgdisplay.pm	2006/12/07 21:06:57	1.48
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.46 2006/12/06 23:44:33 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.48 2006/12/07 21:06:57 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -224,16 +224,17 @@ function folder_choice(targetform,caller
    <table border="0" cellspacing="2" cellpadding="2">
     <tr>
      <td align="center"><b>'.$lt{'fold'}.'</b><br />'."\n".
-	&Apache::loncommon::select_form($folder,'folder',%formhash).'
+         &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>
+          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).'
+         &Apache::loncommon::select_form('view','folderaction',%actions).'
      </td><td><br />'.
     '<input type="button" value="'.$lt{'go'}.'" onClick="javascript:folder_choice(this.form,'."'change'".');" />
      </td>
@@ -244,7 +245,7 @@ function folder_choice(targetform,caller
    <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 />'.
+    '<td align="center"><b>'.&mt('New Folder').'</b><br />'.
     '<input type="text" size="15" name="newfolder" value="" />
     </td></tr></table>
   </td>
@@ -252,18 +253,18 @@ function folder_choice(targetform,caller
 </table>'."\n".
     '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" />'.
     '<input type="hidden" name="renamed" value="" />'.
-    ($folder=~/^(new|critical)/?'</form>':'');
+        ($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',
-    );
+    my %permfolders = 
+	&Apache::lonlocal::texthash(''         => 'INBOX',
+				    'trash'    => 'TRASH',
+				    'new'      => 'New Messages Only',
+				    'critical' => 'Critical',
+				    'sent'     => 'Sent Messages',
+				    );
     return %permfolders;
 }
 
@@ -323,19 +324,18 @@ sub makefolder {
         while (defined($userfolders{$folder_id})) {
             $folder_id ++;
         }
-        my %folderinfo = (
-                           id => $folder_id,
-                           created => time,
-                         );
+        my %folderinfo = ( id      => $folder_id,
+                           created => time, );
         $outcome =  
-        &Apache::lonnet::put('email_folders',{$newfolder => \%folderinfo,
-                                             "\0".'idcount' => $folder_id});
+	    &Apache::lonnet::put('email_folders',{$newfolder => \%folderinfo,
+						  "\0".'idcount' => $folder_id});
         my $releaseresult = &release_msgfolder_lock();
         if ($releaseresult ne 'ok') {
             $warning = $releaseresult;
         }
     } else {
-        $outcome = 'Error - could not obtain lock on email folders record.';
+        $outcome = 
+	    &mt('Error - could not obtain lock on email folders record.');
     }
     return ($outcome,$warning);
 }
@@ -386,10 +386,8 @@ sub renamefolder {
     if (ref($userfolders{$folder}) eq 'HASH') {
         %folderinfo = %{$userfolders{$folder}};
     } else {
-        %folderinfo = (
-                             id => $folder,
-                        created => $userfolders{$folder},
-                      );
+        %folderinfo = ( id      => $folder,
+                        created => $userfolders{$folder},);
     }
     my $outcome =
      &Apache::lonnet::put('email_folders',{$newname => \%folderinfo});
@@ -401,14 +399,12 @@ sub renamefolder {
 
 sub get_msgfolder_lock {
     # get lock for mail folder counter.
-    my $lockhash = {
-                  "\0".'lock_counter' => time,
-                   };
+    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;
+        sleep(1);
         $gotlock = &Apache::lonnet::newput('email_folders',$lockhash);
     }
     return $gotlock;
@@ -847,7 +843,7 @@ sub get_course_desc {
             if (defined($env{'course.'.$fromcid.'.description'})) {
                 $description = $env{'course.'.$fromcid.'.description'};
             } else {
-                my %courseinfo=&Apache::lonnet::coursedescription($fromcid);                $description = $courseinfo{'description'};
+                my %courseinfo=&Apache::lonnet::coursedescription($fromcid);
                 $description = $courseinfo{'description'};
             }
             $$descriptions{$fromcid} = $description;
@@ -893,14 +889,14 @@ sub disnew {
                     $blocked{$id} = 'ON';
                     $numblocked ++;
                 } else {
-                    push @newmsgs, { 
+                    push(@newmsgs, { 
                         msgid    => $msgid,
                         sendtime => $sendtime,
                         shortsub => $shortsubj,
                         from     => $fromname,
                         fromdom  => $fromdom,
-                        course   => $description 
-                        }
+                        course   => $description, 
+		    });
                 }
             }
         }
@@ -908,18 +904,18 @@ sub disnew {
     if ($#newmsgs >= 0) {
         $r->print(<<TABLEHEAD);
 <h2>$lt{'nm'}</h2>
-<table class="LC_mail_list"><tr><th>&nbsp</th>
+<table class="LC_mail_list"><tr><th>&nbsp;</th>
 <th>$lt{'da'}</th><th>$lt{'us'}</th><th>$lt{'do'}</th><th>$lt{'su'}</th><th>$lt{'co'}</th></tr>
 TABLEHEAD
         foreach my $msg (@newmsgs) {
             $r->print(<<"ENDLINK");
 <tr class="LC_mail_new">
-<td><a href="/adm/email?dismode=new&display=$msg->{'msgid'}">$lt{'op'}</a></td>
+<td><a href="/adm/email?dismode=new&amp;display=$msg->{'msgid'}">$lt{'op'}</a></td>
 ENDLINK
             foreach my $item ('sendtime','from','fromdom','shortsub','course') {
                 $r->print("<td>$msg->{$item}</td>");
             }
-            $r->print("</td></tr>");
+            $r->print("</tr>");
         }
         $r->print('</table>');
     } elsif ($numblocked == 0) {
@@ -997,7 +993,7 @@ ENDDISHEADER
     if ($lastdis>$#temp) { $lastdis=$#temp; }
     $r->print(&scrollbuttons($startdis,$number,$firstdis,$lastdis,$totalnumber));
     $r->print('<form method="post" name="disall" action="/adm/email">'.
-	      '<table class="LC_mail_list"><tr><th colspan="3">&nbsp</th><th>');
+	      '<table class="LC_mail_list"><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 {
@@ -2282,7 +2278,7 @@ sub handler {
     unless ($dismode) { 
 	$dismode=''; 
     } else {
-	$sqs.='&dismode='.&escape($dismode);
+	$sqs.='&amp;dismode='.&escape($dismode);
     }
 
 # --------------------------------------------------------------------- Display