--- loncom/interface/lonmsg.pm	2004/11/09 16:29:32	1.112
+++ loncom/interface/lonmsg.pm	2004/11/13 14:45:57	1.117
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.112 2004/11/09 16:29:32 www Exp $
+# $Id: lonmsg.pm,v 1.117 2004/11/13 14:45:57 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -523,19 +523,20 @@ sub folderlist {
 	&mt('Folder').': '.
 	&Apache::loncommon::select_form($folder,'folder',
 			     ('' => &mt('INBOX'),'trash' => &mt('TRASH'),
+			      'new' => &mt('New Messages Only'),
+                              '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')).	
    '<input type="submit" value="'.&mt('View Folder').'" /><br />'.
+			      ($folder!~/^(new|critical)/?
    '<input type="submit" name="firstview" value="'.&mt('First').'" />'.
    '<input type="submit" name="prevview" value="'.&mt('Previous').'" />'.
-   '<input type="text" size="5" name="startdis" value="'.$startdis.'" />'.
+   '<input type="text" size="5" name="startdis" value="'.$startdis.'" onChange="this.form.submit()" />'.
    '<input type="submit" name="nextview" value="'.&mt('Next').'" />'.
-   '<input type="submit" name="lastview" value="'.&mt('Last').'" />'.
-	'<a href="/adm/email?critical=display'.$sqs.'">'.
-	    &mt('View Critical Messages').'</a>'.
+   '<input type="submit" name="lastview" value="'.&mt('Last').'" />':'').
 	    '</form>';
 }
 
