Diff for /loncom/interface/lonsupportreq.pm between versions 1.79 and 1.80

version 1.79, 2015/06/09 21:22:57 version 1.80, 2015/06/18 20:19:06
Line 145  sub print_request_form { Line 145  sub print_request_form {
                   subj => 'Subject',                    subj => 'Subject',
                   detd => 'Detailed Description',                    detd => 'Detailed Description',
                   opfi => 'Optional file upload',                    opfi => 'Optional file upload',
                   uplf => 'Upload a file (e.g., a screenshot) relevant to your help request (128 KB max.)',                    uplf => 'Upload a file (e.g., a screenshot) relevant to your help request (1 MB max.)',
                   fini => 'Finish',                    fini => 'Finish',
                   clfm => 'Clear Form',                    clfm => 'Clear Form',
     );      );
Line 275  $jscript Line 275  $jscript
 $loaditems  $loaditems
 // ]]>  // ]]>
 </script>  </script>
   <script type="text/javascript" src="/res/adm/includes/file_upload.js"></script>
 ENDJS  ENDJS
     my %add_entries = (      my %add_entries = (
                        style    => "margin-top:0px;margin-bottom:0px;",                         style    => "margin-top:0px;margin-bottom:0px;",
Line 506  ENDJS Line 507  ENDJS
     $i = $num%2;       $i = $num%2; 
     if (($env{'user.name'} =~ /^$match_username$/) && (!$public)) {      if (($env{'user.name'} =~ /^$match_username$/) && (!$public)) {
         if ($homeserver) {          if ($homeserver) {
             $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="flUpload" size="20" />'
                        "\n".$html_lt{'uplf'}."\n".                  .'<input type="hidden" id="free_space" value="1048576" />'
                        &Apache::lonhtmlcommon::row_closure();                  .'<br />'."\n".$html_lt{'uplf'}."\n"
                   .&Apache::lonhtmlcommon::row_closure();
             $num ++;              $num ++;
             $i = $num%2;              $i = $num%2;
         }          }
Line 843  END Line 845  END
     if ((defined($env{'user.name'})) && (!$public)) {      if ((defined($env{'user.name'})) && (!$public)) {
         if ($homeserver && $env{'form.screenshot.filename'}) {          if ($homeserver && $env{'form.screenshot.filename'}) {
             $attachmentsize = length($env{'form.screenshot'});              $attachmentsize = length($env{'form.screenshot'});
             if ($attachmentsize > 131072) {              if ($attachmentsize > 1048576) {
                 $displaymsg .= '<br /><span class="LC_warning">'.                  $displaymsg .= '<br /><span class="LC_warning">'.
                                &mt('The uploaded screenshot file ([_1] bytes) included with your request exceeded the maximum allowed size - 128 KB, and has therefore been discarded.',$attachmentsize).'</span>';                                 &mt('The uploaded screenshot file ([_1] bytes) included with your request exceeded the maximum allowed size - 1 MB, and has therefore been discarded.',$attachmentsize).'</span>';
             } else {              } else {
                 $attachmentpath=&Apache::lonnet::userfileupload('screenshot',undef,'helprequests');                  $attachmentpath=&Apache::lonnet::userfileupload('screenshot',undef,'helprequests');
             }              }

Removed from v.1.79  
changed lines
  Added in v.1.80


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