Diff for /loncom/interface/lonsupportreq.pm between versions 1.79.2.4 and 1.79.2.6

version 1.79.2.4, 2019/07/26 18:03:59 version 1.79.2.6, 2019/08/12 18:11:42
Line 322  $loaditems Line 322  $loaditems
 // ]]>  // ]]>
 </script>  </script>
 ENDJS  ENDJS
     if ($recaptcha_version >=2) {      if ($knownuser) {
           $js .="\n".'<script type="text/javascript" src="/res/adm/includes/file_upload.js"></script>';
       } elsif ($recaptcha_version >=2) {
         $js.= "\n".'<script src="https://www.google.com/recaptcha/api.js"></script>'."\n";          $js.= "\n".'<script src="https://www.google.com/recaptcha/api.js"></script>'."\n";
     }      }
     my %add_entries = (      my %add_entries = (
Line 580  ENDJS Line 582  ENDJS
                     $showmax = $helpform{'maxsize'};                      $showmax = $helpform{'maxsize'};
                 }                  }
                 $showmax = ' ('.sprintf("%.2f",$showmax).' '.&mt('MB max.').')';                  $showmax = ' ('.sprintf("%.2f",$showmax).' '.&mt('MB max.').')';
                 $output .= &Apache::lonhtmlcommon::row_title($html_lt{'opfi'},undef,$css[$i]).                  $output .= &Apache::lonhtmlcommon::row_title($html_lt{'opfi'},undef,$css[$i])
                        ' <input type="file" name="screenshot" size="20" /><br />'.                      .' <input type="file" name="screenshot" class="LC_flUpload" size="20" />'
                        "\n".$html_lt{'uplf'}.$showmax."\n".                      .'<input type="hidden" id="LC_free_space" value="'.$max.'" />'
                        &Apache::lonhtmlcommon::row_closure();                      .'<br />'."\n".$html_lt{'uplf'}.$showmax."\n"
                       .&Apache::lonhtmlcommon::row_closure();
                 $num ++;                  $num ++;
                 $i = $num%2;                  $i = $num%2;
             }              }
Line 663  sub print_request_receipt { Line 666  sub print_request_receipt {
     my @ENVvars = ('HTTP_HOST','HTTP_USER_AGENT','REMOTE_ADDR','SERVER_ADDR','SERVER_NAME');      my @ENVvars = ('HTTP_HOST','HTTP_USER_AGENT','REMOTE_ADDR','SERVER_ADDR','SERVER_NAME');
     my @envvars = ('browser.os','browser.type','browser.version','user.home','request.role');      my @envvars = ('browser.os','browser.type','browser.version','user.home','request.role');
     my @loncvars = ('user.name','user.domain','request.course.sec','request.course.id');      my @loncvars = ('user.name','user.domain','request.course.sec','request.course.id');
     my @cookievars = ('lonID');      my @cookievars;
       if ($ENV{'SERVER_PORT'} == 443) {
           @cookievars = ('lonLinkID');
       } else {
           @cookievars = ('lonID');
       }
   
     my $admin = $Apache::lonnet::perlvar{'lonAdminMail'};      my $admin = $Apache::lonnet::perlvar{'lonAdminMail'};
     my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};      my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
Line 1001  END Line 1009  END
     if ($$cookie{'lonID'} =~ /lonID=($LONCAPA::handle_re);/) {      if ($$cookie{'lonID'} =~ /lonID=($LONCAPA::handle_re);/) {
         $cookies{'lonID'} = $1;          $cookies{'lonID'} = $1;
     }      }
       if ($$cookie{'lonLinkID'} =~ /lonLinkID=([a-f0-9]+_linked);/) {
           $cookies{'lonLinkID'} = $1;
       }
     if ($attachmentpath =~ m-/([^/]+)$-) {      if ($attachmentpath =~ m-/([^/]+)$-) {
         $fname = $1;          $fname = $1;
         $displaymsg .= '<br />'          $displaymsg .= '<br />'

Removed from v.1.79.2.4  
changed lines
  Added in v.1.79.2.6


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