--- loncom/interface/lonmsgdisplay.pm	2014/10/26 13:10:38	1.177
+++ loncom/interface/lonmsgdisplay.pm	2015/06/09 21:22:56	1.181
@@ -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 2015/06/09 21:22:56 damieng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -120,18 +120,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 +184,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 +209,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 +228,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 +250,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>
@@ -1051,11 +1056,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 +1072,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 +1089,7 @@ sub disfolder {
             }
         }   
         if (checktotal == 0) {
-            alert("$lt{'nome'}\\n$lt{'chec'}");
+            alert("$js_lt{'nome'}\\n$js_lt{'chec'}");
             return;
         }
         document.disall.submit();
@@ -2698,7 +2704,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;
@@ -2913,6 +2919,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 +2936,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 +2948,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);
 	}