--- loncom/interface/lonmsg.pm	2004/12/15 01:17:09	1.124
+++ loncom/interface/lonmsg.pm	2005/01/30 23:32:29	1.131
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.124 2004/12/15 01:17:09 www Exp $
+# $Id: lonmsg.pm,v 1.131 2005/01/30 23:32:29 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -239,9 +239,15 @@ sub sendemail {
 # ==================================================== Send notification emails
 
 sub sendnotification {
-    my ($to,$touname,$toudom,$subj,$crit)=@_;
+    my ($to,$touname,$toudom,$subj,$crit,$text)=@_;
     my $sender=$ENV{'environment.firstname'}.' '.$ENV{'environment.lastname'};
+    unless ($sender=~/\w/) { 
+	$sender=$ENV{'user.name'}.'@'.$ENV{'user.domain'};
+    }
     my $critical=($crit?' critical':'');
+    $text=~s/\&lt\;/\</gs;
+    $text=~s/\&gt\;/\>/gs;
+    $text=~s/\<\/*[^\>]+\>//gs;
     my $url='http://'.
       $Apache::lonnet::hostname{&Apache::lonnet::homeserver($touname,$toudom)}.
       '/adm/email?username='.$touname.'&domain='.$toudom;
@@ -250,11 +256,15 @@ You received a$critical message from $se
 
  $subj
 
+=== Excerpt ============================================================
+$text
+========================================================================
+
 Use
 
  $url
 
-to access this message.
+to access the full message.
 ENDMSG
     &sendemail($to,'New'.$critical.' message from '.$sender,$body);
 }
@@ -351,6 +361,7 @@ sub user_crit_msg_raw {
     my $status='';
     my $msgid='undefined';
     unless (($message)&&($user)&&($domain)) { $status='empty'; };
+    my $text=$message;
     my $homeserver=&Apache::lonnet::homeserver($user,$domain);
     if ($homeserver ne 'no_host') {
        ($msgid,$message)=&packagemsg($subject,$message);
@@ -373,7 +384,8 @@ sub user_crit_msg_raw {
     my %userenv = &Apache::lonnet::get('environment',['critnotification'],
                                        $domain,$user);
     if ($userenv{'critnotification'}) {
-      &sendnotification($userenv{'critnotification'},$user,$domain,$subject,1);
+      &sendnotification($userenv{'critnotification'},$user,$domain,$subject,1,
+			$text);
     }
 # Log this
     &Apache::lonnet::logthis(
@@ -448,6 +460,7 @@ sub user_normal_msg_raw {
 # Check if allowed missing
     my $status='';
     my $msgid='undefined';
+    my $text=$message;
     unless (($message)&&($user)&&($domain)) { $status='empty'; };
     my $homeserver=&Apache::lonnet::homeserver($user,$domain);
     if ($homeserver ne 'no_host') {
@@ -474,7 +487,8 @@ sub user_normal_msg_raw {
     my %userenv = &Apache::lonnet::get('environment',['notification'],
                                        $domain,$user);
     if ($userenv{'notification'}) {
-	&sendnotification($userenv{'notification'},$user,$domain,$subject,0);
+	&sendnotification($userenv{'notification'},$user,$domain,$subject,0,
+			  $text);
     }
     &Apache::lonnet::log($ENV{'user.domain'},$ENV{'user.name'},
                          $ENV{'user.home'},
@@ -527,9 +541,11 @@ sub folderlist {
                               'critical' => &mt('Critical'),
 			      'sent' => &mt('Sent Messages'),
 			      map { $_ => $_ } @allfolders)).
-			      ' '.&mt('Show').' '.
-	    &Apache::loncommon::select_form($interdis,'interdis',
-(' 10' => '10', ' 20' => '20', ' 50' => '50', '100' => '100', '200' => '200')).	
+			      ' '.&mt('Show').
+			      '<select name="interdis">'.
+			      join("\n",map { '<option value="'.$_.'"'.
+	 ($_==$interdis?' selected="selected"':'').'>'.$_.'</option>' }
+				   (10,20,50,100,200)).'</select>'.	
    '<input type="submit" value="'.&mt('View Folder').'" /><br />'.
     '<input type="hidden" name="sortedby" value="'.$ENV{'form.sortedby'}.'" />'.
 			      ($folder=~/^(new|critical)/?'</form>':'');
@@ -588,7 +604,6 @@ sub makefolder {
 
 sub movemsg {
     my ($msgid,$srcfolder,$trgfolder)=@_;
-    my $unmsgid=&Apache::lonnet::unescape($msgid);
     my $srcsuffix=&foldersuffix($srcfolder);
     my $trgsuffix=&foldersuffix($trgfolder);
 
@@ -597,16 +612,13 @@ sub movemsg {
     &Apache::lonnet::put('nohist_email'.$trgsuffix,{$msgid => $message{$msgid}});
 
 # Copy status
-    my %status=&Apache::lonnet::get('email_status'.$srcsuffix,[$unmsgid]);
-    &Apache::lonnet::put('email_status'.$trgsuffix,{$unmsgid => $status{$unmsgid}});
-# See if was deleted -> becomes "read" in trash
-    my $currentstatus=(&unpackmsgid($status{$unmsgid}),$srcfolder);
-    if ($currentstatus eq 'deleted') {
-	&statuschange($msgid,'read',$trgfolder);
+    unless ($trgfolder eq 'trash') {
+	my %status=&Apache::lonnet::get('email_status'.$srcsuffix,[$msgid]);
+	&Apache::lonnet::put('email_status'.$trgsuffix,{$msgid => $status{$msgid}});
     }
 # Delete orginals
     &Apache::lonnet::del('nohist_email'.$srcsuffix,[$msgid]);
-    &Apache::lonnet::del('email_status'.$srcsuffix,[$unmsgid]);
+    &Apache::lonnet::del('email_status'.$srcsuffix,[$msgid]);
 }
 
 # ======================================================= Display a course list
@@ -677,7 +689,7 @@ ENDDISHEADER
                       &Apache::loncoursedata::CL_FULLNAME(),
                       &Apache::loncoursedata::CL_SECTION()]);
         next if ($status ne 'Active');
-        my $key = 'send_to_&&&'.$section.'&&&'.$student;
+        my $key = 'send_to_&&&'.$section.'&&&_'.$student;
         if (! defined($fullname) || $fullname eq '') { $fullname = $sname; }
         $r->print('<tr><td><label>'.
                   qq{<input type="checkbox" name="$key">}.('&nbsp;'x2).
@@ -705,9 +717,9 @@ sub discrit {
 $content{'sendername'}.'@'.
             $content{'senderdomain'}.') '.$content{'time'}.
             '<br />'.&mt('Subject').': '.$content{'subject'}.
-            '<br /><blockquote>'.
+            '<br /><pre>'.
               &Apache::lontexconvert::msgtexconverted($content{'message'}).
-            '</blockquote><small>'.
+            '</pre><small>'.
 &mt('You have to confirm that you received this message. After confirmation, this message will be moved to your regular inbox').
             '</small><br />'.
             '<input type=submit name="rec_'.$_.'" value="'.&mt('Confirm Receipt').'">'.
@@ -838,7 +850,7 @@ TABLEHEAD
         foreach my $msg (@newmsgs) {
             $r->print(<<"ENDLINK");
 <tr bgcolor="#FFBB77">
-<td><a href="/adm/email?display=$msg->{'msgid'}">$lt{'op'}</a></td>
+<td><a href="/adm/email?dismode=new&display=$msg->{'msgid'}">$lt{'op'}</a></td>
 ENDLINK
             foreach ('sendtime','from','fromdom','shortsub') {
                 $r->print("<td>$msg->{$_}</td>");
@@ -918,6 +930,9 @@ ENDDISHEADER
 	$r->print('<h2>'.&mt('Empty Folder').'</h2>');
 	return;
     }
+    unless ($interdis) {
+	$interdis=20;
+    }
     my $number=int($totalnumber/$interdis);
     if (($startdis<0) || ($startdis>$number)) { $startdis=$number; }
     my $firstdis=$interdis*$startdis;
@@ -956,7 +971,7 @@ ENDDISHEADER
     } else {
      	$r->print('<a href = "?sortedby=revstatus'.$fsqs.'">'.&mt('Status').'</th>');
     }
-    $r->print('</tr>');
+    $r->print("</tr>\n");
     for (my $n=$firstdis;$n<=$lastdis;$n++) {
 	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID)= @{$temp[$n]};
 	if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) {
@@ -976,13 +991,13 @@ ENDDISHEADER
 		      '<td>'.&Apache::lonlocal::locallocaltime($sendtime).'</td><td>'.
 		      $fromname.'</td><td>'.$fromdomain.'</td><td>'.
 		      &Apache::lonnet::unescape($shortsubj).'</td><td>'.
-                      $status.'</td></tr>');
+                      $status."</td></tr>\n");
 	} elsif ($status eq 'deleted') {
 # purge
 	    &movemsg(&Apache::lonnet::unescape($origID),$folder,'trash');
 	}
     }   
-    $r->print('</table><p>'.
+    $r->print("</table>\n<p>".
   '<a href="javascript:checkall()">'.&mt('Check All').'</a>&nbsp;'.
   '<a href="javascript:uncheckall()">'.&mt('Uncheck All').'</a></p>'.
   '<input type="hidden" name="sortedby" value="'.$ENV{'form.sortedby'}.'" />');
@@ -997,7 +1012,8 @@ ENDDISHEADER
 	&Apache::loncommon::select_form('','movetofolder',
 			     ( map { $_ => $_ } @allfolders))
 	      );
-    $r->print('<input type="hidden" name="folder" value="'.$folder.'" /></form>');
+    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'}.'" /></form>');
     if ($numblocked > 0) {
         my $beginblock = &Apache::lonlocal::locallocaltime($startblock);
         my $finishblock = &Apache::lonlocal::locallocaltime($endblock);
@@ -1236,9 +1252,9 @@ sub disfacetoface {
  &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('.
 $content{'sendername'}.'@'.
             $content{'senderdomain'}.') '.$content{'time'}.
-            '<br /><blockquote>'.
+            '<br /><pre>'.
               &Apache::lontexconvert::msgtexconverted($content{'message'}).
-	      '</blockquote>';
+	      '</pre>';
      }
     # Check to see if there were any messages.
     if ($result eq '') {
@@ -1736,9 +1752,9 @@ sub displaymessage {
 	      '"><b>'.&mt('Mark Unread').'</b></a></td>'.
 	      '<td><a href="/adm/email?markdel='.&Apache::lonnet::escape($msgid).$sqs.
 	      '"><b>Delete</b></a></td>'.
-	      '<td><a href="/adm/email?sortedby='.$ENV{'form.sortedby'}.
-	      '&folder='.&Apache::lonnet::escape($folder).
-	      '"><b>'.&mt('Display all Messages').'</b></a></td>');
+	      '<td><a href="/adm/email?'.$sqs.
+	      ($ENV{'form.dismode'} eq 'new'?'&folder=new':'').
+	      '"><b>'.&mt('Back to Folder Display').'</b></a></td>');
     if ($counter > 0){
 	$r->print('<td><a href="/adm/email?display='.$messages[$counter-1]->[5].$sqs.
 		  '"><b>'.&mt('Previous').'</b></a></td>');
@@ -1985,10 +2001,8 @@ sub handler {
         ['display','replyto','forward','markread','markdel','markunread',
          'sendreply','compose','sendmail','critical','recname','recdom',
          'recordftf','sortedby','block','folder','startdis','interdis',
-	 'showcommentbaseurl']);
-    $sqs='&sortedby='.$ENV{'form.sortedby'}.
-	 '&startdis='.$ENV{'form.startdis'}.
-	 '&interdis='.$ENV{'form.interdis'};
+	 'showcommentbaseurl','dismode']);
+    $sqs='&sortedby='.$ENV{'form.sortedby'};
 
 # ------------------------------------------------------ They checked for email
     unless ($ENV{'form.block'}) {
@@ -2009,7 +2023,7 @@ sub handler {
     unless ($folder) { 
 	$folder=''; 
     } else {
-	$sqs='&folder='.&Apache::lonnet::escape($folder);
+	$sqs.='&folder='.&Apache::lonnet::escape($folder);
     }
 
 # --------------------------------------------------------------------- Display
@@ -2017,8 +2031,11 @@ sub handler {
     $startdis=$ENV{'form.startdis'};
     $startdis--;
     unless ($startdis) { $startdis=0; }
+
     $interdis=$ENV{'form.interdis'};
     unless ($interdis) { $interdis=20; }
+    $sqs.='&interdis='.$interdis;
+
     if ($ENV{'form.firstview'}) {
 	$startdis=0;
     }
@@ -2031,7 +2048,8 @@ sub handler {
     if ($ENV{'form.nextview'}) {
 	$startdis++;
     }
-
+    my $postedstartdis=$startdis+1;
+    $sqs.='&startdis='.$postedstartdis;
 
 # --------------------------------------------------------------- Render Output