Diff for /loncom/interface/lonsupportreq.pm between versions 1.60 and 1.65

version 1.60, 2010/12/02 22:05:17 version 1.65, 2011/03/03 00:33:38
Line 70  sub handler { Line 70  sub handler {
           
 sub print_request_form {  sub print_request_form {
     my ($r,$origurl,$function) = @_;      my ($r,$origurl,$function) = @_;
     my ($os,$browser,$bversion,$uhost,$uname,$udom,$uhome,$urole,$usec,$email,$cid,$cdom,$cnum,$ctitle,$ccode,$sectionlist,$lastname,$firstname,$server,$formname);      my ($os,$browser,$bversion,$uhost,$uname,$udom,$uhome,$urole,$usec,$email,$cid,
           $cdom,$cnum,$ctitle,$ccode,$sectionlist,$lastname,$firstname,$server,
           $formname,$public);
     $function = &Apache::loncommon::get_users_function() if (!$function);      $function = &Apache::loncommon::get_users_function() if (!$function);
     $ccode = '';      $ccode = '';
     $os = $env{'browser.os'};      $os = $env{'browser.os'};
     $browser = $env{'browser.type'};      $browser = $env{'browser.type'};
     $bversion = $env{'browser.version'};      $bversion = $env{'browser.version'};
     $uhost = $env{'request.host'};      $uhost = $env{'request.host'};
     my ($uname,$udom,$public);  
     if (($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) {      if (($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public')) {
         $public = 1;          $public = 1;
     } else {      } else {
Line 243  function initialize_codes() { Line 244  function initialize_codes() {
     }      }
   
     my $js = '<script type="text/javascript">'."\n$scripttag\n$jscript\n".      my $js = '<script type="text/javascript">'."\n$scripttag\n$jscript\n".
  '</script>';       $loaditems.'</script>';
     my %add_entries = (topmargin    => "0",      my %add_entries = (topmargin    => "0",
        marginheight => "0",         marginheight => "0",
        onLoad       =>"initialize_codes()",);         onLoad       =>"initialize_codes()",);
Line 531  sub print_request_receipt { Line 532  sub print_request_receipt {
         my $totcodes = 0;          my $totcodes = 0;
         my %coursecodes;          my %coursecodes;
         $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$defdom,$totcodes);          $totcodes = &Apache::courseclassifier::retrieve_instcodes(\%coursecodes,$defdom,$totcodes);
         my $coursecode;  
         my @standardnames = &Apache::loncommon::get_standard_codeitems();          my @standardnames = &Apache::loncommon::get_standard_codeitems();
         if ($totcodes > 0) {          if ($totcodes > 0) {
             $coursecode = &Apache::courseclassifier::instcode_from_selectors($defdom);               my $noregexps = 1;
               $coursecode = 
                   &Apache::courseclassifier::instcode_from_selectors($defdom,$noregexps);
         }           } 
         if ($coursecode eq '') {          if ($coursecode eq '') {
             foreach my $item (@standardnames) {              foreach my $item (@standardnames) {
Line 772  END Line 774  END
     if ($bcc ne '') {      if ($bcc ne '') {
         $msg->add("Bcc" => $bcc);          $msg->add("Bcc" => $bcc);
     }      }
     $msg->add('Content-type','text/plain; charset=UTF-8');      $msg->attr("content-type"         => "text/plain");
       $msg->attr("content-type.charset" => "UTF-8");
   
     if ($attachmentpath) {      if ($attachmentpath) {
         my ($type, $encoding) = MIME::Types::by_suffix($attachmentpath);          my ($type, $encoding) = MIME::Types::by_suffix($attachmentpath);

Removed from v.1.60  
changed lines
  Added in v.1.65


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