Diff for /loncom/interface/lonmsg.pm between versions 1.89 and 1.91

version 1.89, 2004/03/01 16:19:45 version 1.91, 2004/03/01 20:57:47
Line 857  ENDREC Line 857  ENDREC
        $r->print(<<"ENDCOMP");         $r->print(<<"ENDCOMP");
 <tr><td>$lt{'ad'}<br /><tt>username\@domain,username\@domain, ...  <tr><td>$lt{'ad'}<br /><tt>username\@domain,username\@domain, ...
 </tt></td><td>  </tt></td><td>
 <input type="text" size="50" name="additionalrec"></td></tr>  <input type="text" size="50" name="additionalrec" /></td></tr>
 <tr><td>$lt{'sb'}:</td><td><input type="text" size="50" name="subject" value="$dissub">  <tr><td>$lt{'sb'}:</td><td><input type="text" size="50" name="subject" value="$dissub" />
 </td></tr></table>  </td></tr></table>
 $latexHelp  $latexHelp
 <textarea name="message" cols="80" rows="10" wrap="hard">$dismsg  <textarea name="message" cols="80" rows="10" wrap="hard">$dismsg
Line 869  $dispcrit Line 869  $dispcrit
 ENDCOMP  ENDCOMP
     } else { # $broadcast is 'upload'      } else { # $broadcast is 'upload'
  $r->print(<<ENDUPLOAD);   $r->print(<<ENDUPLOAD);
 <input type=hidden name=sendmode value=upload>  <input type="hidden" name="sendmode" value="upload" />
 <input type="hidden" name="send" value="on" />  <input type="hidden" name="send" value="on" />
 <h3>Generate messages from a file</h3>  <h3>Generate messages from a file</h3>
 <p>  <p>
 Subject: <input type=text size=50 name=subject>  Subject: <input type="text" size="50" name="subject" />
 </p>  </p>
 <p>General message text<br />  <p>General message text<br />
 <textarea name=message cols=60 rows=10 wrap=hard>$dismsg  <textarea name="message" cols="60" rows="10" wrap="hard">$dismsg
 </textarea></p>  </textarea></p>
 <p>  <p>
 The file format for the uploaded portion of the message is:  The file format for the uploaded portion of the message is:
Line 890  username3\@domain1: text Line 890  username3\@domain1: text
 The messages will be assembled from all lines with the respective   The messages will be assembled from all lines with the respective 
 <tt>username\@domain</tt>, and appended to the general message text.</p>  <tt>username\@domain</tt>, and appended to the general message text.</p>
 <p>  <p>
 <input type=file name=upfile size=20><p>  <input type="file" name="upfile" size="40" /></p><p>
 $dispcrit  $dispcrit
 <input type=submit value="Upload and send">  <input type="submit" value="Upload and send" /></p>
 ENDUPLOAD  ENDUPLOAD
     }      }
     if ($broadcast eq 'group') {      if ($broadcast eq 'group') {
Line 944  $content{'sendername'}.'@'. Line 944  $content{'sendername'}.'@'.
     }      }
 }  }
   
 # ---------------------------------------------------------------- Print header  
   
 sub printheader {  
     my ($r,$url,$desc,$baseurl)=@_;  
     &Apache::lonhtmlcommon::add_breadcrumb  
  ({href=>$url,  
   text=>$desc});  
     &header($r,$baseurl);  
 }  
   
 # ---------------------------------------------------------------- Face to face  # ---------------------------------------------------------------- Face to face
   
 sub facetoface {  sub facetoface {
Line 1027  ENDBFORM Line 1017  ENDBFORM
     }      }
 }  }
   
   # ----------------------------------------------- Generate the text input field
   
   sub textinputarea {
       my ($r,$name,$quote)=@_;
       $r->print('<textarea name="'.$name.
         '" cols="80" rows="12" wrap="hard">'.$quote.'</textarea>');
   }
   
   # ----------------------------------------------------------- Display a message
   
   sub displaymessage {
       my ($r,$msgid)=@_;
       &statuschange($msgid,'read');
       my %message=&Apache::lonnet::get('nohist_email',[$msgid]);
       my %content=&unpackagemsg($message{$msgid});
   # info to generate "next" and "previous" buttons
       my @messages=&sortedmessages();
       my $counter=0;
       $r->print('<pre>');
       my $escmsgid=&Apache::lonnet::escape($msgid);
       foreach (@messages) {
    if ($_->[5] eq $escmsgid){
       last;
    }
    $counter++;
       }
       $r->print('</pre>');
       my $number_of_messages = scalar(@messages); #subtract 1 for last index
   # start output
       &printheader($r,'/adm/email?display='.$msgid,'Display a Message','',$content{'baseurl'});
       my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'});
   # Functions
       $r->print('<table border="2" width="100%"><tr bgcolor="#FFFFAA"><td>'.&mt('Functions').':</td>'.
         '<td><a href="/adm/email?replyto='.&Apache::lonnet::escape($msgid).$sqs.
         '"><b>'.&mt('Reply').'</b></a></td>'.
         '<td><a href="/adm/email?forward='.&Apache::lonnet::escape($msgid).$sqs.
         '"><b>'.&mt('Forward').'</b></a></td>'.
         '<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>'.
         '<td><a href="/adm/email?sortedby='.$ENV{'form.sortedby'}.
         '"><b>'.&mt('Display all Messages').'</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>');
       }
       if ($counter < $number_of_messages - 1){
    $r->print('<td><a href="/adm/email?display='.$messages[$counter+1]->[5].$sqs.
     '"><b>'.&mt('Next').'</b></a></td>');
       }
       $r->print('</tr></table>');
       $r->print('<br /><b>'.&mt('Subject').':</b> '.$content{'subject'}.
         '<br /><b>'.&mt('From').':</b> '.
         &Apache::loncommon::aboutmewrapper(
    &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),
    $content{'sendername'},$content{'senderdomain'}).' ('.
         $content{'sendername'}.' at '.
         $content{'senderdomain'}.') '.
         ($content{'courseid'}?'<br /><b>'.&mt('Course').':</b> '.$courseinfo{'description'}.
          ($content{'coursesec'}?' ('.&mt('Group/Section').': '.$content{'coursesec'}.')':''):'').
         '<br /><b>'.&mt('Time').':</b> '.$content{'time'}.
         '<p><pre>'.
         &Apache::lontexconvert::msgtexconverted($content{'message'},1).
         '</pre><hr />'.$content{'citation'}.'</p>');
       return;   
   }
   
 # ================================================================== The Header  # ================================================================== The Header
   
 sub header {  sub header {
     my ($r,$baseurl)=@_;      my ($r,$title,$baseurl)=@_;
     $r->print('<html><head><title>Communication and Messages</title>');      $r->print('<html><head><title>Communication and Messages</title>');
     if ($baseurl) {      if ($baseurl) {
  $r->print("<base href=\"http://$ENV{'SERVER_NAME'}/$baseurl\" />");   $r->print("<base href=\"http://$ENV{'SERVER_NAME'}/$baseurl\" />");
Line 1038  sub header { Line 1096  sub header {
     $r->print(&Apache::loncommon::studentbrowser_javascript().'</head>'.      $r->print(&Apache::loncommon::studentbrowser_javascript().'</head>'.
       &Apache::loncommon::bodytag('Communication and Messages'));        &Apache::loncommon::bodytag('Communication and Messages'));
         $r->print(&Apache::lonhtmlcommon::breadcrumbs          $r->print(&Apache::lonhtmlcommon::breadcrumbs
                   (undef,'Communication and Messages'));                    (undef,($title?$title:'Communication and Messages')));
   
 }  }
   
   # ---------------------------------------------------------------- Print header
   
   sub printheader {
       my ($r,$url,$desc,$title,$baseurl)=@_;
       &Apache::lonhtmlcommon::add_breadcrumb
    ({href=>$url,
     text=>$desc});
       &header($r,$title,$baseurl);
   }
   
   
 # ===================================================================== Handler  # ===================================================================== Handler
   
 sub handler {  sub handler {
Line 1074  sub handler { Line 1143  sub handler {
 # --------------------------------------------------------------- Render Output  # --------------------------------------------------------------- Render Output
   
     if ($ENV{'form.display'}) {      if ($ENV{'form.display'}) {
  my $msgid=$ENV{'form.display'};   &displaymessage($r,$ENV{'form.display'});
  &statuschange($msgid,'read');  
  my %message=&Apache::lonnet::get('nohist_email',[$msgid]);  
  my %content=&unpackagemsg($message{$msgid});  
 # info to generate "next" and "previous" buttons  
  my @messages=&sortedmessages();  
  my $counter=0;  
  $r->print('<pre>');  
  my $escmsgid=&Apache::lonnet::escape($msgid);  
  foreach (@messages) {  
     if ($_->[5] eq $escmsgid){  
  last;  
     }  
     $counter++;  
  }  
  $r->print('</pre>');  
  my $number_of_messages = scalar(@messages); #subtract 1 for last index  
 # start output  
  $r->print('<html><head><title>EMail and Messaging</title>');  
  $r->print(&Apache::loncommon::studentbrowser_javascript().  
   '</head>'.  
   &Apache::loncommon::bodytag('EMail and Messages').  
   &Apache::loncommon::help_open_faq(12).  
   &Apache::loncommon::help_open_bug('Communication Tools'));  
  my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'});  
   
  $r->print('<br /><b>'.&mt('Subject').':</b> '.$content{'subject'}.  
   '<br /><b>'.&mt('From').':</b> '.  
   &Apache::loncommon::aboutmewrapper(  
      &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),  
      $content{'sendername'},$content{'senderdomain'}).' ('.  
   $content{'sendername'}.' at '.  
   $content{'senderdomain'}.') '.  
   ($content{'courseid'}?'<br /><b>'.&mt('Course').':</b> '.$courseinfo{'description'}.  
    ($content{'coursesec'}?' ('.&mt('Group/Section').': '.$content{'coursesec'}.')':''):'').  
   '<br /><b>'.&mt('Time').':</b> '.$content{'time'}.'<p>'.  
   '<table border=2><tr bgcolor="#FFFFAA"><td>'.&mt('Functions').':</td>'.  
   '<td><a href="/adm/email?replyto='.&Apache::lonnet::escape($msgid).$sqs.  
   '"><b>'.&mt('Reply').'</b></a></td>'.  
   '<td><a href="/adm/email?forward='.&Apache::lonnet::escape($msgid).$sqs.  
   '"><b>'.&mt('Forward').'</b></a></td>'.  
   '<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>'.  
   '<td><a href="/adm/email?sortedby='.$ENV{'form.sortedby'}.  
   '"><b>'.&mt('Display all Messages').'</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>');  
  }  
  if ($counter < $number_of_messages - 1){  
     $r->print('<td><a href="/adm/email?display='.$messages[$counter+1]->[5].$sqs.  
       '"><b>'.&mt('Next').'</b></a></td>');  
  }  
  $r->print('</tr></table><p><pre>'.  
   &Apache::lontexconvert::msgtexconverted($content{'message'},1).  
   '</pre><hr>'.$content{'citation'});  
     } elsif ($ENV{'form.replyto'}) {      } elsif ($ENV{'form.replyto'}) {
  &comprep($r,$ENV{'form.replyto'});   &comprep($r,$ENV{'form.replyto'});
     } elsif ($ENV{'form.sendreply'}) {      } elsif ($ENV{'form.sendreply'}) {

Removed from v.1.89  
changed lines
  Added in v.1.91


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>