Diff for /loncom/interface/lonmsg.pm between versions 1.113 and 1.114

version 1.113, 2004/11/11 18:24:44 version 1.114, 2004/11/11 20:41:53
Line 523  sub folderlist { Line 523  sub folderlist {
  &mt('Folder').': '.   &mt('Folder').': '.
  &Apache::loncommon::select_form($folder,'folder',   &Apache::loncommon::select_form($folder,'folder',
      ('' => &mt('INBOX'),'trash' => &mt('TRASH'),       ('' => &mt('INBOX'),'trash' => &mt('TRASH'),
         'new' => &mt('New Messages Only'),
                               'critical' => &mt('Critical'),                                'critical' => &mt('Critical'),
       'sent' => &mt('Sent Messages'),        'sent' => &mt('Sent Messages'),
       map { $_ => $_ } @allfolders)).        map { $_ => $_ } @allfolders)).
Line 530  sub folderlist { Line 531  sub folderlist {
     &Apache::loncommon::select_form($interdis,'interdis',      &Apache::loncommon::select_form($interdis,'interdis',
 (' 10' => '10', ' 20' => '20', ' 50' => '50', '100' => '100', '200' => '200')).  (' 10' => '10', ' 20' => '20', ' 50' => '50', '100' => '100', '200' => '200')).
    '<input type="submit" value="'.&mt('View Folder').'" /><br />'.     '<input type="submit" value="'.&mt('View Folder').'" /><br />'.
         ($folder!~/^(new|critical)/?
    '<input type="submit" name="firstview" value="'.&mt('First').'" />'.     '<input type="submit" name="firstview" value="'.&mt('First').'" />'.
    '<input type="submit" name="prevview" value="'.&mt('Previous').'" />'.     '<input type="submit" name="prevview" value="'.&mt('Previous').'" />'.
    '<input type="text" size="5" name="startdis" value="'.$startdis.'" />'.     '<input type="text" size="5" name="startdis" value="'.$startdis.'" />'.
    '<input type="submit" name="nextview" value="'.&mt('Next').'" />'.     '<input type="submit" name="nextview" value="'.&mt('Next').'" />'.
    '<input type="submit" name="lastview" value="'.&mt('Last').'" />'.     '<input type="submit" name="lastview" value="'.&mt('Last').'" />':'').
  '<a href="/adm/email?critical=display'.$sqs.'">'.  
     &mt('View Critical Messages').'</a>'.  
     '</form>';      '</form>';
 }  }
   
Line 571  sub makefolder { Line 571  sub makefolder {
     my ($newfolder)=@_;      my ($newfolder)=@_;
     if (($newfolder eq 'sent')      if (($newfolder eq 'sent')
      || ($newfolder eq 'critical')       || ($newfolder eq 'critical')
      || ($newfolder eq 'trash')) { return; }       || ($newfolder eq 'trash')
        || ($newfolder eq 'new')) { return; }
     &Apache::lonnet::put('email_folders',{$newfolder => time});      &Apache::lonnet::put('email_folders',{$newfolder => time});
 }  }
   
Line 863  ENDLINK Line 864  ENDLINK
 sub disall {  sub disall {
     my ($r,$folder)=@_;      my ($r,$folder)=@_;
     $r->print(&folderlist($folder));      $r->print(&folderlist($folder));
     unless ($folder) {      if ($folder eq 'new') {
  &disnew();   &disnew($r);
  return;      } elsif ($folder eq 'critical') {
     }   &discrit($r);
     if ($folder eq 'critical') {      } else {
  &discrit();   &disfolder($r,$folder);
     }      }
   }
   
   # ============================================================ Display a folder
   
   sub disfolder {
       my ($r,$folder)=@_;
     my %blocked = ();      my %blocked = ();
     my %setters = ();      my %setters = ();
     my $startblock;      my $startblock;

Removed from v.1.113  
changed lines
  Added in v.1.114


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