Diff for /loncom/interface/lonmsg.pm between versions 1.44 and 1.45

version 1.44, 2002/12/27 14:59:42 version 1.45, 2002/12/27 16:33:36
Line 166  sub user_crit_msg_raw { Line 166  sub user_crit_msg_raw {
            'put:'.$domain.':'.$user.':critical:'.             'put:'.$domain.':'.$user.':critical:'.
            &Apache::lonnet::escape($msgid).'='.             &Apache::lonnet::escape($msgid).'='.
            &Apache::lonnet::escape($message),$homeserver);             &Apache::lonnet::escape($message),$homeserver);
          if ($ENV{'request.course.id'}) {
             &user_normal_msg_raw(
               $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
               $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
               'Critical ['.$user.':'.$domain.']',
       $message);
          }
     } else {      } else {
        $status='no_host';         $status='no_host';
     }      }
Line 579  ENDUPLOAD Line 586  ENDUPLOAD
     $r->print('</form>');      $r->print('</form>');
 }  }
   
   # ---------------------------------------------------- Display all face to face
   
   sub disfacetoface {
       my ($r,$user,$domain)=@_;
       unless ($ENV{'request.course.id'}) { return; }
       unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
    return;
       }
       my %records=&Apache::lonnet::dump('nohist_email',
    $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
    $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
                            '%255b'.$user.'%253a'.$domain.'%255d');
       my $result='';
       foreach (sort keys %records) {
           my %content=&unpackagemsg($records{$_});
           next if ($content{'senderdomain'} eq '');
           $content{'message'}=~s/\n/\<br\>/g;
           if ($content{'subject'}=~/^Record/) {
       $result.='<h3>Record</h3>';
           } else {
               $result.='<h3>Sent Message</h3>';
               %content=&unpackagemsg($content{'message'});
               $content{'message'}=
                   '<b>Subject: '.$content{'subject'}.'</b><br />'.
    $content{'message'};
           }
           $result.='By: <b>'.
   &Apache::loncommon::aboutmewrapper(
    &Apache::loncommon::plainname($content{'sendername'},$content{'senderdomain'}),$content{'sendername'},$content{'senderdomain'}).'</b> ('.
   $content{'sendername'}.'@'.
               $content{'senderdomain'}.') '.$content{'time'}.
               '<br><blockquote>'.
                 &Apache::lontexconvert::msgtexconverted($content{'message'}).
         '</blockquote>';
        }
       # Check to see if there were any messages.
       if ($result eq '') {
           $r->print("<p><b>No face-to-face records or critical messages in this course.</b></p>");
       } else {
          $r->print($result);
       }
   }
   
 # ---------------------------------------------------------------- Face to face  # ---------------------------------------------------------------- Face to face
   
 sub facetoface {  sub facetoface {
Line 590  sub facetoface { Line 640  sub facetoface {
     if ($ENV{'form.recdomain'}) { $defdom=$ENV{'form.recdomain'}; }      if ($ENV{'form.recdomain'}) { $defdom=$ENV{'form.recdomain'}; }
     my $domform = &Apache::loncommon::select_dom_form($defdom,'recdomain');      my $domform = &Apache::loncommon::select_dom_form($defdom,'recdomain');
     $r->print(<<"ENDTREC");      $r->print(<<"ENDTREC");
 <h2>User Records of Face-To-Face Discussions and Messages in Course</h2>  <h2>User Records of Face-To-Face Discussions and Critical Messages in Course</h2>
 <form method="post" action="/adm/email">  <form method="post" action="/adm/email">
 <input type="hidden" name="recordftf" value="retrieve" />  <input type="hidden" name="recordftf" value="retrieve" />
 <table>  <table>
Line 607  ENDTREC Line 657  ENDTREC
         ($ENV{'form.recdomain'}) && ($ENV{'form.recuname'})) {          ($ENV{'form.recdomain'}) && ($ENV{'form.recuname'})) {
         chomp($ENV{'form.newrecord'});          chomp($ENV{'form.newrecord'});
         if ($ENV{'form.newrecord'}) {          if ($ENV{'form.newrecord'}) {
     my $subject=             &user_normal_msg_raw(
                'Record ['.$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}.']';              $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
               $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
               'Record ['.$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}.']',
       $ENV{'form.newrecord'});
         }          }
           &disfacetoface($r,$ENV{'form.recuname'},$ENV{'form.recdomain'});
  $r->print(<<ENDRHEAD);   $r->print(<<ENDRHEAD);
 <form method="post" action="/adm/email">  <form method="post" action="/adm/email">
 <input name="recdomain" value="$ENV{'form.recdomain'}" type="hidden" />  <input name="recdomain" value="$ENV{'form.recdomain'}" type="hidden" />
Line 618  ENDRHEAD Line 672  ENDRHEAD
         $r->print(<<ENDBFORM);          $r->print(<<ENDBFORM);
 <hr />New Record (record is visible to course faculty and staff)<br />  <hr />New Record (record is visible to course faculty and staff)<br />
 <textarea name="newrecord" cols="80" rows="10" wrap="hard"></textarea>  <textarea name="newrecord" cols="80" rows="10" wrap="hard"></textarea>
   <br />
   <input type="hidden" name="recordftf" value="post" />
   <input type="submit" value="Post this record" />
 </form>  </form>
 ENDBFORM  ENDBFORM
     }      }

Removed from v.1.44  
changed lines
  Added in v.1.45


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