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

version 1.53, 2006/12/18 00:16:27 version 1.69, 2007/04/22 02:25:36
Line 33  package Apache::lonmsgdisplay; Line 33  package Apache::lonmsgdisplay;
   
 =head1 NAME  =head1 NAME
   
 Apache::lonmsg: supports internal messaging  Apache::lonmsgdisplay: supports internal messaging
   
 =head1 SYNOPSIS  =head1 SYNOPSIS
   
 lonmsg provides routines for sending messages, receiving messages, and  lonmsgdisplay provides a handler to allow users to read, send, 
 a handler to allow users to read, send, and delete messages.  and delete messages, and to create and delete message folders,
   and to move messages between folders.
   
 =head1 OVERVIEW  =head1 OVERVIEW
   
Line 93  addresses on their B<PREF> screen, but g Line 94  addresses on their B<PREF> screen, but g
 are much more useful than traditional email can be made to be, even  are much more useful than traditional email can be made to be, even
 with HTML support.  with HTML support.
   
 Right now, this document will cover just how to send a message, since  
 it is likely you will not need to programmatically read messages,  
 since lonmsg already implements that functionality.  
   
 The routines used to package messages and unpackage messages are not  
 only used by lonmsg when creating/extracting messages for LON-CAPA's  
 internal messaging system, but also by lonnotify.pm which is available  
 for use by Domain Coordinators to broadcast standard e-mail to specified  
 users in their domain.  The XML packaging used in the two cases is very  
 similar.  The differences are the use of <recuser>$uname</recuser> and   
 <recdomain>$udom</recdomain> in stored internal messages, compared   
 with <recipient username="$uname:$udom">$email</recipient> in stored  
 Domain Coordinator e-mail for the storage of information about   
 recipients of the message/e-mail.  
   
 =head1 FUNCTIONS  
   
 =over 4  
   
 =cut  =cut
   
 use strict;  use strict;
Line 119  use Apache::lonnet; Line 101  use Apache::lonnet;
 use HTML::TokeParser();  use HTML::TokeParser();
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use Apache::loncommon();  use Apache::loncommon();
   use Apache::lonhtmlcommon();
 use Apache::lontexconvert();  use Apache::lontexconvert();
 use HTML::Entities();  use HTML::Entities();
 use Apache::lonlocal;  use Apache::lonlocal;
