[BACK]Return to lonsupportreq.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonsupportreq.pm between versions 1.79.2.11 and 1.79.2.12

version 1.79.2.11, 2024/07/03 23:58:21 version 1.79.2.12, 2024/07/15 17:13:06
Line 762  sub print_request_receipt { Line 762  sub print_request_receipt {
                  secn        => 'Section',                   secn        => 'Section',
                  warn        => 'Warning: Problem with support e-mail address',                   warn        => 'Warning: Problem with support e-mail address',
                  your        => 'Your support request contained the following information',                   your        => 'Your support request contained the following information',
                    belo        => 'Below is your support request which could not be sent',
                    ifyk        => 'If you know an IT support address for your institution, you could copy this information and send it to that email address.',
                  sect        => 'section',                   sect        => 'section',
                  info        => 'Information supplied',                   info        => 'Information supplied',
                  adin        => 'Additional information recorded',                   adin        => 'Additional information recorded',
Line 981  END Line 983  END
   
     my $message;      my $message;
     if (!$bad_email) {      if (!$bad_email) {
         $message = &Apache::lonhtmlcommon::confirm_success(          $message = &mt('A support request has been sent to [_1]','<tt>'.$to.'</tt>');
             &mt('A support request has been sent to [_1]','<tt>'.$to.'</tt>'));  
     } else {      } else {
         $message = &Apache::lonhtmlcommon::confirm_success(          $message = $lt{'warn'}.'<br />';
             $lt{'warn'}.'<br />'          if ($to eq '') {
            .&mt('As the e-mail address provided for this LON-CAPA server ([_1]) does not appear to be a valid e-mail address, your support request has [_2]not[_3] been sent to the LON-CAPA support staff or administrator at your institution.','<tt>'.$to.'</tt>','<b>','</b>')              $message .= &mt('For this LON-CAPA server no e-mail address has been configured to receive support requests, so your support request has [_1]not[_2] been sent to the LON-CAPA support staff or administrator at your institution.','<b>','</b>');
            .' '.&mt('Instead a copy has been sent to the LON-CAPA support team at Michigan State University.'),1);           } else {
         $to = 'helpdesk@lon-capa.org';              $message .= &mt('As the e-mail address provided for this LON-CAPA server ([_1]) does not appear to be a valid e-mail address, your support request has [_2]not[_3] been sent to the LON-CAPA support staff or administrator at your institution.','<tt>'.$to.'</tt>','<b>','</b>');
           }
     }      }
     $r->print(&Apache::loncommon::confirmwrapper($message));      $r->print(&Apache::loncommon::confirmwrapper(&Apache::lonhtmlcommon::confirm_success($message,$bad_email)));
   
     if ($reqemail ne '') {      if ($reqemail ne '') {
         $from = $reqemail;          $from = $reqemail;
Line 1099  END Line 1101  END
         }          }
     }      }
   
     my $msg = MIME::Lite->new(      unless ($bad_email) {
                  From    => $from,          my $msg = MIME::Lite->new(
                  To      => $to,                       From    => $from,
                  Subject => $subject,                       To      => $to,
                  Type    =>'TEXT',                       Subject => $subject,
                  Data    => $supportmsg,                       Type    =>'TEXT',
                  );                       Data    => $supportmsg,
     if ($homeserver) {                       );
         if (@ok_ccs > 0) {          if ($homeserver) {
             my $cc_string = join(', ',@ok_ccs);              if (@ok_ccs > 0) {
             $msg->add("Cc" => $cc_string);                  my $cc_string = join(', ',@ok_ccs);
                   $msg->add("Cc" => $cc_string);
               }
         }          }
     }          if ($bcc ne '') {
     if ($bcc ne '') {              $msg->add("Bcc" => $bcc);
         $msg->add("Bcc" => $bcc);          }
     }          $msg->attr("content-type"         => "text/plain");
     $msg->attr("content-type"         => "text/plain");          $msg->attr("content-type.charset" => "UTF-8");
     $msg->attr("content-type.charset" => "UTF-8");  
   
     if ($homeserver && $attachmentpath) {          if ($homeserver && $attachmentpath) {
         my ($type, $encoding) = MIME::Types::by_suffix($attachmentpath);              my ($type, $encoding) = MIME::Types::by_suffix($attachmentpath);
         $msg->attach(Type     => $type,              $msg->attach(Type     => $type,
                      Path     => $attachmentpath,                           Path     => $attachmentpath,
                      Filename => $fname                           Filename => $fname
                      );                           );
   
           } elsif ($attachment_text ne '') {
               $msg->attach(Type => 'TEXT',
                            Data => $attachment_text);
           }
   
     } elsif ($attachment_text ne '') {          ### Send it:
         $msg->attach(Type => 'TEXT',          $msg->send('sendmail');
                      Data => $attachment_text);  
     }      }
   
 ### Send it:  
     $msg->send('sendmail');  
   
     if ($attachmentpath =~ m|$Apache::lonnet::perlvar{'lonDaemons'}/tmp/helprequests/(\d+)/[^/]+|) {      if ($attachmentpath =~ m|$Apache::lonnet::perlvar{'lonDaemons'}/tmp/helprequests/(\d+)/[^/]+|) {
         unlink($attachmentpath);          unlink($attachmentpath);
     }      }
     $r->print('<b>'.$lt{'your'}.'</b>:<br /><br />'."\n");      if ($bad_email) {
           $r->print('<b>'.$lt{'belo'}.'</b><br />'.
                     $lt{'ifyk'}.'<br /><br />'."\n");
       } else {
           $r->print('<b>'.$lt{'your'}.'</b>:<br /><br />'."\n");
       }
     $r->print('<div style="width:620px;">'.      $r->print('<div style="width:620px;">'.
               &Apache::lonhtmlcommon::start_pick_box().                &Apache::lonhtmlcommon::start_pick_box().
               &Apache::lonhtmlcommon::row_title($lt{'info'},undef,'LC_oddrow_value')."\n".$displaymsg."\n".                &Apache::lonhtmlcommon::row_title($lt{'info'},undef,'LC_oddrow_value')."\n".$displaymsg."\n".
Removed from v.1.79.2.11  
changed lines
  Added in v.1.79.2.12

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