[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.56

version 1.53, 2006/12/18 00:16:27 version 1.56, 2006/12/23 06:19:10
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 381  sub deletefolder { Line 381  sub deletefolder {
     my ($folder)=@_;      my ($folder)=@_;
     my %permfolders = &get_permanent_folders();      my %permfolders = &get_permanent_folders();
     if (defined($permfolders{$folder})) {      if (defined($permfolders{$folder})) {
         return &mt('The folder [_1] may not be deleted',$folder);           return &mt('The folder "[_1]" may not be deleted',$folder); 
     }      }
     my %userfolders = &Apache::lonmsg::get_user_folders();      my %userfolders = &Apache::lonmsg::get_user_folders();
     if (!defined($userfolders{$folder})) {      if (!defined($userfolders{$folder})) {
         return &mt('The folder [_1] does not exist so deletion is not required.',          return &mt('The folder "[_1]" does not exist so deletion is not required.',
                    $folder);                     $folder);
     }      }
     # check folder is empty;      # check folder is empty;
     my $suffix=&Apache::lonmsg::foldersuffix($folder);      my $suffix=&Apache::lonmsg::foldersuffix($folder);
     my @messages = &Apache::lonnet::getkeys('nohist_email'.$suffix);      my @messages = &Apache::lonnet::getkeys('nohist_email'.$suffix);
     if (@messages > 0) {      if (@messages > 0) {
         return &mt('The folder [_1] contains messages so it may not be deleted.').          return &mt('The folder "[_1]" contains messages so it may not be deleted.',$folder).
                '<br />'.                 '<br />'.
                &mt('Delete or move the messages to a different folder first.');                 &mt('Delete or move the messages to a different folder first.');
     }      }
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.56

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