[BACK]Return to lonmsgdisplay.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonmsgdisplay.pm between versions 1.53 and 1.55

version 1.53, 2006/12/18 00:16:27 version 1.55, 2006/12/23 04:39:32
Line 178  sub folderlist { Line 178  sub folderlist {
     my %userfolders;      my %userfolders;
   
     foreach my $key (keys(%gotfolders)) {      foreach my $key (keys(%gotfolders)) {
         $key =~ s/(['"])/\$1/g;          $key =~ s/(['"])/\$1/g; #' stupid emacs
         $userfolders{$key} = $key;          $userfolders{$key} = $key;
     }      }
     my @userorder = sort(keys(%userfolders));      my @userorder = sort(keys(%userfolders));
Line 960  sub disfolder { Line 960  sub disfolder {
   
 </script>  </script>
 ENDDISHEADER  ENDDISHEADER
     my %gotfolders = &Apache::lonmsg::get_user_folders();  
     my %userfolders;  
     my $fsqs='&folder='.$folder;      my $fsqs='&folder='.$folder;
     my @temp=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder,$msgstatus);      my @temp=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder,$msgstatus);
     my $totalnumber=$#temp+1;      my $totalnumber=$#temp+1;
Line 971  ENDDISHEADER Line 970  ENDDISHEADER
         } elsif ($msgstatus eq 'replied') {          } elsif ($msgstatus eq 'replied') {
             $r->print('<h2>'.&mt('You have not replied to any messages in this folder.').'</h2>');              $r->print('<h2>'.&mt('You have not replied to any messages in this folder.').'</h2>');
         } else {           } else { 
             $r->print('<h2>'.&mt('There are no [_1] messages in this folder',lc($statushash{$msgstatus})).'</h2>');              $r->print('<h2>'.&mt('There are no '.lc($statushash{$msgstatus}).' messages in this folder.').'</h2>');
         }          }
  return;   return;
     }      }
Line 1108  ENDDISHEADER Line 1107  ENDDISHEADER
         $r->print('    <option value="markedunread">'.&mt('Mark Unread').'</option>'."\n");          $r->print('    <option value="markedunread">'.&mt('Mark Unread').'</option>'."\n");
     }      }
     $r->print('   <option value="markedforward">'.&mt('Forward').'</option>'."\n");      $r->print('   <option value="markedforward">'.&mt('Forward').'</option>'."\n");
   
       my %gotfolders = &Apache::lonmsg::get_user_folders();
     if (keys(%gotfolders) > 0) {      if (keys(%gotfolders) > 0) {
         $r->print('   <option value="markedmove">'.&mt('Move to Folder ->').          $r->print('   <option value="markedmove">'.&mt('Move to Folder ->').
                   '</option>');                    '</option>');
     }      }
     $r->print("\n".'</select></td>'."\n");      $r->print("\n".'</select></td>'."\n");
     foreach my $key (keys(%gotfolders)) {  
         $userfolders{$key} = $key;  
     }  
     if (keys(%gotfolders) > 0) {      if (keys(%gotfolders) > 0) {
         $r->print('<td align="center"><b>'.&mt('Destination folder').'<b><br />');          $r->print('<td align="center"><b>'.&mt('Destination folder').'<b><br />');
    my %userfolders;
         foreach my $key (keys(%gotfolders)) {          foreach my $key (keys(%gotfolders)) {
             $userfolders{$key} = $key;              $userfolders{$key} = $key;
         }          }
Removed from v.1.53  
changed lines
  Added in v.1.55

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>