Line 132  use LONCAPA; Line 115  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 178  sub folderlist { Line 160  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 230  function folder_choice(targetform,caller Line 212  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 226  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 381  sub deletefolder { Line 364  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 774  sub sortedmessages { Line 757  sub sortedmessages {
     my ($blocked,$startblock,$endblock,$numblocked,$folder,$msgstatus) = @_;      my ($blocked,$startblock,$endblock,$numblocked,$folder,$msgstatus) = @_;
     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);
   
     #unpack the varibles and repack into temp for sorting      #unpack the varibles and repack into temp for sorting
     my @temp;      my @temp;
     my %descriptions;      my %descriptions;
Line 789  sub sortedmessages { Line 771  sub sortedmessages {
   
     foreach my $msgid (@messages) {      foreach my $msgid (@messages) {
  my $esc_msgid=&escape($msgid);   my $esc_msgid=&escape($msgid);
  my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid)=   my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid,$processid,$symb,$error) =
     &Apache::lonmsg::unpackmsgid($esc_msgid,$folder,undef,      &Apache::lonmsg::unpackmsgid($esc_msgid,$folder,undef,
  \%status_cache);   \%status_cache);
         next if ($msgstatus ne '' && $msgstatus ne $status);          next if ($msgstatus ne '' && $msgstatus ne $status);
Line 892  sub get_course_desc { Line 874  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 914  sub disfolder { Line 907  sub disfolder {
                       nome => 'No messages have been selected to apply ths action to.',                        nome => 'No messages have been selected to apply ths action to.',
                       chec => 'Check the checkbox for at least one message.',                          chec => 'Check the checkbox for at least one message.',  
     );      );
       my $jscript = &Apache::loncommon::check_uncheck_jscript();
     $r->print(<<ENDDISHEADER);      $r->print(<<ENDDISHEADER);
 <script type="text/javascript">  <script type="text/javascript">
     function checkall() {      $jscript
  for (i=0; i<document.forms.disall.delmark.length; i++) {  
     document.forms.disall.delmark[i].checked=true;  
         }  
     }  
   
     function uncheckall() {  
  for (i=0; i<document.forms.disall.delmark.length; i++) {  
     document.forms.disall.delmark[i].checked=false;  
         }  
     }  
     function checkfoldermove() {      function checkfoldermove() {
         if (document.disall.checkedaction.options[document.disall.checkedaction.selectedIndex].value == 'markedmove') {          if (document.disall.checkedaction.options[document.disall.checkedaction.selectedIndex].value == 'markedmove') {
             if (document.disall.movetofolder.options[document.disall.movetofolder.selectedIndex].value == "") {              if (document.disall.movetofolder.options[document.disall.movetofolder.selectedIndex].value == "") {
Line 946  sub disfolder { Line 931  sub disfolder {
             }               } 
         }          }
         var checktotal = 0;          var checktotal = 0;
         for (var i=0; i<document.forms.disall.delmark.length; i++) {          if (document.forms.disall.delmark.length > 0) {
             if (document.forms.disall.delmark[i].checked) {              for (var i=0; i<document.forms.disall.delmark.length; i++) {
                   if (document.forms.disall.delmark[i].checked) {
                       checktotal ++;
                   }
               }
           } else {
               if (document.forms.disall.delmark.checked) {
                 checktotal ++;                  checktotal ++;
             }              }
         }          }   
         if (checktotal == 0) {          if (checktotal == 0) {
             alert("$lt{'nome'}\\n$lt{'chec'}");              alert("$lt{'nome'}\\n$lt{'chec'}");
             return;              return;
Line 960  sub disfolder { Line 951  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 961  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>');
           }
           if ($numblocked > 0) {
               $r->print(&blocked_in_folder($numblocked,$startblock,$endblock,
                                            \%setters));
         }          }
  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 1047  ENDDISHEADER Line 1037  ENDDISHEADER
     }      }
     my ($dis_name,$dis_domain) = ($fromname,$fromdomain);      my ($dis_name,$dis_domain) = ($fromname,$fromdomain);
     if ($folder eq 'sent') {      if ($folder eq 'sent') {
  if (defined($recv_name) && !defined($recv_domain)) {                  if (defined($recv_name) && defined($recv_domain)) {
     $dis_name   = join('<br />',@{$recv_name});      if (ref($recv_name) eq 'ARRAY' && 
     $dis_domain = join('<br />',@{$recv_domain});                          ref($recv_domain) eq 'ARRAY') {
           $dis_name   = join('<br />',@{$recv_name});
           $dis_domain = join('<br />',@{$recv_domain});
                       }
  } else {   } else {
     my $msg_id  = &unescape($origID);      my $msg_id  = &unescape($origID);
     my %message = &Apache::lonnet::get('nohist_email'.$suffix,      my %message = &Apache::lonnet::get('nohist_email'.$suffix,
        [$msg_id]);         [$msg_id]);
     my %content = &Apache::lonmsg::unpackagemsg($message{$msg_id});      my %content = &Apache::lonmsg::unpackagemsg($message{$msg_id});
     $dis_name   = join('<br />',@{$content{'recuser'}});                      if (ref($content{'recuser'}) eq 'ARRAY') {
     $dis_domain = join('<br />',@{$content{'recdomain'}});          $dis_name   = join('<br />',@{$content{'recuser'}});
                       }
                       if (ref($content{'recdomain'}) eq 'ARRAY') {
           $dis_domain = join('<br />',@{$content{'recdomain'}});
                       }
  }   }
     }      }
             my $localsenttime = &Apache::lonlocal::locallocaltime($sendtime);              my $localsenttime = &Apache::lonlocal::locallocaltime($sendtime);
Line 1092  ENDDISHEADER Line 1089  ENDDISHEADER
     $r->print('<table border="0" cellspacing="2" cellpadding="2">      $r->print('<table border="0" cellspacing="2" cellpadding="2">
  <tr>   <tr>
   <td>'.    <td>'.
   '<input type="button" onclick="javascript:checkall()" value="'.&mt('Check All').'" /><br />'."\n".    '<input type="button" onclick="javascript:checkAll(document.disall.delmark)" value="'.&mt('Check All').'" /><br />'."\n".
   '<input type="button" onclick="javascript:uncheckall()" value="'.&mt('Uncheck All').'" />'."\n".    '<input type="button" onclick="javascript:uncheckAll(document.disall.delmark)" value="'.&mt('Uncheck All').'" />'."\n".
   '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" /></td><td>&nbsp;</td>'."\n".    '<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" /></td><td>&nbsp;</td>'."\n".
   '<td align="center"><b>'.&mt('Action').'</b><br />'."\n".    '<td align="center"><b>'.&mt('Action').'</b><br />'."\n".
   '  <select name="checkedaction" onchange="javascript:checkfoldermove()">'."\n");    '  <select name="checkedaction" onchange="javascript:checkfoldermove()">'."\n");
Line 1108  ENDDISHEADER Line 1105  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;
         }          }
Line 1132  ENDDISHEADER Line 1130  ENDDISHEADER
     my $postedstartdis=$startdis+1;      my $postedstartdis=$startdis+1;
     $r->print('<input type="hidden" name="folder" value="'.$folder.'" /><input type="hidden" name="startdis" value="'.$postedstartdis.'" /><input type="hidden" name="interdis" value="'.$env{'form.interdis'}.'" /><input type="hidden" name="msgstatus" value="'.$msgstatus.'" ><input type="hidden" name="markedaction" value="" /></form>');      $r->print('<input type="hidden" name="folder" value="'.$folder.'" /><input type="hidden" name="startdis" value="'.$postedstartdis.'" /><input type="hidden" name="interdis" value="'.$env{'form.interdis'}.'" /><input type="hidden" name="msgstatus" value="'.$msgstatus.'" ><input type="hidden" name="markedaction" value="" /></form>');
     if ($numblocked > 0) {      if ($numblocked > 0) {
         my $beginblock = &Apache::lonlocal::locallocaltime($startblock);          $r->print(&blocked_in_folder($numblocked,$startblock,$endblock,
         my $finishblock = &Apache::lonlocal::locallocaltime($endblock);                                       \%setters));
         $r->print('<br /><br />'.  
                   &mt('[quant,_1,message is, messages are] not viewable because display of LON-CAPA messages sent to you by other students between [_2] and [_3] is currently being blocked because of online exams.',$numblocked,$beginblock,$finishblock));  
         $r->print(&Apache::loncommon::build_block_table($startblock,$endblock,  
                                                         \%setters));  
     }      }
 }  }
   
   sub blocked_in_folder {
       my ($numblocked,$startblock,$endblock,$setters) = @_;
       my $beginblock = &Apache::lonlocal::locallocaltime($startblock);
       my $finishblock = &Apache::lonlocal::locallocaltime($endblock);
       my $output = '<br /><br />'.
                     &mt('[quant,_1,message is, messages are] not viewable because display of LON-CAPA messages sent to you by other students between [_2] and [_3] is currently being blocked because of online exams.',$numblocked,$beginblock,$finishblock);
       $output .= &Apache::loncommon::build_block_table($startblock,$endblock,
                                                        $setters);
       return $output;
   }
   
 # ============================================================== Compose output  # ============================================================== Compose output
   
 sub compout {  sub compout {
Line 1943  sub displaymessage { Line 1948  sub displaymessage {
         &build_block_table($r,$startblock,$endblock,\%setters);          &build_block_table($r,$startblock,$endblock,\%setters);
         return;          return;
     }      }
     &statuschange($msgid,'read',$folder);      if ($msgstatus eq '') {
           &statuschange($msgid,'read',$folder);
       }
     my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]);      my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]);
     my %content=&Apache::lonmsg::unpackagemsg($message{$msgid});      my %content=&Apache::lonmsg::unpackagemsg($message{$msgid});
   
Line 1982  sub displaymessage { Line 1989  sub displaymessage {
   '"><b>'.&mt('Next').'</b></a></td>');    '"><b>'.&mt('Next').'</b></a></td>');
     }      }
     $r->print('</tr></table>');      $r->print('</tr></table>');
       my $symb;
       if (defined($content{'symb'})) {
           $symb = $content{'symb'};
       } elsif (defined($content{'baseurl'})) {
           $symb=&Apache::lonnet::symbread($content{'baseurl'});
       }
     if ($env{'user.adv'}) {      if ($env{'user.adv'}) {
  $r->print('<table border="2" width="100%"><tr bgcolor="#FFAAAA"><td>'.&mt('Currently available actions (will open extra window)').':</td>');   $r->print('<table border="2" width="100%"><tr bgcolor="#FFAAAA"><td>'.&mt('Currently available actions (will open extra window)').':</td>');
  my $symb=&Apache::lonnet::symbread($content{'baseurl'});        
  if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) {   if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) {
  $r->print('<td><b>'.&Apache::loncommon::track_student_link(&mt('View recent activity'),$content{'sendername'},$content{'senderdomain'},'check').'</b></td>');   $r->print('<td><b>'.&Apache::loncommon::track_student_link(&mt('View recent activity'),$content{'sendername'},$content{'senderdomain'},'check').'</b></td>');
     }      }
Line 2006  sub displaymessage { Line 2018  sub displaymessage {
        ' ('.$content{'recuser'}[$i].' at '.$content{'recdomain'}[$i].') ';         ' ('.$content{'recuser'}[$i].' at '.$content{'recdomain'}[$i].') ';
     }      }
     $tolist = join(', ',@recipients);      $tolist = join(', ',@recipients);
       my ($restitle,$baseurl,$refers_to);
       if (defined($content{'resource_title'})) {
           $restitle = $content{'resource_title'};
       } else {
           if (defined($content{'baseurl'})) {
               $restitle = &Apache::lonnet::gettitle($content{'baseurl'});
           }
       }
       if (defined($content{'baseurl'})) {
           $baseurl = &Apache::lonenc::check_encrypt($content{'baseurl'});
       }
       $r->print(&Apache::loncommon::student_image_tag($content{'senderdomain'},$content{'sendername'}));
     $r->print('<br /><b>'.&mt('Subject').':</b> '.$content{'subject'}.      $r->print('<br /><b>'.&mt('Subject').':</b> '.$content{'subject'}.
       ($folder ne 'sent'?'<br /><b>'.&mt('From').':</b> '.        ($folder ne 'sent'?'<br /><b>'.&mt('From').':</b> '.
       &Apache::loncommon::aboutmewrapper(        &Apache::loncommon::aboutmewrapper(
Line 2016  sub displaymessage { Line 2040  sub displaymessage {
               $tolist).                $tolist).
       ($content{'courseid'}?'<br /><b>'.&mt($crstype).':</b> '.$courseinfo{'description'}.        ($content{'courseid'}?'<br /><b>'.&mt($crstype).':</b> '.$courseinfo{'description'}.
        ($content{'coursesec'}?' ('.&mt('Section').': '.$content{'coursesec'}.')':''):'').         ($content{'coursesec'}?' ('.&mt('Section').': '.$content{'coursesec'}.')':''):'').
       '<br /><b>'.&mt('Time').':</b> '.$content{'time'}.        '<br /><b>'.&mt('Time').':</b> '.$content{'time'});
       ($content{'baseurl'}?'<br /><b>'.&mt('Refers to').':</b> <a href="'.$content{'baseurl'}.'">'.      if ($baseurl) {
        $content{'baseurl'}.' ('.&Apache::lonnet::gettitle($content{'baseurl'}).')</a>':'').          if (defined($content{'courseid'}) && defined($env{'request.course.id'})) {
       '<p><pre>'.              if ($content{'courseid'} eq $env{'request.course.id'}) {
                   my $symblink;
                   my $showsymb = &Apache::lonenc::check_decrypt($symb);
                   my $showurl = &Apache::lonenc::check_decrypt($baseurl);
                   my $encrypturl = &Apache::lonnet::EXT('resource.0.encrypturl',
                                 $showsymb,$env{'user.domain'},$env{'user.name'});
                   if ($symb) {
                       if ($encrypturl =~ /^yes$/i && !$env{'request.role.adv'}) {
                           $showsymb = &Apache::lonenc::check_encrypt($symb);
                       }
                       $symblink = '?symb='.$showsymb;
                   }
                   if ($encrypturl =~ /^yes$/i && !$env{'request.role.adv'}) {
                       $showurl = $baseurl;
                   }
                   $r->print('<br /><b>'.&mt('Refers to').':</b> <a href="'.$showurl.$symblink.'">'.$restitle.'</a>');
                   $refers_to = 1;
               }
           }
           if (!$refers_to) {
               if ($baseurl =~ m-^/enc/-) {
                   if (defined($content{'courseid'})) {
                       if (!$env{'request.course.id'}) {
                           my $unencurl =
                              &Apache::lonenc::unencrypted($baseurl,
                                                           $content{'courseid'});
                           if ($unencurl ne '') {
                               if (&Apache::lonnet::allowed('bre',$unencurl)) {
                                   $r->print('<br /><b>'.&mt('Refers to').
                                             ':</b> <a href="'.$unencurl.'">'.
                                             $restitle.'</a>');
                               }
                           }
                       }
                   }
               } else {
                   if (&Apache::lonnet::allowed('bre',$baseurl)) {
                       $r->print('<br /><b>'.&mt('Refers to').
                                 ':</b> <a href="'.$baseurl.
                                 '">'.$restitle.'</a>');
                   }
               }
           }
       }
       $r->print('<p><pre>'.
       &Apache::lontexconvert::msgtexconverted($content{'message'},1).        &Apache::lontexconvert::msgtexconverted($content{'message'},1).
       '</pre><hr />'.&displayresource(%content).'</p>');        '</pre><hr />'.&displayresource(%content).'</p>');
     return;         return;
 }  }
   
 # =========================================================== Show the citation  # =========================================================== Show the citation
Line 2035  sub displayresource { Line 2103  sub displayresource {
 #  #
     if (($env{'request.course.id'} eq $content{'courseid'})      if (($env{'request.course.id'} eq $content{'courseid'})
      && (&Apache::lonnet::allowed('vgr',$content{'courseid'}))) {       && (&Apache::lonnet::allowed('vgr',$content{'courseid'}))) {
  my $symb=&Apache::lonnet::symbread($content{'baseurl'});          my $symb;
           if (defined($content{'symb'})) {
               $symb = $content{'symb'};
           } else { 
       $symb=&Apache::lonnet::symbread($content{'baseurl'});
           }
 # Could not get a symb, give up  # Could not get a symb, give up
  unless ($symb) { return $content{'citation'}; }   unless ($symb) { return $content{'citation'}; }
 # Have a symb, can render  # Have a symb, can render
Line 2198  sub sendoffmail { Line 2271  sub sendoffmail {
     }      }
  }   }
  if ($env{'form.additionalrec'}) {   if ($env{'form.additionalrec'}) {
     foreach my $rec (split(/\,/,$env{'form.additionalrec'})) {      foreach my $rec (split(/\s*,\s*/,$env{'form.additionalrec'})) {
  my ($auname,$audom)=split(/:/,$rec);   my ($auname,$audom)=split(/:/,$rec);
  if (($auname ne "") && ($audom ne "")) {   if (($auname ne "") && ($audom ne "")) {
     $toaddr{$auname.':'.$audom}='';      $toaddr{$auname.':'.$audom}='';
Line 2227  sub sendoffmail { Line 2300  sub sendoffmail {
             my $msgtxt = $savemsg;              my $msgtxt = $savemsg;
     if ($toaddr{$address}) { $msgtxt.='<hr />'.$toaddr{$address}; }      if ($toaddr{$address}) { $msgtxt.='<hr />'.$toaddr{$address}; }
     my @thismsg;      my @thismsg;
     if ((($env{'form.critmsg'}) || ($env{'form.sendbck'})) &&       if ($msgtype eq 'critical') {
  (&Apache::lonnet::allowed('srm',$env{'request.course.id'})   $r->print(&mt('Sending critical message').' '.
  || &Apache::lonnet::allowed('srm',$env{'request.course.id'}.                                $recuname.':'.$recdomain.': ');
      '/'.$env{'request.course.sec'}))) {  
  $r->print(&mt('Sending critical message').' '.$recuname.':'.$recdomain.': ');  
  @thismsg=   @thismsg=
     &Apache::lonmsg::user_crit_msg($recuname,$recdomain,      &Apache::lonmsg::user_crit_msg($recuname,$recdomain,
    $msgsubj,$msgtxt,     $msgsubj,$msgtxt,
Line 2253  sub sendoffmail { Line 2324  sub sendoffmail {
         $specialmsg_status{$recuname.':'.$recdomain} =          $specialmsg_status{$recuname.':'.$recdomain} =
     join(' ',@thismsg);      join(' ',@thismsg);
  foreach my $result (@thismsg) {   foreach my $result (@thismsg) {
     if ($result eq 'ok') {      if ($result eq 'ok' || $result eq 'con_delayed') {
  $numspecial++;   $numspecial++;
     }      }
  }   }
Line 2285  sub sendoffmail { Line 2356  sub sendoffmail {
     split(/\:/,&unescape($specialmsgid));      split(/\:/,&unescape($specialmsgid));
   
                 foreach my $recipient (sort(keys(%toaddr))) {                  foreach my $recipient (sort(keys(%toaddr))) {
                     if ($specialmsg_status{$recipient} eq 'ok') {                      if ($specialmsg_status{$recipient} =~ /\s*(ok|con_delayed)\s*/) {
                         my $usersubj = $subj_prefix.'['.$recipient.']';                          my $usersubj = $subj_prefix.'['.$recipient.']';
                         my $usermsgid =                           my $usermsgid = 
     &Apache::lonmsg::buildmsgid($stamp,$usersubj,      &Apache::lonmsg::buildmsgid($stamp,$usersubj,
Line 2399  sub handler { Line 2470  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;
     }      }
Line 2651  sub handler { Line 2718  sub handler {
         my $delresult = &deletefolder($folder);          my $delresult = &deletefolder($folder);
         if ($delresult eq 'ok') {          if ($delresult eq 'ok') {
             $r->print(&mt('Mail folder "[_1]" deleted.',$folder).'<br />');              $r->print(&mt('Mail folder "[_1]" deleted.',$folder).'<br />');
               $env{'form.folder'} = '';
         } else {          } else {
             $r->print(&mt('Deletion failed.').' '.$delresult.'<br />');              $r->print(&mt('Deletion failed.').' '.$delresult.'<br />');
             $showfolder = $folder;              $showfolder = $folder;
Line 2681  sub handler { Line 2749  sub handler {
   
 =pod  =pod
   
 =back  
   
 =cut  =cut
   
 1;   1; 
Removed from v.1.53  
changed lines
  Added in v.1.69

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