[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonsupportreq.pm

[raeburn]

raeburn		Mon Aug 12 18:11:43 2019 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	lonsupportreq.pm 
  Log:
  - For 2.11
    Backport 1.80 (part), 1.97, 1.98, 1.99
  
  
Index: loncom/interface/lonsupportreq.pm
diff -u loncom/interface/lonsupportreq.pm:1.79.2.5 loncom/interface/lonsupportreq.pm:1.79.2.6
--- loncom/interface/lonsupportreq.pm:1.79.2.5	Sat Aug  3 23:40:16 2019
+++ loncom/interface/lonsupportreq.pm	Mon Aug 12 18:11:42 2019
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Helpdesk request form
 #
-# $Id: lonsupportreq.pm,v 1.79.2.5 2019/08/03 23:40:16 raeburn Exp $
+# $Id: lonsupportreq.pm,v 1.79.2.6 2019/08/12 18:11:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -322,7 +322,9 @@
 // ]]>
 </script>
 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";
     }
     my %add_entries = (
@@ -580,10 +582,11 @@
                     $showmax = $helpform{'maxsize'};
                 }
                 $showmax = ' ('.sprintf("%.2f",$showmax).' '.&mt('MB max.').')';
-                $output .= &Apache::lonhtmlcommon::row_title($html_lt{'opfi'},undef,$css[$i]).
-                       ' <input type="file" name="screenshot" size="20" /><br />'.
-                       "\n".$html_lt{'uplf'}.$showmax."\n".
-                       &Apache::lonhtmlcommon::row_closure();
+                $output .= &Apache::lonhtmlcommon::row_title($html_lt{'opfi'},undef,$css[$i])
+                    .' <input type="file" name="screenshot" class="LC_flUpload" size="20" />'
+                    .'<input type="hidden" id="LC_free_space" value="'.$max.'" />'
+                    .'<br />'."\n".$html_lt{'uplf'}.$showmax."\n"
+                    .&Apache::lonhtmlcommon::row_closure();
                 $num ++;
                 $i = $num%2;
             }