--- loncom/interface/lonmsgdisplay.pm	2014/10/26 13:10:38	1.177
+++ loncom/interface/lonmsgdisplay.pm	2019/08/12 15:19:06	1.181.2.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.177 2014/10/26 13:10:38 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.181.2.3 2019/08/12 15:19:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -102,6 +102,8 @@ use HTML::TokeParser();
 use Apache::Constants qw(:common);
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
+use Apache::longroup;
+use Apache::lonnavmaps;
 use Apache::lontexconvert();
 use HTML::Entities();
 use Apache::lonlocal;
@@ -120,18 +122,23 @@ my $startdis='';
 
 sub folderlist {
     my ($folder,$msgstatus) = @_;
-    my %lt = &Apache::lonlocal::texthash(
+    my %html_lt = &Apache::lonlocal::texthash(
                 actn => 'Action',
                 fold => 'Folder',
                 show => 'Show',
                 status => 'Message Status',
                 go   => 'Go',
+
+    );
+    &html_escape(\%html_lt);
+    my %js_lt = &Apache::lonlocal::texthash(
                 nnff => 'New Name for Folder',
                 newn => 'New Name',
                 fmnb => 'Folder may not be renamed as it is a folder provided by the system.',
                 asth => 'Requested name already in use for a system-provided or user-defined folder.',
 
     );
+    &js_escape(\%js_lt);
 
 	# set se lastvisit for the new mail check in the toplevel menu
 	&Apache::lonnet::appenv({'user.mailcheck.lastvisit'=>time});
@@ -179,16 +186,16 @@ function folder_choice(targetform,caller
         if (targetform.folderaction.options[targetform.folderaction.selectedIndex].value == 'rename') {
             for (var i=0; i<permfolders_keys.length; i++) {
                 if (permfolders_keys[i] == targetform.folder.value) {
-                    alert("'"+permfolders_vals[i]+"' -- $lt{'fmnb'}");
+                    alert("'"+permfolders_vals[i]+"' -- $js_lt{'fmnb'}");
                     return;
                 }
             }
-            var foldername=prompt('$lt{'nnff'}','$lt{'newn'}');
+            var foldername=prompt('$js_lt{'nnff'}','$js_lt{'newn'}');
             if (foldername) {
                 targetform.renamed.value=foldername;
                 for (var i=0; i<allfolders.length; i++) {
                     if (allfolders[i] == foldername) {
-                        alert("'"+foldername+"' $lt{'asth'}");
+                        alert("'"+foldername+"' $js_lt{'asth'}");
                         return;
                     }
                 }
@@ -204,7 +211,7 @@ function folder_choice(targetform,caller
         if (newname) {
             for (var i=0; i<allfolders.length; i++) {
                 if (allfolders[i] == newname) {
-                    alert("'"+newname+"' -- $lt{'asth'}");
+                    alert("'"+newname+"' -- $js_lt{'asth'}");
                     return;
                 }
             }
@@ -223,21 +230,21 @@ function folder_choice(targetform,caller
    <legend>'.&mt('Folder Actions').'</legend>
    <table border="0" cellspacing="2" cellpadding="8">
     <tr>
-     <td><b>'.$lt{'fold'}.'</b><br />'."\n".
+     <td><b>'.$html_lt{'fold'}.'</b><br />'."\n".
          &Apache::loncommon::select_form($folder,'folder',\%formhash).'
      </td>
-     <td><b>'.$lt{'show'}.'</b><br />'."\n".
+     <td><b>'.$html_lt{'show'}.'</b><br />'."\n".
          &Apache::loncommon::select_form($env{'form.interdis'},'interdis',
 					 \%show).'
      </td>
-     <td><b>'.$lt{'status'}.'</b><br />'."\n".
+     <td><b>'.$html_lt{'status'}.'</b><br />'."\n".
        &Apache::loncommon::select_form($msgstatus,'msgstatus',\%statushash).'
      </td>
      <td style="padding-right: 40px;">
-         <b>'.$lt{'actn'}.'</b><br />'."\n".'
+         <b>'.$html_lt{'actn'}.'</b><br />'."\n".'
          <span class="LC_nobreak">'.
          &Apache::loncommon::select_form('view','folderaction',\%actions).
-         ' <input type="button" value="'.$lt{'go'}.
+         ' <input type="button" value="'.$html_lt{'go'}.
          '" onclick="javascript:folder_choice(this.form,'."'change'".');" />
          </span>
      </td>
@@ -245,7 +252,7 @@ function folder_choice(targetform,caller
          <b>'.&mt('New Folder').'</b><br />'."\n".'
          <span class="LC_nobreak">
          <input type="text" size="15" name="newfolder" value="" />
-         <input type="button" value="'.$lt{'go'}.
+         <input type="button" value="'.$html_lt{'go'}.
          '" onclick="javascript:folder_choice(this.form,'."'new'".');" />
          </span>
      </td>
@@ -768,14 +775,24 @@ sub groupmail_header {
               text=>"Groups",
               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
-        ({href=>"/adm/$cdom/$cnum/$group/smppg?$refarg",
-          text=>"Group: $description",
-          title=>"Go to group's home page"},
-         {href=>"/adm/email?compose=group&amp;group=".
-                "$env{'form.group'}&amp;$refarg",
-          text=>"Send a Message in a Group",
-          title=>"Compose Group Message"},);
+         ({href=>"/adm/email?compose=group&amp;group=".
+                 "$env{'form.group'}&amp;$refarg",
+           text=>"Send a Message in a Group",
+           title=>"Compose Group Message"},);
     if ($action eq 'sending') {
             &Apache::lonhtmlcommon::add_breadcrumb
                          ({text=>"Messages being sent.",
@@ -1051,11 +1068,12 @@ sub disfolder {
     my %setters = ();
     my $numblocked = 0;
     my ($startblock,$endblock) = &Apache::loncommon::blockcheck(\%setters,'com');
-    my %lt = &Apache::lonlocal::texthash(
+    my %js_lt = &Apache::lonlocal::texthash(
                       sede => 'Select a destination folder to which the messages will be moved.',
                       nome => 'No messages have been selected to apply this action to.',
                       chec => 'Check the checkbox for at least one message.',  
     );
+    &js_escape(\%js_lt);
     my $jscript = &Apache::loncommon::check_uncheck_jscript();
     $r->print(<<ENDDISHEADER);
 <script type="text/javascript">
@@ -1066,7 +1084,7 @@ sub disfolder {
         document.disall.markedaction.value = document.disall.checkedaction.options[document.disall.checkedaction.selectedIndex].value;
         if (document.disall.checkedaction.options[document.disall.checkedaction.selectedIndex].value == 'markedmove') {
             if (document.disall.movetofolder.options[document.disall.movetofolder.selectedIndex].value == "") {
-                alert("$lt{'sede'}");
+                alert("$js_lt{'sede'}");
                 return;
             } 
         }
@@ -1083,7 +1101,7 @@ sub disfolder {
             }
         }   
         if (checktotal == 0) {
-            alert("$lt{'nome'}\\n$lt{'chec'}");
+            alert("$js_lt{'nome'}\\n$js_lt{'chec'}");
             return;
         }
         document.disall.submit();
@@ -1394,11 +1412,14 @@ sub compout {
                                        'to'   => 'To:',
                                       );
     my %attachmax = (
-                     text => &mt('(128 KB max size)'),
-                     num  => 131072,
+                     text => &mt('(1 MB max size)'),
+                     num  => 1048576,
                     );
     if (!$forwarding && !$multiforward) {
-        $attachrow = '<tr><td colspan="3"><b>'.$lt{'atta'}.'</b> '.$attachmax{'text'}.': <input type="file" name="attachment" /></td></tr>';
+        $attachrow = '<tr><td colspan="3"><b>'.$lt{'atta'}.'</b> '.$attachmax{'text'}
+            .': <input type="file" name="attachment" class="LC_flUpload" />'.
+            .'<input type="hidden" id="LC_free_space" value="'.$attachmax{'num'}.'" />'.
+            .'</td></tr>';
     }
     if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})
 	|| &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
@@ -2168,7 +2189,8 @@ sub displaymessage {
     my @actionlist;
     if ($env{'user.adv'}) {
 
-	if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) {
+	if (($env{'request.course.id'}) && ($from_student) &&
+            (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) {
 		push(@actionlist,&Apache::loncommon::track_student_link(
                                       'View recent activity'
                                      ,$content{'sendername'}
@@ -2661,6 +2683,8 @@ sub header {
     if ($baseurl) {
 	$extra .= "<base href=\"".&Apache::lonnet::absolute_url()."/$baseurl\" />";
     }
+    $extra .= '<script type="text/javascript"
+                src="/res/adm/includes/file_upload.js"></script>';
     $r->print(&Apache::loncommon::start_page('Messages',
  					$extra));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs
@@ -2698,7 +2722,7 @@ sub storedcommentlisting {
        '^'.&escape(&escape($env{'form.showcommentbaseurl'})));
     $r->print(&Apache::loncommon::start_page('Saved Comment Listing',undef,
 					     {'onlybody' => 1}));
-    if ((keys %msgs)[0]=~/^error\:/) {
+    if ((keys(%msgs))[0]=~/^error\:/) {
 	$r->print(&mt('No saved comments yet.'));
     } else {
 	my $found=0;
@@ -2901,7 +2925,7 @@ sub sendoffmail {
             &Apache::lonnet::logthis('Failed to store To, Bcc and Cc recipients for '.$env{'user.name'}.':'.$env{'user.domain'});
         }
         if ($env{'form.attachment'}) {
-            if (length($env{'form.attachment'})<131072) {
+            if (length($env{'form.attachment'}) <= 1048576) {
                 $attachmenturl=&Apache::lonnet::userfileupload('attachment',undef,'feedback/'.$now);
             } else {
                 $r->print('<p><span class="LC_warning">'.&mt('Attachment not included - exceeded permitted length').'</span><br /></p>');
@@ -2913,6 +2937,7 @@ sub sendoffmail {
         }
         my @recusers;
         my @recudoms;
+        my %permresults;
 	foreach my $address (sort(keys(%toaddr))) {
 	    my ($recuname,$recdomain)=split(/\:/,$address);
             my $msgtxt = $savemsg;
@@ -2929,7 +2954,8 @@ sub sendoffmail {
 						   $env{'form.sendbck'},
 						   $env{'form.permanent'},
 						   \$sentmessage{$address},
-                                                   $nosentstore,$recipid);
+                                                   $nosentstore,$recipid,
+                                                   $attachmenturl,\%permresults);
 	    } else {
 		$r->print(&mt('Sending').' '.$recuname.':'.$recdomain.': ');
 		@thismsg=
@@ -2940,13 +2966,20 @@ sub sendoffmail {
 						     $env{'form.permanent'},
 						     \$sentmessage{$address},
                                                      undef,undef,undef,
-                                                     $nosentstore,$recipid);
+                                                     $nosentstore,$recipid,
+                                                     \%permresults);
             }
 	    $msg_status{$recuname.':'.$recdomain}=join(' ',@thismsg);
 	    if ($msg_status{$recuname.':'.$recdomain} =~ /(ok|con_delayed)/) {  
 	        $numsent++;
                 push(@recusers,$recuname);
                 push(@recudoms,$recdomain);
+                if ($1 eq 'ok') {
+                    $r->print('ok ');
+                }
+                if ($permresults{$recuname.':'.$recdomain}) {
+                    $r->print(' (email) ');
+                }
 	    }
 	    $sendstatus.=' '.join(' ',@thismsg);
 	}