--- loncom/interface/lonmsg.pm	2004/11/12 16:22:48	1.115
+++ loncom/interface/lonmsg.pm	2004/11/17 21:31:37	1.121
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.115 2004/11/12 16:22:48 www Exp $
+# $Id: lonmsg.pm,v 1.121 2004/11/17 21:31:37 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -531,13 +531,19 @@ sub folderlist {
 	    &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="hidden" name="sortedby" value="'.$ENV{'form.sortedby'}.'" />'.
+			      ($folder=~/^(new|critical)/?'</form>':'');
+}
+
+sub scrollbuttons {
+    my ($start,$maxdis,$first,$finish,$total)=@_;
+    $start++; $maxdis++;$first++;$finish++;
    '<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="'.$start.'" onChange="this.form.submit()" /> of '.$maxdis.
    '<input type="submit" name="nextview" value="'.&mt('Next').'" />'.
-   '<input type="submit" name="lastview" value="'.&mt('Last').'" />':'').
-	    '</form>';
+   '<input type="submit" name="lastview" value="'.&mt('Last').'" /><br />'.
+   &mt('Messages [_1] through [_2] of [_3]',$first,$finish,$total).'</form>';
 }
 
 # =============================================================== Folder suffix
@@ -907,11 +913,13 @@ ENDDISHEADER
     my $fsqs='&folder='.$folder;
     my @temp=sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder);
     my $totalnumber=$#temp+1;