@@ -568,6 +569,10 @@ sub statuschange {
 
 sub makefolder {
     my ($newfolder)=@_;
+    if (($newfolder eq 'sent')
+     || ($newfolder eq 'critical')
+     || ($newfolder eq 'trash')
+     || ($newfolder eq 'new')) { return; }
     &Apache::lonnet::put('email_folders',{$newfolder => time});
 }
 
@@ -858,6 +863,20 @@ ENDLINK
 
 sub disall {
     my ($r,$folder)=@_;
+    $r->print(&folderlist($folder));
+    if ($folder eq 'new') {
+	&disnew($r);
+    } elsif ($folder eq 'critical') {
+	&discrit($r);
+    } else {
+	&disfolder($r,$folder);
+    }
+}
+
+# ============================================================ Display a folder
+
+sub disfolder {
+    my ($r,$folder)=@_;
     my %blocked = ();
     my %setters = ();
     my $startblock;
@@ -893,9 +912,7 @@ ENDDISHEADER
     if ($firstdis>$#temp) { $firstdis=$#temp-$interdis+1; }
     my $lastdis=$firstdis+$interdis-1;
     if ($lastdis>$#temp) { $lastdis=$#temp; }
-    $r->print('<h2>'.&mt('Display All Messages').'</h2>'.
-	      &folderlist($folder).
-	      '<form method="post" name="disall" action="/adm/email">'.
+    $r->print('<form method="post" name="disall" action="/adm/email">'.
 	      '<table border=2><tr><th colspan="3">&nbsp</th><th>');
     if ($ENV{'form.sortedby'} eq "revdate") {
 	$r->print('<a href = "?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>');
@@ -1011,6 +1028,7 @@ sub compout {
     my $dispcrit='';
     my $dissub='';
     my $dismsg='';
+    my $disbase='';
     my $func=&mt('Send New');
     my %lt=&Apache::lonlocal::texthash('us' => 'Username',
 				       'do' => 'Domain',
@@ -1040,6 +1058,9 @@ sub compout {
 	$dissub=&mt('Forwarding').': '.$content{'subject'};
 	$dismsg=&mt('Forwarded message from').' '.
 	    $content{'sendername'}.' '.&mt('at').' '.$content{'senderdomain'};
+	if ($content{'baseurl'}) {
+	    $disbase='<input type="hidden" name="baseurl" value="'.&Apache::lonnet::escape($content{'baseurl'}).'" />';
+	}
     }
     if ($replying) {
 	%message=&Apache::lonnet::get('nohist_email',[$replying]);
@@ -1053,6 +1074,12 @@ sub compout {
 	$dismsg=~s/\r/\n/g;
 	$dismsg=~s/\f/\n/g;
 	$dismsg=~s/\n+/\n\> /g;
+	if ($content{'baseurl'}) {
+	    $disbase='<input type="hidden" name="baseurl" value="'.&Apache::lonnet::escape($content{'baseurl'}).'" />';
+	    if ($ENV{'user.adv'}) {
+		$disbase='<input type="checkbox" name="storebasecomment" />'.&mt('Store message for re-use').'<br />';
+	    }
+	}
     }
     my $citation=&displayresource(%content);
     if ($ENV{'form.recdom'}) { $defdom=$ENV{'form.recdom'}; }
@@ -1094,6 +1121,7 @@ $latexHelp
 <textarea name="message" cols="80" rows="15" wrap="hard">$dismsg
 </textarea></p><br />
 $dispcrit
+$disbase
 <input type="submit" name="send" value="$func $lt{'ma'}" />
 <input type="submit" name="cancel" value="$lt{'ca'}" /><hr />
 $citation
@@ -1718,6 +1746,8 @@ sub displaymessage {
 	      ($content{'courseid'}?'<br /><b>'.&mt('Course').':</b> '.$courseinfo{'description'}.
 	       ($content{'coursesec'}?' ('.&mt('Group/Section').': '.$content{'coursesec'}.')':''):'').
 	      '<br /><b>'.&mt('Time').':</b> '.$content{'time'}.
+	      ($content{'baseurl'}?'<br /><b>'.&mt('Refers to').':</b> <a href="'.$content{'baseurl'}.'">'.
+	       $content{'baseurl'}.' ('.&Apache::lonnet::gettitle($content{'baseurl'}).')</a>':'').
 	      '<p><pre>'.
 	      &Apache::lontexconvert::msgtexconverted($content{'message'},1).
 	      '</pre><hr />'.&displayresource(%content).'</p>');
@@ -1783,6 +1813,102 @@ sub printheader {
     &header($r,$title,$baseurl);
 }
 
+# ---------------------------------------------------------------- Send an email
+
+sub sendoffmail {
+    my ($r)=@_;
+    my $sendstatus='';
+    if ($ENV{'form.send'}) {
+	&printheader($r,'','Messages being sent.');
+	$r->rflush();
+	my %content=();
+	undef %content;
+	if ($ENV{'form.forwid'}) {
+	    my $msgid=$ENV{'form.forwid'};
+	    my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
+	    %content=&unpackagemsg($message{$msgid},1);
+	    &statuschange($msgid,'forwarded');
+	    $ENV{'form.message'}.="\n\n-- Forwarded message --\n\n".
+		$content{'message'};
+	}
+	if ($ENV{'form.replyid'}) {
+	    my $msgid=$ENV{'form.replyid'};
+	    my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
+	    %content=&unpackagemsg($message{$msgid},1);
+	    &statuschange($msgid,'replied');
+	}
+	my %toaddr=();
+	undef %toaddr;
+	if ($ENV{'form.sendmode'} eq 'group') {
+	    foreach (keys %ENV) {
+		if ($_=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) {
+		    $toaddr{$1}='';
+		}
+	    }
+	} elsif ($ENV{'form.sendmode'} eq 'upload') {
+	    foreach (split(/[\n\r\f]+/,$ENV{'form.upfile'})) {
+		my ($rec,$txt)=split(/\s*\:\s*/,$_);
+		if ($txt) {
+		    $rec=~s/\@/\:/;
+		    $toaddr{$rec}.=$txt."\n";
+		}
+	    }
+	} else {
+	    $toaddr{$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}}='';
+	}
+	if ($ENV{'form.additionalrec'}) {
+	    foreach (split(/\,/,$ENV{'form.additionalrec'})) {
+		my ($auname,$audom)=split(/\@/,$_);
+		$toaddr{$auname.':'.$audom}='';
+	    }
+	}
+	
+	foreach (keys %toaddr) {
+	    my ($recuname,$recdomain)=split(/\:/,$_);
+	    my $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'});
+	    if ($toaddr{$_}) { $msgtxt.='<hr />'.$toaddr{$_}; }
+	    my $thismsg;    
+	    if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && 
+		(&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
+		$r->print(&mt('Sending critical message').' '.$recuname.'@'.$recdomain.': ');
+		$thismsg=&user_crit_msg($recuname,$recdomain,
+					&Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
+					$msgtxt,
+					$ENV{'form.sendbck'});
+	    } else {
+		$r->print(&mt('Sending').' '.$recuname.'@'.$recdomain.': ');
+		$thismsg=&user_normal_msg($recuname,$recdomain,
+					  &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
+					  $msgtxt,
+					  $content{'citation'});
+		if (($ENV{'request.course.id'}) && ($ENV{'form.sendmode'} eq 'group')) {
+		    &user_normal_msg_raw(
+					 $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
+					 $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
+					 'Broadcast ['.$recuname.':'.$recdomain.']',
+					 $msgtxt);
+		}
+	    }
+	    $r->print($thismsg.'<br />');
+	    $sendstatus.=' '.$thismsg;
+	}
+    } else {
+	&printheader($r,'','No messages sent.'); 
+    }
+    if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
+	$r->print('<br /><font color="green">'.&mt('Completed.').'</font>');
+	if ($ENV{'form.displayedcrit'}) {
+	    &discrit($r);
+	} else {
+	    &Apache::loncommunicate::menu($r);
+	}
+    } else {
+	$r->print(
+		  '<h2><font color="red">'.&mt('Could not deliver message').'</font></h2>'.
+		  &mt('Please use the browser "Back" button and correct the recipient addresses')
+		  );
+    }
+}
 
 # ===================================================================== Handler
 
@@ -1833,6 +1959,19 @@ sub handler {
     unless ($startdis) { $startdis=0; }
     $interdis=$ENV{'form.interdis'};
     unless ($interdis) { $interdis=20; }
+    if ($ENV{'form.firstview'}) {
+	$startdis=0;
+    }
+    if ($ENV{'form.lastview'}) {
+	$startdis=-1;
+    }
+    if ($ENV{'form.prevview'}) {
+	$startdis--;
+    }
+    if ($ENV{'form.nextview'}) {
+	$startdis++;
+    }
+
 
 # --------------------------------------------------------------- Render Output
 
@@ -1898,97 +2037,7 @@ sub handler {
     } elsif ($ENV{'form.block'}) {
         &examblock($r,$ENV{'form.block'});
     } elsif ($ENV{'form.sendmail'}) {
-	my $sendstatus='';
-	if ($ENV{'form.send'}) {
-	    &printheader($r,'','Messages being sent.');
-	    $r->rflush();
-	    my %content=();
-	    undef %content;
-	    if ($ENV{'form.forwid'}) {
-		my $msgid=$ENV{'form.forwid'};
-		my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
-		%content=&unpackagemsg($message{$msgid},1);
-		&statuschange($msgid,'forwarded');
-		$ENV{'form.message'}.="\n\n-- Forwarded message --\n\n".
-		    $content{'message'};
-	    }
-	    if ($ENV{'form.replyid'}) {
-		my $msgid=$ENV{'form.replyid'};
-		my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
-		%content=&unpackagemsg($message{$msgid},1);
-		&statuschange($msgid,'replied');
-	    }
-	    my %toaddr=();
-	    undef %toaddr;
-	    if ($ENV{'form.sendmode'} eq 'group') {
-		foreach (keys %ENV) {
-		    if ($_=~/^form\.send\_to\_\&\&\&[^\&]*\&\&\&\_(.+)$/) {
-			$toaddr{$1}='';
-		    }
-		}
-	    } elsif ($ENV{'form.sendmode'} eq 'upload') {
-		foreach (split(/[\n\r\f]+/,$ENV{'form.upfile'})) {
-		    my ($rec,$txt)=split(/\s*\:\s*/,$_);
-		    if ($txt) {
-			$rec=~s/\@/\:/;
-			$toaddr{$rec}.=$txt."\n";
-		    }
-		}
-	    } else {
-		$toaddr{$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}}='';
-	    }
-	    if ($ENV{'form.additionalrec'}) {
-		foreach (split(/\,/,$ENV{'form.additionalrec'})) {
-		    my ($auname,$audom)=split(/\@/,$_);
-		    $toaddr{$auname.':'.$audom}='';
-		}
-	    }
-
-	    foreach (keys %toaddr) {
-		my ($recuname,$recdomain)=split(/\:/,$_);
-		my $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'});
-		if ($toaddr{$_}) { $msgtxt.='<hr />'.$toaddr{$_}; }
-		my $thismsg;    
-		if ((($ENV{'form.critmsg'}) || ($ENV{'form.sendbck'})) && 
-		    (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {
-		    $r->print(&mt('Sending critical message').' '.$recuname.'@'.$recdomain.': ');
-		    $thismsg=&user_crit_msg($recuname,$recdomain,
-						    &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
-						    $msgtxt,
-						    $ENV{'form.sendbck'});
-		} else {
-		    $r->print(&mt('Sending').' '.$recuname.'@'.$recdomain.': ');
-		    $thismsg=&user_normal_msg($recuname,$recdomain,
-						      &Apache::lonfeedback::clear_out_html($ENV{'form.subject'}),
-						      $msgtxt,
-						      $content{'citation'});
-                    if (($ENV{'request.course.id'}) && ($ENV{'form.sendmode'} eq 'group')) {
-                        &user_normal_msg_raw(
-                        $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
-                        $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-                        'Broadcast ['.$recuname.':'.$recdomain.']',
-                        $msgtxt);
-                    }
-		}
-		$r->print($thismsg.'<br />');
-		$sendstatus.=' '.$thismsg;
-	    }
-	} else {
-	    &printheader($r,'','No messages sent.'); 
-	}
-	if ($sendstatus=~/^(\s*(?:ok|con_delayed)\s*)*$/) {
-	    $r->print('<br /><font color="green">'.&mt('Completed.').'</font>');
-	    if ($ENV{'form.displayedcrit'}) {
-		&discrit($r);
-	    } else {
-		&Apache::loncommunicate::menu($r);
-	    }
-	} else {
-	    $r->print(
-		      '<h2><font color="red">'.&mt('Could not deliver message').'</font></h2>'.
-		      &mt('Please use the browser "Back" button and correct the recipient addresses')
-		      );
-	}
+	&sendoffmail($r);
     } elsif ($ENV{'form.newfolder'}) {
 	&printheader($r,'','New Folder');
 	&makefolder($ENV{'form.newfolder'});