Diff for /loncom/interface/lonmsgdisplay.pm between versions 1.181.2.4 and 1.182

version 1.181.2.4, 2019/08/13 21:03:34 version 1.182, 2015/06/18 20:19:06
Line 102  use HTML::TokeParser(); Line 102  use HTML::TokeParser();
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use Apache::loncommon();  use Apache::loncommon();
 use Apache::lonhtmlcommon();  use Apache::lonhtmlcommon();
 use Apache::longroup;  
 use Apache::lonnavmaps;  
 use Apache::lontexconvert();  use Apache::lontexconvert();
 use HTML::Entities();  use HTML::Entities();
 use Apache::lonlocal;  use Apache::lonlocal;
Line 775  sub groupmail_header { Line 773  sub groupmail_header {
               text=>"Groups",                text=>"Groups",
               title=>$brtitle});                title=>$brtitle});
     }      }
     my $view_permission =  
           &Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));  
     my $navmap=Apache::lonnavmaps::navmap->new();  
     my $grouppagelink = &Apache::longroup::get_group_link($cdom,$cnum,$group,$navmap,$view_permission,$refarg);  
     if ($grouppagelink) {  
         &Apache::lonhtmlcommon::add_breadcrumb  
             ({href=>$grouppagelink,  
               text=>"Group: $description",  
               title=>"Go to group's home page"},);  
     } else {  
         &Apache::lonhtmlcommon::add_breadcrumb  
             ({text=>"Group: $description",});  
     }  
     &Apache::lonhtmlcommon::add_breadcrumb      &Apache::lonhtmlcommon::add_breadcrumb
          ({href=>"/adm/email?compose=group&group=".          ({href=>"/adm/$cdom/$cnum/$group/smppg?$refarg",
                  "$env{'form.group'}&$refarg",            text=>"Group: $description",
            text=>"Send a Message in a Group",            title=>"Go to group's home page"},
            title=>"Compose Group Message"},);           {href=>"/adm/email?compose=group&group=".
                   "$env{'form.group'}&$refarg",
             text=>"Send a Message in a Group",
             title=>"Compose Group Message"},);
     if ($action eq 'sending') {      if ($action eq 'sending') {
             &Apache::lonhtmlcommon::add_breadcrumb              &Apache::lonhtmlcommon::add_breadcrumb
                          ({text=>"Messages being sent.",                           ({text=>"Messages being sent.",
Line 1417  sub compout { Line 1405  sub compout {
                     );                      );
     if (!$forwarding && !$multiforward) {      if (!$forwarding && !$multiforward) {
         $attachrow = '<tr><td colspan="3"><b>'.$lt{'atta'}.'</b> '.$attachmax{'text'}          $attachrow = '<tr><td colspan="3"><b>'.$lt{'atta'}.'</b> '.$attachmax{'text'}
             .': <input type="file" name="attachment" class="LC_flUpload" />'              .': <input type="file" name="attachment" class="flUpload" multiple />'
             .'<input type="hidden" id="LC_free_space" value="'.$attachmax{'num'}.'" />'              .'</td></tr>'
             .'</td></tr>';              .'<input type="hidden" id="free_space" value="'.$attachmax{'num'}.'" />';
     }      }
     if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})      if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})
  || &Apache::lonnet::allowed('srm',$env{'request.course.id'}.   || &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
Line 2189  sub displaymessage { Line 2177  sub displaymessage {
     my @actionlist;      my @actionlist;
     if ($env{'user.adv'}) {      if ($env{'user.adv'}) {
   
  if (($env{'request.course.id'}) && ($from_student) &&   if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) {
             (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) {  
  push(@actionlist,&Apache::loncommon::track_student_link(   push(@actionlist,&Apache::loncommon::track_student_link(
                                       'View recent activity'                                        'View recent activity'
                                      ,$content{'sendername'}                                       ,$content{'sendername'}
Line 2925  sub sendoffmail { Line 2912  sub sendoffmail {
             &Apache::lonnet::logthis('Failed to store To, Bcc and Cc recipients for '.$env{'user.name'}.':'.$env{'user.domain'});              &Apache::lonnet::logthis('Failed to store To, Bcc and Cc recipients for '.$env{'user.name'}.':'.$env{'user.domain'});
         }          }
         if ($env{'form.attachment'}) {          if ($env{'form.attachment'}) {
             if (length($env{'form.attachment'}) <= 1048576) {              if (length($env{'form.attachment'})<131072) {
                 $attachmenturl=&Apache::lonnet::userfileupload('attachment',undef,'feedback/'.$now);                  $attachmenturl=&Apache::lonnet::userfileupload('attachment',undef,'feedback/'.$now);
             } else {              } else {
                 $r->print('<p><span class="LC_warning">'.&mt('Attachment not included - exceeded permitted length').'</span><br /></p>');                  $r->print('<p><span class="LC_warning">'.&mt('Attachment not included - exceeded permitted length').'</span><br /></p>');

Removed from v.1.181.2.4  
changed lines
  Added in v.1.182


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