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

Diff for /loncom/interface/lonmsgdisplay.pm between versions 1.56.2.1 and 1.57

version 1.56.2.1, 2006/12/23 06:22:36 version 1.57, 2006/12/23 07:21:00
Line 132  use LONCAPA; Line 132  use LONCAPA;
 # Querystring component with sorting type  # Querystring component with sorting type
 my $sqs;  my $sqs;
 my $startdis;  my $startdis;
 my $interdis;  
   
 # ============================================================ List all folders  # ============================================================ List all folders
   
Line 230  function folder_choice(targetform,caller Line 229  function folder_choice(targetform,caller
     }      }
 }  }
 </script>|;  </script>|;
       my %show = ('select_form_order' => [10,20,50,100,200],
    map {$_=>$_} (10,20,50,100,200));
   
      
     $output .= '      $output .= '
 <form method="post" action="/adm/email" name="folderlist">  <form method="post" action="/adm/email" name="folderlist">
 <table border="0" cellspacing="2" cellpadding="2">  <table border="0" cellspacing="2" cellpadding="2">
Line 240  function folder_choice(targetform,caller Line 243  function folder_choice(targetform,caller
      <td align="center"><b>'.$lt{'fold'}.'</b><br />'."\n".       <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>
      <td align="center"><b>'.$lt{'show'}.'</b><br />       <td align="center"><b>'.$lt{'show'}.'</b><br />'."\n".
       <select name="interdis">'.           &Apache::loncommon::select_form($env{'form.interdis'},'interdis',
           join("\n",map { '<option value="'.$_.'"'.   %show).'
       ($_==$interdis?' selected="selected"':'').'>'.$_.'</option>'   
  }  
        (10,20,50,100,200)).'</select>  
      </td>       </td>
      <td align="center"><b>'.$lt{'status'}.'</b><br />'."\n".       <td align="center"><b>'.$lt{'status'}.'</b><br />'."\n".
        &Apache::loncommon::select_form($msgstatus,'msgstatus',%statushash).'         &Apache::loncommon::select_form($msgstatus,'msgstatus',%statushash).'
Line 301  sub scrollbuttons { Line 301  sub scrollbuttons {
     $start++; $maxdis++;$first++;$finish++;      $start++; $maxdis++;$first++;$finish++;
   
     my %statushash = &get_msgstatus_types();      my %statushash = &get_msgstatus_types();
       my $status;
       if ($msgstatus eq '') {
           $status = &mt('All');
       } else {
           $status = $statushash{$msgstatus};
       }
     return      return
  '<b>'.&mt('Page').'</b>: '.      '<b>'.&mt('Page').'</b>: '. 
  '<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="'.$start.'" onChange="this.form.submit()" /> of '.$maxdis.     '<input type="text" size="5" name="startdis" value="'.$start.'" onChange="this.form.submit()" /> of '.$maxdis.
  '<input type="submit" name="nextview" value="'.&mt('Next').'" />'.     '<input type="submit" name="nextview" value="'.&mt('Next').'" />'.
  '<input type="submit" name="lastview" value="'.&mt('Last').'" /><br />'.     '<input type="submit" name="lastview" value="'.&mt('Last').'" /><br />'.
  &mt('_location_in_mail_folder',$msgstatus,$statushash{$msgstatus},     &mt('<b>[_1] messages</b>: showing messages [_2] through [_3] of [_4].',$status,$first,$finish,$total).'</form>';
     $first,$finish,$total).'</form>';  
 }  }
 # =============================================================== Status Change  # =============================================================== Status Change
   
Line 389  sub deletefolder { Line 393  sub deletefolder {
     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.',$folder).          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.');
     }      }
     my $delresult = &Apache::lonnet::del('email_folders',[$folder]);      my $delresult = &Apache::lonnet::del('email_folders',[$folder]);
     return $delresult;      return $delresult;
Line 888  sub get_course_desc { Line 892  sub get_course_desc {
   
 sub disall {  sub disall {
     my ($r,$folder,$msgstatus)=@_;      my ($r,$folder,$msgstatus)=@_;
       my %saveable = ('folder'    => 'scalar',
       'msgstatus' => 'scalar',
       'sortedby'  => 'scalar',
       'interdis'  => 'scalar',
       );
       &Apache::loncommon::store_settings('user','mail',\%saveable);
       &Apache::loncommon::restore_settings('user','mail',\%saveable);
       $folder    ||= $env{'form.folder'};
       $msgstatus ||= $env{'form.msgstatus'};
       $env{'form.interdis'} ||= 20;
   
     $r->print(&folderlist($folder,$msgstatus));      $r->print(&folderlist($folder,$msgstatus));
     if ($folder eq 'critical') {      if ($folder eq 'critical') {
  &discrit($r);   &discrit($r);
Line 961  ENDDISHEADER Line 976  ENDDISHEADER
     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;
     if ($totalnumber < 1) {      if ($totalnumber < 1) {
  $r->print('<h2>'.&mt('_empty_mail_folder',          if ($msgstatus eq '') {
      $msgstatus,      $r->print('<h2>'.&mt('Empty Folder').'</h2>');
      $statushash{$msgstatus}).'</h2>');          } elsif ($msgstatus eq 'replied') {
               $r->print('<h2>'.&mt('You have not replied to any messages in this folder.').'</h2>');
           } else { 
               $r->print('<h2>'.&mt('There are no '.lc($statushash{$msgstatus}).' messages in this folder.').'</h2>');
           }
  return;   return;
     }      }
     unless ($interdis) {      my $interdis = $env{'form.interdis'};
  $interdis=20;  
     }  
     my $number=int($totalnumber/$interdis);      my $number=int($totalnumber/$interdis);
     if ($interdis) {      if ($totalnumber%$interdis == 0) {
         if ($totalnumber%$interdis == 0) {   $number--; 
             $number--;   
         }  
     }      }
   
     if (($startdis<0) || ($startdis>$number)) { $startdis=$number; }      if (($startdis<0) || ($startdis>$number)) { $startdis=$number; }
Line 2391  sub handler { Line 2406  sub handler {
     }      }
     unless ($startdis) { $startdis=0; }      unless ($startdis) { $startdis=0; }
   
     $interdis=$env{'form.interdis'};  
     unless ($interdis) { $interdis=20; }  
     $sqs.='&interdis='.$interdis;  
   
     if ($env{'form.firstview'}) {      if ($env{'form.firstview'}) {
  $startdis=0;   $startdis=0;
     }      }
Removed from v.1.56.2.1  
changed lines
  Added in v.1.57

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