-    my $number=int($totalnumber/$interdis)+1;
+    my $number=int($totalnumber/$interdis);
+    if (($startdis<0) || ($startdis>$number)) { $startdis=$number; }
     my $firstdis=$interdis*$startdis;
     if ($firstdis>$#temp) { $firstdis=$#temp-$interdis+1; }
     my $lastdis=$firstdis+$interdis-1;
     if ($lastdis>$#temp) { $lastdis=$#temp; }
+    $r->print(&scrollbuttons($startdis,$number,$firstdis,$lastdis,$totalnumber));
     $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") {
@@ -977,7 +985,7 @@ ENDDISHEADER
 	$r->print(
 	      '<p><input type="submit" name="markeddel" value="'.&mt('Delete Checked').'" /></p>');
     }
-$r->print('<p><input type="submit" name="markedmove" value="'.&mt('Move Checked to Folder').'" />');
+    $r->print('<p><input type="submit" name="markedmove" value="'.&mt('Move Checked to Folder').'" />');
     my @allfolders=&Apache::lonnet::getkeys('email_folders');
     if ($allfolders[0]=~/^error:/) { @allfolders=(); }
     $r->print(
@@ -998,6 +1006,7 @@ $r->print('<p><input type="submit" name=
 
 sub compout {
     my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder)=@_;
+    my $suffix=&foldersuffix($folder);
 
     if ($broadcast eq 'individual') {
 	&printheader($r,'/adm/email?compose=individual',
@@ -1049,7 +1058,7 @@ sub compout {
     my %content;
     my $defdom=$ENV{'user.domain'};
     if ($forwarding) {
-	%message=&Apache::lonnet::get('nohist_email',[$forwarding]);
+	%message=&Apache::lonnet::get('nohist_email'.$suffix,[$forwarding]);
 	%content=&unpackagemsg($message{$forwarding},$folder);
 	$dispcrit.='<input type="hidden" name="forwid" value="'.
 	    $forwarding.'" />';
@@ -1063,7 +1072,7 @@ sub compout {
 	}
     }
     if ($replying) {
-	%message=&Apache::lonnet::get('nohist_email',[$replying]);
+	%message=&Apache::lonnet::get('nohist_email'.$suffix,[$replying]);
 	%content=&unpackagemsg($message{$replying},$folder);
 	$dispcrit.='<input type="hidden" name="replyid" value="'.
 	    $replying.'" />';
@@ -1077,7 +1086,10 @@ sub compout {
 	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 />';
+		$disbase.='<input type="checkbox" name="storebasecomment" />'.&mt('Store message for re-use').
+		    ' <a href="/adm/email?showcommentbaseurl='.
+		    &Apache::lonnet::escape($content{'baseurl'}).'" target="comments">'.
+		    &mt('Show re-usable messages').'</a><br />';
 	    }
 	}
     }
@@ -1813,10 +1825,45 @@ sub printheader {
     &header($r,$title,$baseurl);
 }
 
+# ------------------------------------------------------------ Store the comment
+
+sub storecomment {
+    my ($r)=@_;
+    my $msgtxt=&Apache::lonfeedback::clear_out_html($ENV{'form.message'});
+    my $cleanmsgtxt='';
+    foreach (split(/[\n\r]/,$msgtxt)) {
+	unless ($_=~/^\s*(\>|\&gt\;)/) {
+	    $cleanmsgtxt.=$_."\n";
+	}
+    }
+    my $key=&Apache::lonnet::escape($ENV{'form.baseurl'}).'___'.time;
+    &Apache::lonnet::put('nohist_stored_comments',{ $key => $cleanmsgtxt });
+}
+
+sub storedcommentlisting {
+    my ($r)=@_;
+    my %msgs=&Apache::lonnet::dump('nohist_stored_comments',undef,undef,
+       '^'.&Apache::lonnet::escape(&Apache::lonnet::escape($ENV{'form.showcommentbaseurl'})));
+    $r->print('<html><body>');
+    if ((keys %msgs)[0]=~/^error\:/) {
+	$r->print(&mt('No stored comments yet.'));
+    } else {
+	my $found=0;
+	foreach (sort keys %msgs) {
+	    $r->print("\n".$msgs{$_}."<hr />");
+	    $found=1;
+	}
+	unless ($found) {
+	    $r->print(&mt('No stored comments yet for this resource.'));
+	}
+    }
+}
+
 # ---------------------------------------------------------------- Send an email
 
 sub sendoffmail {
-    my ($r)=@_;
+    my ($r,$folder)=@_;
+    my $suffix=&foldersuffix($folder);
     my $sendstatus='';
     if ($ENV{'form.send'}) {
 	&printheader($r,'','Messages being sent.');
@@ -1825,17 +1872,17 @@ sub sendoffmail {
 	undef %content;
 	if ($ENV{'form.forwid'}) {
 	    my $msgid=$ENV{'form.forwid'};
-	    my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
+	    my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]);
 	    %content=&unpackagemsg($message{$msgid},1);
-	    &statuschange($msgid,'forwarded');
+	    &statuschange($msgid,'forwarded',$folder);
 	    $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]);
+	    my %message=&Apache::lonnet::get('nohist_email'.$suffix,[$msgid]);
 	    %content=&unpackagemsg($message{$msgid},1);
-	    &statuschange($msgid,'replied');
+	    &statuschange($msgid,'replied',$folder);
 	}
 	my %toaddr=();
 	undef %toaddr;
@@ -1926,7 +1973,8 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
         ['display','replyto','forward','markread','markdel','markunread',
          'sendreply','compose','sendmail','critical','recname','recdom',
-         'recordftf','sortedby','block','folder','startdis','interdis']);
+         'recordftf','sortedby','block','folder','startdis','interdis',
+	 'showcommentbaseurl']);
     $sqs='&sortedby='.$ENV{'form.sortedby'}.
 	 '&startdis='.$ENV{'form.startdis'}.
 	 '&interdis='.$ENV{'form.interdis'};
@@ -1956,9 +2004,23 @@ sub handler {
 # --------------------------------------------------------------------- Display
 
     $startdis=$ENV{'form.startdis'};
+    $startdis--;
     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
 
@@ -1985,10 +2047,11 @@ sub handler {
 	&printheader($r,'','Displaying Critical Messages');
 	&discrit($r);
     } elsif ($ENV{'form.forward'}) {
-	&compout($r,$ENV{'form.forward'});
+	&compout($r,$ENV{'form.forward'},undef,undef,undef,$folder);
     } elsif ($ENV{'form.markdel'}) {
 	&printheader($r,'','Deleted Message');
 	&statuschange($ENV{'form.markdel'},'deleted',$folder);
+	&Apache::loncommunicate::menu($r);
 	&disall($r,$folder);
     } elsif ($ENV{'form.markedmove'}) {
 	my $total=0;
@@ -2001,6 +2064,7 @@ sub handler {
 	}
 	&printheader($r,'','Moved Messages');
 	$r->print('Moved '.$total.' message(s)<p>');
+	&Apache::loncommunicate::menu($r);
 	&disall($r,$folder);
     } elsif ($ENV{'form.markeddel'}) {
 	my $total=0;
@@ -2012,10 +2076,12 @@ sub handler {
 	}
 	&printheader($r,'','Deleted Messages');
 	$r->print('Deleted '.$total.' message(s)<p>');
+	&Apache::loncommunicate::menu($r);
 	&disall($r,$folder);
     } elsif ($ENV{'form.markunread'}) {
 	&printheader($r,'','Marked Message as Unread');
 	&statuschange($ENV{'form.markunread'},'new');
+	&Apache::loncommunicate::menu($r);
 	&disall($r,$folder);
     } elsif ($ENV{'form.compose'}) {
 	&compout($r,'','',$ENV{'form.compose'});
@@ -2024,13 +2090,21 @@ sub handler {
     } elsif ($ENV{'form.block'}) {
         &examblock($r,$ENV{'form.block'});
     } elsif ($ENV{'form.sendmail'}) {
-	&sendoffmessage($r);
+	&sendoffmail($r,$folder);
+	if ($ENV{'form.storebasecomment'}) {
+	    &storecomment($r);
+	}
+	&disall($r,$folder);
     } elsif ($ENV{'form.newfolder'}) {
 	&printheader($r,'','New Folder');
 	&makefolder($ENV{'form.newfolder'});
+	&Apache::loncommunicate::menu($r);
 	&disall($r,$ENV{'form.newfolder'});
+    } elsif ($ENV{'form.showcommentbaseurl'}) {
+	&storedcommentlisting($r);
     } else {
 	&printheader($r,'','Display All Messages');
+	&Apache::loncommunicate::menu($r);
 	&disall($r,$folder);
     }
     $r->print('</body></html>');