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

version 1.39, 2002/09/16 20:06:12 version 1.44, 2002/12/27 14:59:42
Line 119  sub unpackmsgid { Line 119  sub unpackmsgid {
     return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid});      return ($sendtime,$shortsubj,$fromname,$fromdomain,$status{$msgid});
 }   } 
   
   # ============================================================= Check for email
   
   sub newmail {
       if ((time-$ENV{'user.mailcheck.time'})>300) {
           my %what=&Apache::lonnet::get('email_status',['recnewemail']);
           &Apache::lonnet::appenv('user.mailcheck.time'=>time);
           if ($what{'recnewemail'}>0) { return 1; }
       }
       return 0;
   }
   
 # =============================== Automated message to the author of a resource  # =============================== Automated message to the author of a resource
   
 sub author_res_msg {  sub author_res_msg {
Line 199  sub user_crit_received { Line 210  sub user_crit_received {
      &user_normal_msg($contents{'sendername'},$contents{'senderdomain'},       &user_normal_msg($contents{'sendername'},$contents{'senderdomain'},
                      'Receipt: '.$ENV{'user.name'}.' at '.$ENV{'user.domain'},                       'Receipt: '.$ENV{'user.name'}.' at '.$ENV{'user.domain'},
                      'User '.$ENV{'user.name'}.' at '.$ENV{'user.domain'}.                       'User '.$ENV{'user.name'}.' at '.$ENV{'user.domain'}.
                      ' acknowledged receipt of message "'.                       ' acknowledged receipt of message'."\n".'   "'.
                      $contents{'subject'}.'" dated '.$contents{'time'}.".\n\n"                       $contents{'subject'}.'"'."\n".'dated '.
                      .'Message ID: '.$contents{'msgid'}):'no msg req');                       $contents{'time'}.".\n"
                        ):'no msg req');
     $status.=' trans: '.      $status.=' trans: '.
      &Apache::lonnet::put(       &Apache::lonnet::put(
      'nohist_email',{$contents{'msgid'} => $message{$msgid}});       'nohist_email',{$contents{'msgid'} => $message{$msgid}});
Line 229  sub user_normal_msg_raw { Line 241  sub user_normal_msg_raw {
            'put:'.$domain.':'.$user.':nohist_email:'.             'put:'.$domain.':'.$user.':nohist_email:'.
            &Apache::lonnet::escape($msgid).'='.             &Apache::lonnet::escape($msgid).'='.
            &Apache::lonnet::escape($message),$homeserver);             &Apache::lonnet::escape($message),$homeserver);
          &Apache::lonnet::put
                            ('email_status',{'recnewemail'=>time},$domain,$user);
     } else {      } else {
        $status='no_host';         $status='no_host';
     }      }
Line 565  ENDUPLOAD Line 579  ENDUPLOAD
     $r->print('</form>');      $r->print('</form>');
 }  }
   
   # ---------------------------------------------------------------- Face to face
   
   sub facetoface {
       my ($r,$stage)=@_;
       unless (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'})) {
    return;
       }
       my $defdom=$ENV{'user.domain'};
       if ($ENV{'form.recdomain'}) { $defdom=$ENV{'form.recdomain'}; }
       my $domform = &Apache::loncommon::select_dom_form($defdom,'recdomain');
       $r->print(<<"ENDTREC");
   <h2>User Records of Face-To-Face Discussions and Messages in Course</h2>
   <form method="post" action="/adm/email">
   <input type="hidden" name="recordftf" value="retrieve" />
   <table>
   <tr><td>Username:</td><td><input type=text size=12 name=recuname value="$ENV{'form.recuname'}"></td>
   <td rowspan="2">
   <input type="submit" value="Retrieve discussion and message records"></td>
   </tr>
   <tr><td>Domain:</td>
   <td>$domform</td></tr>
   </table>
   </form>
   ENDTREC
       if (($stage ne 'query') &&
           ($ENV{'form.recdomain'}) && ($ENV{'form.recuname'})) {
           chomp($ENV{'form.newrecord'});
           if ($ENV{'form.newrecord'}) {
       my $subject=
                  'Record ['.$ENV{'form.recuname'}.':'.$ENV{'form.recdomain'}.']';
           }
    $r->print(<<ENDRHEAD);
   <form method="post" action="/adm/email">
   <input name="recdomain" value="$ENV{'form.recdomain'}" type="hidden" />
   <input name="recuname" value="$ENV{'form.recuname'}" type="hidden" />
   ENDRHEAD
           $r->print(<<ENDBFORM);
   <hr />New Record (record is visible to course faculty and staff)<br />
   <textarea name="newrecord" cols="80" rows="10" wrap="hard"></textarea>
   </form>
   ENDBFORM
       }
   }
   
 # ===================================================================== Handler  # ===================================================================== Handler
   
 sub handler {  sub handler {
Line 580  sub handler { Line 638  sub handler {
 # --------------------------- Get query string for limited number of parameters  # --------------------------- Get query string for limited number of parameters
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
         ['display','replyto','forward','markread','markdel','markunread',          ['display','replyto','forward','markread','markdel','markunread',
          'sendreply','compose','sendmail','critical','recname','recdom']);           'sendreply','compose','sendmail','critical','recname','recdom',
            'recordftf']);
   
   # ------------------------------------------------------ They checked for email
     &Apache::lonnet::put('email_status',{'recnewemail'=>0});
 # --------------------------------------------------------------- Render Output  # --------------------------------------------------------------- Render Output
       
   $r->print('<html><head><title>EMail and Messaging</title></head>'.    $r->print('<html><head><title>EMail and Messaging</title></head>'.
Line 606  $content{'sendername'},$content{'senderd Line 667  $content{'sendername'},$content{'senderd
              '"><b>Forward</b></a></td>'.               '"><b>Forward</b></a></td>'.
         '<td><a href="/adm/email?markunread='.&Apache::lonnet::escape($msgid).          '<td><a href="/adm/email?markunread='.&Apache::lonnet::escape($msgid).
              '"><b>Mark Unread</b></a></td>'.               '"><b>Mark Unread</b></a></td>'.
           '<td><a href="/adm/email?markdel='.&Apache::lonnet::escape($msgid).
                '"><b>Delete</b></a></td>'.
         '<td><a href="/adm/email"><b>Display all Messages</b></a></td>'.          '<td><a href="/adm/email"><b>Display all Messages</b></a></td>'.
              '</tr></table><p><pre>'.               '</tr></table><p><pre>'.
              &Apache::lontexconvert::msgtexconverted($content{'message'}).               &Apache::lontexconvert::msgtexconverted($content{'message'}).
Line 673  $content{'sendername'},$content{'senderd Line 736  $content{'sendername'},$content{'senderd
       &disall($r);        &disall($r);
   } elsif ($ENV{'form.compose'}) {    } elsif ($ENV{'form.compose'}) {
       &compout($r,'',$ENV{'form.compose'});        &compout($r,'',$ENV{'form.compose'});
     } elsif ($ENV{'form.recordftf'}) {
         &facetoface($r,$ENV{'form.recordftf'});
   } elsif ($ENV{'form.sendmail'}) {    } elsif ($ENV{'form.sendmail'}) {
       my %content=();        my %content=();
       undef %content;        undef %content;

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


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