--- loncom/interface/lonmsg.pm	2005/04/11 21:51:43	1.141
+++ loncom/interface/lonmsg.pm	2005/11/01 15:59:18	1.153
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging
 #
-# $Id: lonmsg.pm,v 1.141 2005/04/11 21:51:43 raeburn Exp $
+# $Id: lonmsg.pm,v 1.153 2005/11/01 15:59:18 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -114,6 +114,7 @@ use HTML::Entities();
 use Mail::Send;
 use Apache::lonlocal;
 use Apache::loncommunicate;
+use Apache::lonfeedback;
 
 # Querystring component with sorting type
 my $sqs;
@@ -337,7 +338,20 @@ sub del_url_author_res_msg {
     }
     return &Apache::lonnet::del('nohist_res_msgs',\@delmsgs,$domain,$author);
 }
+# =================================== Clear out all author messages in URL path
 
+sub clear_author_res_msg {
+    my $url=shift;
+    $url=&Apache::lonnet::declutter($url);
+    my ($domain,$author)=($url=~/^(\w+)\/(\w+)\//);
+    my @delmsgs=();
+    foreach (&Apache::lonnet::getkeys('nohist_res_msgs',$domain,$author)) {
+	if ($_=~/^\Q$url\E/) {
+	    push (@delmsgs,$_);
+	}
+    }
+    return &Apache::lonnet::del('nohist_res_msgs',\@delmsgs,$domain,$author);
+}
 # ================= Return hash with URLs for which there is a resource message
 
 sub all_url_author_res_msg {
@@ -564,13 +578,14 @@ sub scrollbuttons {
     my ($start,$maxdis,$first,$finish,$total)=@_;
     unless ($total>0) { return ''; }
     $start++; $maxdis++;$first++;$finish++;
-    return 
+    return
+   &mt('Page').': '. 
    '<input type="submit" name="firstview" value="'.&mt('First').'" />'.
    '<input type="submit" name="prevview" value="'.&mt('Previous').'" />'.
    '<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').'" /><br />'.
-   &mt('Messages [_1] through [_2] of [_3]',$first,$finish,$total).'</form>';
+   &mt('Showing messages [_1] through [_2] of [_3]',$first,$finish,$total).'</form>';
 }
 
 # =============================================================== Folder suffix
@@ -596,6 +611,9 @@ sub statuschange {
     if (($newstatus eq 'deleted') || ($newstatus eq 'new')) {
 	&Apache::lonnet::put('email_status'.$suffix,{$msgid => $newstatus});
     }
+    if ($newstatus eq 'deleted') {
+       &movemsg(&Apache::lonnet::unescape($msgid),$folder,'trash');
+   }
 }
 
 # ============================================================= Make new folder
@@ -613,6 +631,7 @@ sub makefolder {
 
 sub movemsg {
     my ($msgid,$srcfolder,$trgfolder)=@_;
+    if ($srcfolder eq 'new') { $srcfolder=''; }
     my $srcsuffix=&foldersuffix($srcfolder);
     my $trgsuffix=&foldersuffix($trgfolder);
 
@@ -706,6 +725,8 @@ ENDDISHEADER
                       &Apache::loncoursedata::CL_FULLNAME(),
                       &Apache::loncoursedata::CL_SECTION()]);
         next if ($status ne 'Active');
+	next if ($env{'request.course.sec'} &&
+		 $section ne $env{'request.course.sec'});
         my $key = 'send_to_&&&'.$section.'&&&_'.$student;
         if (! defined($fullname) || $fullname eq '') { $fullname = $sname; }
         $r->print('<tr><td><label>'.
@@ -866,7 +887,8 @@ sub disnew {
 TABLEHEAD
         foreach my $msg (@newmsgs) {
             $r->print(<<"ENDLINK");
-<tr bgcolor="#FFBB77">
+<tr class="new" bgcolor="#FFBB77" onMouseOver="javascript:style.backgroundColor='#DD9955'" 
+onMouseOut="javascript:style.backgroundColor='#FFBB77'">
 <td><a href="/adm/email?dismode=new&display=$msg->{'msgid'}">$lt{'op'}</a></td>
 ENDLINK
             foreach ('sendtime','from','fromdom','shortsub') {
@@ -993,13 +1015,13 @@ ENDDISHEADER
 	my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID)= @{$temp[$n]};
 	if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) {
 	    if ($status eq 'new') {
-		$r->print('<tr bgcolor="#FFBB77">');
+		$r->print('<tr bgcolor="#FFBB77" onMouseOver="javascript:style.backgroundColor=\'#DD9955\'"  onMouseOut="javascript:style.backgroundColor=\'#FFBB77\'">');
 	    } elsif ($status eq 'read') {
-		$r->print('<tr bgcolor="#BBBB77">');
+		$r->print('<tr bgcolor="#BBBB77" onMouseOver="javascript:style.backgroundColor=\'#999944\'"  onMouseOut="javascript:style.backgroundColor=\'#BBBB77\'">');
 	    } elsif ($status eq 'replied') {
-		$r->print('<tr bgcolor="#AAAA88">'); 
+		$r->print('<tr bgcolor="#AAAA88" onMouseOver="javascript:style.backgroundColor=\'#888855\'"  onMouseOut="javascript:style.backgroundColor=\'#AAAA88\'">'); 
 	    } else {
-		$r->print('<tr bgcolor="#99BBBB">');
+		$r->print('<tr bgcolor="#99BBBB" onMouseOver="javascript:style.backgroundColor=\'#669999\'"  onMouseOut="javascript:style.backgroundColor=\'#99BBBB\'">');
 	    }
 	    $r->print('<td><input type="checkbox" name="delmark_'.$origID.'" /></td><td><a href="/adm/email?display='.$origID.$sqs. 
 		      '">'.&mt('Open').'</a></td><td>'.
@@ -1043,7 +1065,7 @@ ENDDISHEADER
 # ============================================================== Compose output
 
 sub compout {
-    my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder)=@_;
+    my ($r,$forwarding,$replying,$broadcast,$replycrit,$folder,$dismode)=@_;
     my $suffix=&foldersuffix($folder);
 
     if ($broadcast eq 'individual') {
@@ -1170,10 +1192,12 @@ ENDREC
 <tr><td>$lt{'sb'}:</td><td><input type="text" size="50" name="subject" value="$dissub" />
 </td></tr></table>
 $latexHelp
-<textarea name="message" cols="80" rows="15" wrap="hard">$dismsg
+<textarea name="message" id="message" cols="80" rows="15" wrap="hard">$dismsg
 </textarea></p><br />
 $dispcrit
 $disbase
+<input type="hidden" name="folder" value="$folder" />
+<input type="hidden" name="dismode" value="$dismode" />
 <input type="submit" name="send" value="$func $lt{'ma'}" />
 <input type="submit" name="cancel" value="$lt{'ca'}" /><hr />
 $citation
@@ -1187,7 +1211,7 @@ ENDCOMP
 Subject: <input type="text" size="50" name="subject" />
 </p>
 <p>General message text<br />
-<textarea name="message" cols="60" rows="10" wrap="hard">$dismsg
+<textarea name="message" id="message" cols="60" rows="10" wrap="hard">$dismsg
 </textarea></p>
 <p>
 The file format for the uploaded portion of the message is:
@@ -1209,7 +1233,9 @@ ENDUPLOAD
     if ($broadcast eq 'group') {
        &discourse;
     }
-    $r->print('</form>');
+    $r->print('</form>'.
+	      &Apache::lonfeedback::generate_preview_button('compemail','message').
+	      &Apache::lonhtmlcommon::htmlareaselectactive('message'));
 }
 
 # ---------------------------------------------------- Display all face to face
@@ -1230,8 +1256,8 @@ sub retrieve_instructor_comments {
         my %content=&unpackagemsg($records{$_});
         next if ($content{'senderdomain'} eq '');
         next if ($content{'subject'} !~ /^Record/);
-        # $content{'message'}=~s/\n/\<br\>/g;
-        $result.='Recorded by '.
+	# &Apache::lonfeedback::newline_to_br(\$content{'message'});
+	$result.='Recorded by '.
             $content{'sendername'}.'@'.$content{'senderdomain'}."\n";
         $result.=
             &Apache::lontexconvert::msgtexconverted($content{'message'})."\n";
@@ -1254,7 +1280,7 @@ sub disfacetoface {
     foreach (sort keys %records) {
         my %content=&unpackagemsg($records{$_});
         next if ($content{'senderdomain'} eq '');
-        $content{'message'}=~s/\n/\<br\>/g;
+	&Apache::lonfeedback::newline_to_br(\$content{'message'});
         if ($content{'subject'}=~/^Record/) {
 	    $result.='<h3>'.&mt('Record').'</h3>';
         } elsif ($content{'subject'}=~/^Broadcast/) {
@@ -1771,7 +1797,7 @@ sub displaymessage {
 	      '<td><a href="/adm/email?markunread='.&Apache::lonnet::escape($msgid).$sqs.
 	      '"><b>'.&mt('Mark Unread').'</b></a></td>'.
 	      '<td><a href="/adm/email?markdel='.&Apache::lonnet::escape($msgid).$sqs.
-	      '"><b>Delete</b></a></td>'.
+	      '"><b>'.&mt('Delete').'</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>');
@@ -1784,6 +1810,20 @@ sub displaymessage {
 		  '"><b>'.&mt('Next').'</b></a></td>');
     }
     $r->print('</tr></table>');
+    if ($env{'user.adv'}) {
+	$r->print('<table border="2" width="100%"><tr bgcolor="#FFAAAA"><td>'.&mt('Currently available actions (will open extra window)').':</td>');
+	my $symb=&Apache::lonnet::symbread($content{'baseurl'});      
+	if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) {
+		$r->print('<td><b>'.&Apache::loncommon::track_student_link(&mt('View recent activity'),$content{'sendername'},$content{'senderdomain'},'check').'</b></td>');
+	    }
+	if (&Apache::lonnet::allowed('opa',$env{'request.course.id'}) && $symb) {
+	    $r->print('<td><b>'.&Apache::loncommon::pprmlink(&mt('Set/Change parameters'),$content{'sendername'},$content{'senderdomain'},$symb,'check').'</b></td>');
+	}
+	if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'}) && $symb) {
+	    $r->print('<td><b>'.&Apache::loncommon::pgrdlink(&mt('Set/Change grades'),$content{'sendername'},$content{'senderdomain'},$symb,'check').'</b></td>');
+	}
+	$r->print('</tr></table>');
+    }
     $r->print('<br /><b>'.&mt('Subject').':</b> '.$content{'subject'}.
 	      ($folder ne 'sent'?'<br /><b>'.&mt('From').':</b> '.
 	      &Apache::loncommon::aboutmewrapper(
@@ -1847,7 +1887,8 @@ sub header {
     my ($r,$title,$baseurl)=@_;
     $r->print(&Apache::lonxml::xmlbegin().
 	      '<head>'.&Apache::lonxml::fontsettings().
-	      '<title>Communication and Messages</title>');
+	      '<title>Communication and Messages</title>'.
+	      &Apache::lonhtmlcommon::htmlareaheaders());
     if ($baseurl) {
 	$r->print("<base href=\"http://$ENV{'SERVER_NAME'}/$baseurl\" />");
     }
@@ -2048,6 +2089,14 @@ sub handler {
     } else {
 	$sqs.='&folder='.&Apache::lonnet::escape($folder);
     }
+# ------------------------------------------------------------ Get Display Mode
+
+    my $dismode=$env{'form.dismode'};
+    unless ($dismode) { 
+	$dismode=''; 
+    } else {
+	$sqs.='&dismode='.&Apache::lonnet::escape($dismode);
+    }
 
 # --------------------------------------------------------------------- Display
 
@@ -2079,7 +2128,7 @@ sub handler {
     if ($env{'form.display'}) {
 	&displaymessage($r,$env{'form.display'},$folder);
     } elsif ($env{'form.replyto'}) {
-	&compout($r,'',$env{'form.replyto'},undef,undef,$folder);
+	&compout($r,'',$env{'form.replyto'},undef,undef,$folder,$dismode);
     } elsif ($env{'form.confirm'}) {
 	&printheader($r,'','Confirmed Receipt');
 	foreach (keys %env) {
@@ -2104,7 +2153,7 @@ sub handler {
 	&printheader($r,'','Deleted Message');
 	&statuschange($env{'form.markdel'},'deleted',$folder);
 	&Apache::loncommunicate::menu($r);
-	&disall($r,$folder);
+	&disall($r,($folder?$folder:$dismode));
     } elsif ($env{'form.markedmove'}) {
 	my $total=0;
 	foreach (keys %env) {
@@ -2117,7 +2166,7 @@ sub handler {
 	&printheader($r,'','Moved Messages');
 	$r->print('Moved '.$total.' message(s)<p>');
 	&Apache::loncommunicate::menu($r);
-	&disall($r,$folder);
+	&disall($r,($folder?$folder:$dismode));
     } elsif ($env{'form.markeddel'}) {
 	my $total=0;
 	foreach (keys %env) {
@@ -2129,12 +2178,12 @@ sub handler {
 	&printheader($r,'','Deleted Messages');
 	$r->print('Deleted '.$total.' message(s)<p>');
 	&Apache::loncommunicate::menu($r);
-	&disall($r,$folder);
+	&disall($r,($folder?$folder:$dismode));
     } elsif ($env{'form.markunread'}) {
 	&printheader($r,'','Marked Message as Unread');
 	&statuschange($env{'form.markunread'},'new');
 	&Apache::loncommunicate::menu($r);
-	&disall($r,$folder);
+	&disall($r,($folder?$folder:$dismode));
     } elsif ($env{'form.compose'}) {
 	&compout($r,'','',$env{'form.compose'});
     } elsif ($env{'form.recordftf'}) {
@@ -2146,7 +2195,7 @@ sub handler {
 	if ($env{'form.storebasecomment'}) {
 	    &storecomment($r);
 	}
-	&disall($r,$folder);
+	&disall($r,($folder?$folder:$dismode));
     } elsif ($env{'form.newfolder'}) {
 	&printheader($r,'','New Folder');
 	&makefolder($env{'form.newfolder'});
@@ -2156,8 +2205,8 @@ sub handler {
 	&storedcommentlisting($r);
     } else {
 	&printheader($r,'','Display All Messages');
-	&Apache::loncommunicate::menu($r);
-	&disall($r,$folder);
+	&Apache::loncommunicate::menu($r); 
+	&disall($r,($folder?$folder:$dismode));
     }
     $r->print(&Apache::loncommon::endbodytag().'</html>');
     return OK;